change

fs-admin/src/main/java/com/fs/his/task/Task.java

@@ -2166,14 +2166,14 @@ public class Task {
                         logger.info("开始确认订单分账..........");
                         confirm.setYsyDivAmt(ysyAmount);
                         confirm.setDivAmt(divAmount);
-                        confirm.setOrgReqSeqId(storePayment.getShareCode()+"-"+storePayment.getPayCode());
-                        confirm.setOrgReqDate(DateTools.getCurrentDateYYYYMMDD());
+                        confirm.setOrgReqSeqId(queryOrderResult.getOrg_req_seq_id());
+                        confirm.setOrgReqDate(queryOrderResult.getOrg_req_date());
                         String orderCode = OrderCodeUtils.getOrderSn();
                         if (StringUtils.isEmpty(orderCode)) {
                             throw new CustomException("订单生成失败，请重试");
                         }
                         //中医院商户号
-                        //confirm.setMainHfId("6666000175632107");
+                        confirm.setMainHfId(queryOrderResult.getHuifu_id());
                         confirm.setReqSeqId(orderCode);
                         confirm.setTotalAmount(storePayment.getPayMoney());
                         HuifuOrderConfirmResult result = huiFuService.confirmOrder(confirm);

fs-service/src/main/java/com/fs/huifuPay/service/impl/HuiFuServiceImpl.java

@@ -363,7 +363,6 @@ public class HuiFuServiceImpl implements HuiFuService {
             } else {
                 doInit(getMerConfig());
             }
-            confirm.setMainHfId(config.getHuifuId());
             V2TradePaymentDelaytransConfirmRequest request = new V2TradePaymentDelaytransConfirmRequest();
             request.setReqDate(DateTools.getCurrentDateYYYYMMDD());
             request.setReqSeqId(confirm.getReqSeqId());