From 89fbecbceeff36791907bfc4525e4cec61565acd Mon Sep 17 00:00:00 2001
From: stivepeim <peimm126@126.com>
Date: Mon, 11 Jan 2021 16:22:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=80=E6=AC=BE=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E9=80=89=E6=8B=A9=E4=BC=98=E6=83=A0=E5=88=B8?=
 =?UTF-8?q?=E5=8F=AF=E8=83=BD=E5=87=BA=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/components/couponList/index.vue     | 316 +++++++++---------
 admin/src/views/store/creatStore/index.vue    |   2 +
 .../request/StoreOrderRefundRequest.java      |   6 +-
 .../service/impl/StoreOrderServiceImpl.java   |  93 +++---
 4 files changed, 202 insertions(+), 215 deletions(-)

diff --git a/admin/src/components/couponList/index.vue b/admin/src/components/couponList/index.vue
index 5efaafdd..f57426e4 100644
--- a/admin/src/components/couponList/index.vue
+++ b/admin/src/components/couponList/index.vue
@@ -91,178 +91,178 @@
 </template>
 
 <script>
-import { marketingListApi, couponUserApi } from '@/api/marketing'
-export default {
-  name: 'CouponList',
-  props: {
-    handle: {
-      type: String,
-      default: ''
-    },
-    couponData: {
-      type: Array,
-      default: () => []
-    },
-    keyNum: {
-      type: Number,
-      default: 0
-    },
-    userIds: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      listLoading: true,
-      tableData: {
-        data: [],
-        total: 0
+  import { marketingListApi, couponUserApi } from '@/api/marketing'
+  export default {
+    name: 'CouponList',
+    props: {
+      handle: {
+        type: String,
+        default: ''
       },
-      tableFrom: {
-        page: 1,
-        limit: 10,
-        name: '',
-        // type: 0,
-        isDel: 0,
-        status: 1
+      couponData: {
+        type: Array,
+        default: () => []
       },
-      multipleSelection: [],
-      multipleSelectionAll: [],
-      idKey: 'id',
-      nextPageFlag: false,
-      attr: []
-    }
-  },
-  watch: {
-    keyNum: {
-      deep: true,
-      handler(val) {
-        this.getList()
+      keyNum: {
+        type: Number,
+        default: 0
+      },
+      userIds: {
+        type: String,
+        default: ''
       }
-    }
-  },
-  mounted() {
-    this.tableFrom.page = 1
-    this.getList()
-    this.multipleSelectionAll = this.couponData
-  },
-  methods: {
-    close() {
-      this.multipleSelection = []
     },
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-      setTimeout(() => {
-        this.changePageCoreRecordData()
-      }, 50)
-    },
-    // 设置选中的方法
-    setSelectRow() {
-      if (!this.multipleSelectionAll || this.multipleSelectionAll.length <= 0) {
-        return
+    data() {
+      return {
+        listLoading: true,
+        tableData: {
+          data: [],
+          total: 0
+        },
+        tableFrom: {
+          page: 1,
+          limit: 10,
+          name: '',
+          // type: 0,
+          isDel: 0,
+          status: 1
+        },
+        multipleSelection: [],
+        multipleSelectionAll: [],
+        idKey: 'id',
+        nextPageFlag: false,
+        attr: []
       }
-      // 标识当前行的唯一键的名称
-      const idKey = this.idKey
-      const selectAllIds = []
-      this.multipleSelectionAll.forEach(row => {
-        selectAllIds.push(row[idKey])
-      })
-      this.$refs.table.clearSelection()
-      for (var i = 0; i < this.tableData.data.length; i++) {
-        if (selectAllIds.indexOf(this.tableData.data[i][idKey]) >= 0) {
-          // 设置选中，记住table组件需要使用ref="table"
-          this.$refs.table.toggleRowSelection(this.tableData.data[i], true)
+    },
+    watch: {
+      keyNum: {
+        deep: true,
+        handler(val) {
+          this.getList()
         }
       }
     },
-    // 记忆选择核心方法
-    changePageCoreRecordData() {
-      // 标识当前行的唯一键的名称
-      const idKey = this.idKey
-      const that = this
-      // 如果总记忆中还没有选择的数据，那么就直接取当前页选中的数据，不需要后面一系列计算
-      if (this.multipleSelectionAll.length <= 0) {
-        this.multipleSelectionAll = this.multipleSelection
-        return
-      }
-      // 总选择里面的key集合
-      const selectAllIds = []
-      this.multipleSelectionAll.forEach(row => {
-        selectAllIds.push(row[idKey])
-      })
-      const selectIds = []
-      // 获取当前页选中的id
-      this.multipleSelection.forEach(row => {
-        selectIds.push(row[idKey])
-        // 如果总选择里面不包含当前页选中的数据，那么就加入到总选择集合里
-        if (selectAllIds.indexOf(row[idKey]) < 0) {
-          that.multipleSelectionAll.push(row)
+    mounted() {
+      this.tableFrom.page = 1
+      this.getList()
+      this.multipleSelectionAll = this.couponData || []
+    },
+    methods: {
+      close() {
+        this.multipleSelection = []
+      },
+      handleSelectionChange(val) {
+        this.multipleSelection = val
+        setTimeout(() => {
+          this.changePageCoreRecordData()
+        }, 50)
+      },
+      // 设置选中的方法
+      setSelectRow() {
+        if (!this.multipleSelectionAll || this.multipleSelectionAll.length <= 0) {
+          return
         }
-      })
-      const noSelectIds = []
-      // 得到当前页没有选中的id
-      this.tableData.data.forEach(row => {
-        if (selectIds.indexOf(row[idKey]) < 0) {
-          noSelectIds.push(row[idKey])
-        }
-      })
-      noSelectIds.forEach(id => {
-        if (selectAllIds.indexOf(id) >= 0) {
-          for (let i = 0; i < that.multipleSelectionAll.length; i++) {
-            if (that.multipleSelectionAll[i][idKey] == id) {
-              // 如果总选择中有未被选中的，那么就删除这条
-              that.multipleSelectionAll.splice(i, 1)
-              break
-            }
+        // 标识当前行的唯一键的名称
+        const idKey = this.idKey
+        const selectAllIds = []
+        this.multipleSelectionAll.forEach(row => {
+          selectAllIds.push(row[idKey])
+        })
+        this.$refs.table.clearSelection()
+        for (var i = 0; i < this.tableData.data.length; i++) {
+          if (selectAllIds.indexOf(this.tableData.data[i][idKey]) >= 0) {
+            // 设置选中，记住table组件需要使用ref="table"
+            this.$refs.table.toggleRowSelection(this.tableData.data[i], true)
           }
         }
-      })
-    },
-    ok() {
-      if (this.multipleSelection.length > 0) {
-        this.$emit('getCouponId', this.multipleSelectionAll)
-        // this.close()
-      } else {
-        this.$message.warning('请先选择优惠劵')
+      },
+      // 记忆选择核心方法
+      changePageCoreRecordData() {
+        // 标识当前行的唯一键的名称
+        const idKey = this.idKey
+        const that = this
+        // 如果总记忆中还没有选择的数据，那么就直接取当前页选中的数据，不需要后面一系列计算
+        if (this.multipleSelectionAll.length <= 0) {
+          this.multipleSelectionAll = this.multipleSelection
+          return
+        }
+        // 总选择里面的key集合
+        const selectAllIds = []
+        this.multipleSelectionAll.forEach(row => {
+          selectAllIds.push(row[idKey])
+        })
+        const selectIds = []
+        // 获取当前页选中的id
+        this.multipleSelection.forEach(row => {
+          selectIds.push(row[idKey])
+          // 如果总选择里面不包含当前页选中的数据，那么就加入到总选择集合里
+          if (selectAllIds.indexOf(row[idKey]) < 0) {
+            that.multipleSelectionAll.push(row)
+          }
+        })
+        const noSelectIds = []
+        // 得到当前页没有选中的id
+        this.tableData.data.forEach(row => {
+          if (selectIds.indexOf(row[idKey]) < 0) {
+            noSelectIds.push(row[idKey])
+          }
+        })
+        noSelectIds.forEach(id => {
+          if (selectAllIds.indexOf(id) >= 0) {
+            for (let i = 0; i < that.multipleSelectionAll.length; i++) {
+              if (that.multipleSelectionAll[i][idKey] == id) {
+                // 如果总选择中有未被选中的，那么就删除这条
+                that.multipleSelectionAll.splice(i, 1)
+                break
+              }
+            }
+          }
+        })
+      },
+      ok() {
+        if (this.multipleSelection.length > 0) {
+          this.$emit('getCouponId', this.multipleSelectionAll)
+          // this.close()
+        } else {
+          this.$message.warning('请先选择优惠劵')
+        }
+      },
+      // 列表
+      getList(num) {
+        this.listLoading = true
+        this.tableFrom.page = num ? num : this.tableFrom.page
+        marketingListApi(this.tableFrom).then(res => {
+          this.tableData.data = res.list
+          this.tableData.total = res.total
+          this.listLoading = false
+          this.$nextTick(function() {
+            this.setSelectRow()// 调用跨页选中方法
+          })
+        }).catch(res => {
+          this.listLoading = false
+        })
+      },
+      pageChange(page) {
+        this.changePageCoreRecordData()
+        this.tableFrom.page = page
+        this.getList()
+      },
+      handleSizeChange(val) {
+        this.changePageCoreRecordData()
+        this.tableFrom.limit = val
+        this.getList()
+      },
+      // 发送
+      sendGrant(id){
+        this.$modalSure('发送优惠劵吗').then(() => {
+          couponUserApi({ couponId:id, uid:this.userIds }).then(() => {
+            this.$message.success('发送成功')
+            this.getList()
+          })
+        })
       }
-    },
-    // 列表
-    getList(num) {
-      this.listLoading = true
-      this.tableFrom.page = num ? num : this.tableFrom.page
-      marketingListApi(this.tableFrom).then(res => {
-        this.tableData.data = res.list
-        this.tableData.total = res.total
-        this.listLoading = false
-        this.$nextTick(function() {
-          this.setSelectRow()// 调用跨页选中方法
-        })
-      }).catch(res => {
-        this.listLoading = false
-      })
-    },
-    pageChange(page) {
-      this.changePageCoreRecordData()
-      this.tableFrom.page = page
-      this.getList()
-    },
-    handleSizeChange(val) {
-      this.changePageCoreRecordData()
-      this.tableFrom.limit = val
-      this.getList()
-    },
-    // 发送
-    sendGrant(id){
-      this.$modalSure('发送优惠劵吗').then(() => {
-        couponUserApi({ couponId:id, uid:this.userIds }).then(() => {
-          this.$message.success('发送成功')
-          this.getList()
-        })
-      })
     }
   }
-}
 </script>
 
 <style scoped lang="scss">
diff --git a/admin/src/views/store/creatStore/index.vue b/admin/src/views/store/creatStore/index.vue
index 93fd8cef..6e73e9f4 100644
--- a/admin/src/views/store/creatStore/index.vue
+++ b/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')
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreOrderRefundRequest.java b/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreOrderRefundRequest.java
index c5c9af59..d77adc44 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/request/StoreOrderRefundRequest.java
+++ b/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]")
-    @Range(min = 1, max = 2, message = "请选择退款状态 1 = 直接退款, 2 = 退款后,返回原状态")
-    private int type;
+//    @ApiModelProperty(value = "status 1 = 直接退款, 2 = 退款后,返回原状态", allowableValues = "range[1,2]")
+//    @Range(min = 1, max = 2, message = "请选择退款状态 1 = 直接退款, 2 = 退款后,返回原状态")
+//    private int type;
 
 }
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreOrderServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreOrderServiceImpl.java
index 95c22014..dee99181 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreOrderServiceImpl.java
+++ b/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,61 +786,45 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderDao, StoreOrder
                 throw new CrmebException("微信申请退款失败！");
             }
         }
-        if (storeOrder.getPayType().equals(Constants.PAY_TYPE_YUE)) {
-            UserOperateFundsRequest userOperateFundsRequest = new UserOperateFundsRequest();
-            userOperateFundsRequest.setUid(storeOrder.getUid());
-            userOperateFundsRequest.setValue(request.getAmount());
-            userOperateFundsRequest.setFoundsCategory(Constants.USER_BILL_CATEGORY_MONEY);
-            userOperateFundsRequest.setFoundsType(Constants.ORDER_STATUS_REFUNDED);
-            userOperateFundsRequest.setType(1);
-            userOperateFundsRequest.setTitle(Constants.ORDER_STATUS_STR_REFUNDED);
-            boolean addMoney = userService.updateFounds(userOperateFundsRequest, false); //更新余额
-            if(!addMoney){throw new CrmebException("余额退款失败");}
-
-            //新增日志
-            boolean addBill = userBillService.saveRefundBill(request, user);
-            if(!addBill){throw new CrmebException("余额退款失败");}
-        }
 
         //修改订单退款状态
-        if(request.getType() == 1){
-            storeOrder.setRefundStatus(2);
-        }else if(request.getType() == 2){
-            storeOrder.setRefundStatus(0);
-        }else{
-            throw new CrmebException("选择退款状态错误");
-        }
+        storeOrder.setRefundStatus(3);
         storeOrder.setRefundPrice(request.getAmount());
-        boolean updateOrder = updateById(storeOrder);
-        if(!updateOrder){
+
+        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());
+                userOperateFundsRequest.setFoundsCategory(Constants.USER_BILL_CATEGORY_MONEY);
+                userOperateFundsRequest.setFoundsType(Constants.ORDER_STATUS_REFUNDED);
+                userOperateFundsRequest.setType(1);
+                userOperateFundsRequest.setTitle(Constants.ORDER_STATUS_STR_REFUNDED);
+                userService.updateFounds(userOperateFundsRequest, false); //更新余额
+                //新增日志
+                userBillService.saveRefundBill(request, user);
+                // 退款task
+                redisUtil.lPush(Constants.ORDER_TASK_REDIS_KEY_AFTER_REFUND_BY_USER, storeOrder.getId());
+            }
+            return Boolean.TRUE;
+        });
+        if(!execute){
             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());
 
-        //佣金
-        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;
+        return execute;
     }
 
     /** 订单详情