分账的功能先删除

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -4186,14 +4186,14 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                     o.setTransAmt(storePayment.getPayMoney().toString());
                     o.setGoodsDesc("商城订单支付");
                     o.setAppId(param.getAppId());
-                    try {
-
-                        HuiFuUtils.doDiv(o,order.getCompanyId(), storePayment.getMerConfigId());
-                        //存储分账明细
-                        HuiFuUtils.saveDivItem(o, order.getOrderCode(), storePayment.getPayCode());
-                    } catch (Exception e) {
-                        logger.error("-------------分账出错：{}", e.getMessage());
-                    }
+//                    try {
+//
+//                        HuiFuUtils.doDiv(o,order.getCompanyId(), storePayment.getMerConfigId());
+//                        //存储分账明细
+//                        HuiFuUtils.saveDivItem(o, order.getOrderCode(), storePayment.getPayCode());
+//                    } catch (Exception e) {
+//                        logger.error("-------------分账出错：{}", e.getMessage());
+//                    }
                     HuifuCreateOrderResult result = huiFuService.createOrder(o);
                     if(result.getResp_code()!=null&&(result.getResp_code().equals("00000000")||result.getResp_code().equals("00000100"))){
                         FsStorePaymentScrm mt=new FsStorePaymentScrm();

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStorePaymentScrmServiceImpl.java

@@ -977,13 +977,13 @@ public class FsStorePaymentScrmServiceImpl implements IFsStorePaymentScrmService
                 o.setGoodsDesc("商城订单支付");
                 o.setAppId(appId);
                 //公司分账
-                try {
-                    HuiFuUtils.doDiv(o,company.getCompanyId(), storePayment.getMerConfigId());
-                    //存储分账明细
-                    HuiFuUtils.saveDivItem(o, storePayment.getPayCode(), storePayment.getPayCode());
-                } catch (Exception e) {
-                    logger.error("-------------微信收款分账出错：{}", e.getMessage());
-                }
+//                try {
+//                    HuiFuUtils.doDiv(o,company.getCompanyId(), storePayment.getMerConfigId());
+//                    //存储分账明细
+//                    HuiFuUtils.saveDivItem(o, storePayment.getPayCode(), storePayment.getPayCode());
+//                } catch (Exception e) {
+//                    logger.error("-------------微信收款分账出错：{}", e.getMessage());
+//                }
                 HuifuCreateOrderResult result = huiFuService.createOrder(o);
 
                 if(result.getResp_code()!=null&&(result.getResp_code().equals("00000000")||result.getResp_code().equals("00000100"))){

fs-user-app/src/main/java/com/fs/app/controller/HuifuPayController.java

@@ -58,11 +58,11 @@ public class HuifuPayController {
                     break;
                 case "store":
                     storeOrderService.payConfirm("",orderId[1],huiFuResult.getHf_seq_id(),"",1,huiFuResult.getOut_trans_id(),huiFuResult.getParty_order_id());
-                    try {
-                        HuiFuUtils.updateDivItem(orderId[1]);
-                    } catch (Exception e) {
-                        logger.error("-------分账明细回调错误{}", e.getMessage());
-                    }
+//                    try {
+//                        HuiFuUtils.updateDivItem(orderId[1]);
+//                    } catch (Exception e) {
+//                        logger.error("-------分账明细回调错误{}", e.getMessage());
+//                    }
                     break;
                 case "package":
                     packageOrderService.payConfirm("",orderId[1],huiFuResult.getHf_seq_id(),"",1,huiFuResult.getOut_trans_id(),huiFuResult.getParty_order_id());
@@ -106,11 +106,11 @@ public class HuifuPayController {
                     break;
                 case "payment":
                     storePaymentService.payConfirm(orderId[1],huiFuResult.getHf_seq_id(),huiFuResult.getOut_trans_id(),huiFuResult.getParty_order_id());
-                    try {
-                        HuiFuUtils.updateDivItem(orderId[1]);
-                    } catch (Exception e) {
-                        logger.error("-------分账明细回调错误{}", e.getMessage());
-                    }
+//                    try {
+//                        HuiFuUtils.updateDivItem(orderId[1]);
+//                    } catch (Exception e) {
+//                        logger.error("-------分账明细回调错误{}", e.getMessage());
+//                    }
                     break;
             }
         }