订金商品余额修改

base-module/src/main/java/com/caimei/module/base/entity/po/CmUserBalanceRecord.java

@@ -27,7 +27,7 @@ public class CmUserBalanceRecord implements Serializable {
     private String type;
 
     /**
-     * 余额类型：1余额抵扣，2多收退款到余额，3申请退款,4余额充值，5余额提现
+     * 余额类型：1余额抵扣，2多收退款到余额，3申请退款,4余额充值，5余额提现,6订金订单充值,7余额订单充值,8订金订单退款,9余额订单退款
      */
     private String balanceType;
 

pay/src/main/java/com/caimei/module/pay/service/impl/PayServiceImpl.java

@@ -445,16 +445,23 @@ public class PayServiceImpl implements PayService {
      * @param amount 本次支付金额
      */
     private void getRechargeGoods(OrderVo order, BigDecimal amount) {
-        boolean rechargeGoods = false;
-        int[] products = {6060, 6061, 6062, 6063, 6064, 6065, 6066, 6067, 6068, 6069};
+        Integer rechargeGoods = null;
+        //缴纳订金订单
+        int[] productId1 = {6060, 6061, 6062, 6063, 6064};
+        //充值余额订单
+        int[] productId2 = {6065, 6066, 6067, 6068, 6069};
         List<OrderProductVo> orderProductList = payDao.fandAllOrderProduct(order.getOrderID().intValue());
         for (OrderProductVo orderProduct : orderProductList) {
-            if (ArrayUtils.contains(products, orderProduct.getProductID())) {
-                rechargeGoods = true;
+            if (ArrayUtils.contains(productId1, orderProduct.getProductID())) {
+                rechargeGoods = 1;
+                break;
+            }
+            if (ArrayUtils.contains(productId2, orderProduct.getProductID())) {
+                rechargeGoods = 2;
                 break;
             }
         }
-        if (rechargeGoods) {
+        if (rechargeGoods != null) {
             UserVo user = payDao.findUser(order.getUserID());
             user.setUserMoney(MathUtil.add(user.getUserMoney(), amount));
             user.setAbleUserMoney(MathUtil.add(user.getAbleUserMoney(), amount));
@@ -463,7 +470,11 @@ public class PayServiceImpl implements PayService {
             BalanceRecordVo balanceRecord = new BalanceRecordVo();
             balanceRecord.setUserId(user.getUserID().longValue());
             balanceRecord.setType("1");
-            balanceRecord.setBalanceType("4");
+            if (rechargeGoods == 1) {
+                balanceRecord.setBalanceType("6");
+            } else {
+                balanceRecord.setBalanceType("7");
+            }
             balanceRecord.setAddDate(new Date());
             balanceRecord.setAmount(amount);
             balanceRecord.setOrderId(order.getOrderID());