feat:增加现金交易的消费记录

nightFragrance-common/src/main/java/com/ylx/common/constant/MassageConstants.java

@@ -12,6 +12,8 @@ public class MassageConstants {
 
     public static final Integer INTEGER_TWO = 2;
 
+    public static final Integer INTEGER_THREE = 3;
+
     public static final Integer INTEGER_FIVE = 5;
 
     public static final Integer INTEGER_TEN = 10;

nightFragrance-massage/src/main/java/com/ylx/massage/domain/TOrder.java

@@ -76,7 +76,7 @@ public class TOrder implements Serializable {
     private BigDecimal distance;
 
     @TableField("pay_type")
-    @ApiModelProperty("支付类型:1微信支付 2:余额支付")
+    @ApiModelProperty("支付类型:1微信支付 2:余额支付 3:现金支付")
     private Integer payType;
 
     @TableField("preferential")

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

@@ -408,11 +408,19 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
             return resp;
         }
 
+
+
         // 从对应账户扣款
         TWxUser user = wxUserService.getByOpenId(orderNew.getcOpenId());
         if (null == user) {
             throw new ServiceException("用户不存在");
         }
+        //判断支付方式
+        if (order.getPayType().equals(MassageConstants.INTEGER_THREE)) {
+            //现金支付
+            orderPayManage(user, orderNew);
+            return R.ok();
+        }
         if (user.getdBalance().compareTo(orderNew.getTotalPrice()) < MassageConstants.INTEGER_ZERO) {
             throw new ServiceException("账户金额不够请充值");
         } else {
@@ -452,11 +460,11 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         // 更新用户金额 及下单此时
         TWxUser paramUser = new TWxUser();
         paramUser.setcOpenid(user.getcOpenid());
-        if (!orderNew.getPayType().equals(MassageConstants.INTEGER_ONE)) {
+        if (orderNew.getPayType().equals(MassageConstants.INTEGER_TWO)) {
             paramUser.setdBalance(user.getdBalance().subtract(orderNew.getTotalPrice()));
         }
         paramUser.setdMoney(user.getdMoney().add(orderNew.getTotalPrice()));
-        paramUser.setnNum(user.getnNum() + MassageConstants.INTEGER_ZERO);
+        paramUser.setnNum(user.getnNum() + MassageConstants.INTEGER_ONE);
         paramUser.setId(user.getId());
         wxUserService.updateById(paramUser);
         //增加消费记录
@@ -464,12 +472,15 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         tConsumptionLog.setAmount(orderNew.getTotalPrice().negate());
         tConsumptionLog.setBillNo(orderNew.getOrderNo());
         tConsumptionLog.setOpenId(orderNew.getcOpenId());
-        if (!orderNew.getPayType().equals(MassageConstants.INTEGER_ONE)) {
+        if (orderNew.getPayType().equals(MassageConstants.INTEGER_TWO)) {
             tConsumptionLog.setBillType(BillTypeEnum.BALANCE_PAYMENT.getCode());
             tConsumptionLog.setNote("余额支付");
-        } else {
+        } else if(orderNew.getPayType().equals(MassageConstants.INTEGER_ONE)){
             tConsumptionLog.setBillType(BillTypeEnum.WX_PAY.getCode());
             tConsumptionLog.setNote("微信支付");
+        } else {
+            tConsumptionLog.setBillType(BillTypeEnum.CASH_PAYMENT.getCode());
+            tConsumptionLog.setNote("现金支付");
         }
 
         consumptionLogService.save(tConsumptionLog);