修复退款失败的问题

修复商品选择优惠券可能出错的问题

admin/src/components/couponList/index.vue

@@ -91,8 +91,8 @@
 </template>
 
 <script>
-import { marketingListApi, couponUserApi } from '@/api/marketing'
+  import { marketingListApi, couponUserApi } from '@/api/marketing'
-export default {
+  export default {
     name: 'CouponList',
     props: {
       handle: {
@@ -145,7 +145,7 @@ export default {
     mounted() {
       this.tableFrom.page = 1
       this.getList()
-    this.multipleSelectionAll = this.couponData
+      this.multipleSelectionAll = this.couponData || []
     },
     methods: {
       close() {
@@ -262,7 +262,7 @@ export default {
         })
       }
     }
-}
+  }
 </script>
 
 <style scoped lang="scss">

admin/src/views/store/creatStore/index.vue

@@ -573,6 +573,7 @@
       handleCloseCoupon(tag) {
         this.isAttr = true
         this.formValidate.coupons.splice(this.formValidate.coupons.indexOf(tag), 1)
+        this.formValidate.couponIds.splice(this.formValidate.couponIds.indexOf(tag.id), 1)
       },
       addCoupon() {
         const _this = this
@@ -894,6 +895,7 @@
             giveIntegral: info.giveIntegral,
             ficti: info.ficti,
             coupons: info.coupons,
+            couponIds: info.couponIds,
             activity: info.activityStr ? info.activityStr.split(',') : ['默认','秒杀','砍价','拼团']
           }
           if(info.isHot) this.checkboxGroup.push('isHot')

crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreOrderRefundRequest.java

@@ -38,8 +38,8 @@ public class StoreOrderRefundRequest {
     @DecimalMin(value = "0.00", message = "退款金额不能少于0.00")
     private BigDecimal amount;
 
-    @ApiModelProperty(value = "status 1 = 直接退款, 2 = 退款后,返回原状态", allowableValues = "range[1,2]")
+//    @ApiModelProperty(value = "status 1 = 直接退款, 2 = 退款后,返回原状态", allowableValues = "range[1,2]")
-    @Range(min = 1, max = 2, message = "请选择退款状态 1 = 直接退款, 2 = 退款后,返回原状态")
+//    @Range(min = 1, max = 2, message = "请选择退款状态 1 = 直接退款, 2 = 退款后,返回原状态")
-    private int type;
+//    private int type;
 
 }

crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreOrderServiceImpl.java

@@ -760,18 +760,19 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderDao, StoreOrder
 
     /** 退款
      * @param request StoreOrderRefundRequest 退款参数
-     * @author Mr.Zhang
-     * @since 2020-06-10
      * @return boolean
+     * 这里只处理订单状态
+     * 余额支付需要把余额给用户加回去
+     * 其余处理放入redis中处理
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public boolean refund(StoreOrderRefundRequest request) {
         StoreOrder storeOrder = getById(request.getOrderId());
-        if(null == storeOrder){throw new CrmebException("未查到订单");}
+        if(ObjectUtil.isNull(storeOrder)){throw new CrmebException("未查到订单");}
         if(!storeOrder.getPaid()){throw new CrmebException("未支付无法退款");}
-        if(storeOrder.getRefundPrice().add(request.getAmount()).compareTo(storeOrder.getPayPrice()) > 0){throw new CrmebException("退款金额大于支付金额，请修改退款金额");}
+        if(storeOrder.getRefundPrice().add(request.getAmount()).compareTo(storeOrder.getPayPrice()) > 0) {
-
+            throw new CrmebException("退款金额大于支付金额，请修改退款金额");
+        }
 
         //用户
         User user = userService.getById(storeOrder.getUid());
@@ -785,7 +786,15 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderDao, StoreOrder
                 throw new CrmebException("微信申请退款失败！");
             }
         }
+
+        //修改订单退款状态
+        storeOrder.setRefundStatus(3);
+        storeOrder.setRefundPrice(request.getAmount());
+
+        Boolean execute = transactionTemplate.execute(e -> {
+            updateById(storeOrder);
             if (storeOrder.getPayType().equals(Constants.PAY_TYPE_YUE)) {
+                // 更新用户金额 TODO 后期要调整
                 UserOperateFundsRequest userOperateFundsRequest = new UserOperateFundsRequest();
                 userOperateFundsRequest.setUid(storeOrder.getUid());
                 userOperateFundsRequest.setValue(request.getAmount());
@@ -793,53 +802,29 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderDao, StoreOrder
                 userOperateFundsRequest.setFoundsType(Constants.ORDER_STATUS_REFUNDED);
                 userOperateFundsRequest.setType(1);
                 userOperateFundsRequest.setTitle(Constants.ORDER_STATUS_STR_REFUNDED);
-            boolean addMoney = userService.updateFounds(userOperateFundsRequest, false); //更新余额
+                userService.updateFounds(userOperateFundsRequest, false); //更新余额
-            if(!addMoney){throw new CrmebException("余额退款失败");}
-
                 //新增日志
-            boolean addBill = userBillService.saveRefundBill(request, user);
+                userBillService.saveRefundBill(request, user);
-            if(!addBill){throw new CrmebException("余额退款失败");}
+                // 退款task
+                redisUtil.lPush(Constants.ORDER_TASK_REDIS_KEY_AFTER_REFUND_BY_USER, storeOrder.getId());
             }
-
+            return Boolean.TRUE;
-        //修改订单退款状态
+        });
-        if(request.getType() == 1){
+        if(!execute){
-            storeOrder.setRefundStatus(2);
-        }else if(request.getType() == 2){
-            storeOrder.setRefundStatus(0);
-        }else{
-            throw new CrmebException("选择退款状态错误");
-        }
-        storeOrder.setRefundPrice(request.getAmount());
-        boolean updateOrder = updateById(storeOrder);
-        if(!updateOrder){
             storeOrderStatusService.saveRefund(request.getOrderId(), request.getAmount(), "失败");
             throw new CrmebException("订单更新失败");
         }
-        //退款成功
+//        // 小程序订阅消息 退款成功
-        storeOrderStatusService.saveRefund(request.getOrderId(), request.getAmount(), null);
+//        String storeNameAndCarNumString = orderUtils.getStoreNameAndCarNumString(storeOrder.getId());
+//        WechatSendMessageForReFundEd forReFundEd = new WechatSendMessageForReFundEd(
+//                "退款成功",storeNameAndCarNumString,request.getAmount()+"",DateUtil.nowDateTimeStr(),"退款金额已到余额中",
+//                storeOrder.getOrderId(),storeOrder.getId()+"",storeOrder.getCreateTime()+"",storeOrder.getRefundPrice()+"",
+//                storeNameAndCarNumString,storeOrder.getRefundReason(),"CRMEB",storeOrder.getRefundReasonWapExplain(),
+//                "暂无"
+//        );
+//        wechatSendMessageForMinService.sendReFundEdMessage(forReFundEd, userService.getUserIdException());
 
-        //佣金
+        return execute;
-        subtractBill(request, Constants.USER_BILL_CATEGORY_MONEY,
-                Constants.USER_BILL_TYPE_BROKERAGE, Constants.USER_BILL_CATEGORY_BROKERAGE_PRICE);
-
-        //积分
-        subtractBill(request, Constants.USER_BILL_CATEGORY_INTEGRAL,
-                Constants.USER_BILL_TYPE_GAIN, Constants.USER_BILL_CATEGORY_INTEGRAL);
-
-        // 回滚库存 后续操作放入redis
-        redisUtil.lPush(Constants.ORDER_TASK_REDIS_KEY_AFTER_REFUND_BY_USER, storeOrder.getId());
-
-        // 小程序订阅消息 退款成功
-        String storeNameAndCarNumString = orderUtils.getStoreNameAndCarNumString(storeOrder.getId());
-        WechatSendMessageForReFundEd forReFundEd = new WechatSendMessageForReFundEd(
-                "退款成功",storeNameAndCarNumString,request.getAmount()+"",DateUtil.nowDateTimeStr(),"退款金额已到余额中",
-                storeOrder.getOrderId(),storeOrder.getId()+"",storeOrder.getCreateTime()+"",storeOrder.getRefundPrice()+"",
-                storeNameAndCarNumString,storeOrder.getRefundReason(),"CRMEB",storeOrder.getRefundReasonWapExplain(),
-                "暂无"
-        );
-        wechatSendMessageForMinService.sendReFundEdMessage(forReFundEd, userService.getUserIdException());
-
-        return true;
     }
 
     /** 订单详情