核销更改

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OderHandleServiceImpl.java

@@ -109,8 +109,8 @@ public class OderHandleServiceImpl implements OrderHandleService {
                             couponAmount, platformTotal, 1, 9, merchantId);
                     BigDecimal surplusAmount = assetService.updateAsset(0, couponAmount, merchantId, 2, 1);
                     //商家记录余额明细
-                    balanceDetailService.recordFlow(orderId, 2, merchantId, couponAmount, BigDecimal.ZERO,
-                            couponAmount, surplusAmount, 0, 9, 0L);
+                    /*balanceDetailService.recordFlow(orderId, 2, merchantId, couponAmount, BigDecimal.ZERO,
+                            couponAmount, surplusAmount, 0, 9, 0L);*/
                 }
             }
         }
@@ -149,11 +149,11 @@ public class OderHandleServiceImpl implements OrderHandleService {
         //商家流水
         BigDecimal merchantDeduct = BigDecimal.ZERO;  //扣税
         BigDecimal merchantRealityAmount = operateAmount.subtract(merchantDeduct);
-        BigDecimal surplusAmount = assetService.updateAsset(0, merchantRealityAmount, merchantId, 2, 1);
+        //BigDecimal surplusAmount = assetService.updateAsset(0, merchantRealityAmount, merchantId, 2, 1);
         //currencyRecordService.recordFlow(merchantId, 2, 0, orderId, userId, 0, operateAmount, merchantDeduct, merchantRealityAmount);
         //商品出售商家记录余额明细
-        balanceDetailService.recordFlow(orderId, 2, merchantId, operateAmount, merchantDeduct,
-                merchantRealityAmount, surplusAmount, 0, 0, userId);
+        /*balanceDetailService.recordFlow(orderId, 2, merchantId, operateAmount, merchantDeduct,
+                merchantRealityAmount, surplusAmount, 0, 0, userId);*/
         //给商家转账
         assetService.transfer(0L, merchantId, 2, merchantRealityAmount, "");
         //邀请用户---分得佣金
@@ -166,8 +166,8 @@ public class OderHandleServiceImpl implements OrderHandleService {
                 //开通商户号，转账操作
                 assetService.transfer(0L, inviteUserId, 1, realityAmount, "");
                 //记录用户余额明细
-                balanceDetailService.recordFlow(orderId, 1, inviteUserId, userAmount, deduct,
-                        realityAmount, surplusAmount, 0, 1, userId);
+                /*balanceDetailService.recordFlow(orderId, 1, inviteUserId, userAmount, deduct,
+                        realityAmount, surplusAmount, 0, 1, userId);*/
             } else {
                 //更新用户资产
                 BigDecimal userTotal = assetService.updateAsset(0, realityAmount, inviteUserId, 1, 1);
@@ -187,10 +187,10 @@ public class OderHandleServiceImpl implements OrderHandleService {
             BigDecimal deduct = BigDecimal.ZERO;  //扣税
             BigDecimal realityAmount = merchantAmount.subtract(deduct);
             //更新商家资产
-            BigDecimal merchantTotal = assetService.updateAsset(0, realityAmount, inviteMerchantId, 1, 1);
+            //BigDecimal merchantTotal = assetService.updateAsset(0, realityAmount, inviteMerchantId, 1, 1);
             //记录商户分佣余额明细
-            balanceDetailService.recordFlow(omsOrder.getId(), 2, inviteMerchantId, merchantAmount, deduct,
-                    realityAmount, merchantTotal, 0, 2, userId);
+            /*balanceDetailService.recordFlow(omsOrder.getId(), 2, inviteMerchantId, merchantAmount, deduct,
+                    realityAmount, merchantTotal, 0, 2, userId);*/
             //商家佣金转账
             assetService.transfer(0L, inviteMerchantId, 2, realityAmount, "");
         }