fix:取消订单退款记录余额

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/BusinessDevelopmentController.java

@@ -47,6 +47,9 @@ public class BusinessDevelopmentController extends BaseController {
     @ApiOperation("分页查询所有数据")
     @Log(title = "招商新增查看", businessType = BusinessType.OTHER)
     public R selectAll(Page<BusinessDevelopment> page, BusinessDevelopment businessDevelopment) {
+
+        LambdaQueryWrapper<BusinessDevelopment> businessDevelopmentLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        businessDevelopmentLambdaQueryWrapper.like(BusinessDevelopment::getCity, businessDevelopment.getCity());
         return R.ok(this.businessDevelopmentService.page(page, new QueryWrapper<>(businessDevelopment)));
     }
 

nightFragrance-massage/src/main/java/com/ylx/massage/enums/BillTypeEnum.java

@@ -28,7 +28,13 @@ public enum BillTypeEnum {
 
     DISTRIBUTION(6, "分销收益"),
 
-    REFUSE_ACCEPT_REFUND(7, "拒绝接单退款到余额");
+    REFUSE_ACCEPT_REFUND(7, "拒绝接单退款到余额"),
+
+    CANCEL_ACCEPT_REFUND(8, "取消订单退款到余额"),
+
+    REFUSE_WX_REFUND(9, "拒绝接单退款到微信"),
+
+    CANCEL_WX_REFUND(10, "取消订单退款到微信");
 
 
 

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/TOrderServiceImpl.java

@@ -514,17 +514,17 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         TWxUser paramUser = new TWxUser();
         paramUser.setcOpenid(user.getcOpenid());
         paramUser.setId(user.getId());
+        // 余额记录
+        TConsumptionLog tConsumptionLog = new TConsumptionLog();
+        tConsumptionLog.setAmount(orderNew.getTotalPrice());
+        tConsumptionLog.setBillNo(orderNew.getOrderNo());
+        tConsumptionLog.setOpenId(orderNew.getcOpenId());
         if (orderNew.getPayType() == 2) {
             // 金额归还对应账户
             paramUser.setdBalance(user.getdBalance().add(orderNew.getTotalPrice()));
-            // 余额记录
-            TConsumptionLog tConsumptionLog = new TConsumptionLog();
-            tConsumptionLog.setAmount(orderNew.getTotalPrice());
-            tConsumptionLog.setBillNo(orderNew.getOrderNo());
-            tConsumptionLog.setOpenId(orderNew.getcOpenId());
             tConsumptionLog.setBillType(BillTypeEnum.REFUSE_ACCEPT_REFUND.getCode());
             tConsumptionLog.setNote("拒绝接单退款到余额");
-            consumptionLogService.save(tConsumptionLog);
+
         } else {
             // 微信支付
             // 生成退款单退款
@@ -536,9 +536,12 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
             refundVoucher.setReStatus(MassageConstants.INTEGER_ZERO);
             refundVoucher.setReason("技师拒绝接单");
             refundVoucherService.save(refundVoucher);
+            tConsumptionLog.setBillType(BillTypeEnum.REFUSE_ACCEPT_REFUND.getCode());
+            tConsumptionLog.setNote("拒绝接单退款到余额");
             // 微信退款原路返回
             rechargeService.refund(refundVoucher.getRefundNo(), null, orderNew.getOrderNo(), orderNew.getTotalPrice());
         }
+        consumptionLogService.save(tConsumptionLog);
         //退优惠卷
         if (StringUtils.isNotBlank(orderNew.getCouponReceiveId())) {
             CouponReceive couponReceive = couponReceiveService.getById(orderNew.getCouponReceiveId());
@@ -685,9 +688,17 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
             paramUser.setId(user.getId());
             paramUser.setcOpenid(user.getcOpenid());
 
+            TConsumptionLog tConsumptionLog = new TConsumptionLog();
+            tConsumptionLog.setAmount(orderNew.getTotalPrice());
+            tConsumptionLog.setBillNo(orderNew.getOrderNo());
+            tConsumptionLog.setOpenId(orderNew.getcOpenId());
             if (orderNew.getPayType() == 2) {
                 // 金额归还对应账户
                 paramUser.setdBalance(user.getdBalance().add(orderNew.getTotalPrice()));
+                // 余额记录
+                tConsumptionLog.setBillType(BillTypeEnum.CANCEL_ACCEPT_REFUND.getCode());
+                tConsumptionLog.setNote("取消订单退款到余额");
+                //自己取消的不退优惠卷
             } else {
                 // 微信支付
                 // 生成退款单退款
@@ -699,9 +710,12 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
                 refundVoucher.setReStatus(MassageConstants.INTEGER_ZERO);
                 refundVoucher.setReason("技师拒绝接单");
                 refundVoucherService.save(refundVoucher);
+                tConsumptionLog.setBillType(BillTypeEnum.CANCEL_WX_REFUND.getCode());
+                tConsumptionLog.setNote("取消订单退款到微信");
                 // 微信退款原路返回
                 rechargeService.refund(refundVoucher.getRefundNo(), null, orderNew.getOrderNo(), orderNew.getTotalPrice());
             }
+            consumptionLogService.save(tConsumptionLog);
             // 消费金额对应减少
             paramUser.setdMoney(user.getdMoney().subtract(orderNew.getTotalPrice()));
             // 下单次数减一