123

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserSellingWaterBiz.java

@@ -197,8 +197,10 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
                 BigDecimal commission = sellingWater.getCommission();
                 log.info("订单完成计算用户拥金----finishOrderWater----id====" + id + "---commission==" + commission + "----orderType===" + orderType);
                 amount = amount.add(commission);
+
             }
-            log.info("订单完成计算用户拥金----finishOrderWater----orderId====" + orderId + "---amount==" + amount);
+            BigDecimal unbooked=amount;
+            log.info("订单完成计算用户拥金----finishOrderWater----orderId====" + orderId + "---amount==" + amount+"---unbooked=="+unbooked);
             if(orderType==1){
                 List<OrderGoodsDTO> goodsDTOList =orderWaterDTO.getGoodsDTOList();
                 log.info("租车订单完成-----goodsDTOList==="+goodsDTOList);
@@ -247,7 +249,7 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
                 detail.setSource(1);
                 myWaterBiz.updMyWater(detail);
                 if (orderType == 1 || orderType == 2) {
-                    myWaterBiz.updMyWalletUnbooked(userId, amount, 2);
+                    myWaterBiz.updMyWalletUnbooked(userId, unbooked, 2);
                 }
 
             }