退款新增appId 暂时注释分账业务功能

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

@@ -2119,6 +2119,7 @@ public class Task {
                     V2TradePaymentScanpayQueryRequest request = new V2TradePaymentScanpayQueryRequest();
                     request.setOrgReqDate(DateTools.formatYYYYMMDD(storePayment.getPayTime()));
                     request.setOrgReqSeqId(storePayment.getShareCode()+"-"+storePayment.getPayCode());
+                    request.setAppId(storePayment.getAppId());
                     HuiFuQueryOrderResult queryOrderResult = huiFuService.queryOrder(request);
                     logger.info("汇付订单查询返回：{}" , queryOrderResult);
                     if (queryOrderResult != null && "00000000".equals(queryOrderResult.getResp_code())) {

fs-service/src/main/java/com/fs/his/service/impl/FsPackageOrderServiceImpl.java

@@ -1032,7 +1032,7 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
                 return R.error("套餐包数据异常");
             }
             //药品删除缓存 其它重复使用
-            boolean flag = fsPackage.getProductType() == 1 || fsPackage.getProductType() == 2;
+            boolean flag = fsPackage.getProductType() == 1 || fsPackage.getProductType() == 2 || fsPackage.getProductType() == 3;
             if (flag) {
                 redisCache.deleteObject("createPackageOrderKey:" + param.getCreatePackageOrderKey());
                 redisCache.deleteObject("createPackageOrderPayType:" + param.getCreatePackageOrderKey());
@@ -1494,9 +1494,9 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
                         o.setGoodsDesc("套餐包订单支付");
                         o.setAppId(appId);
                         //开启延迟分账
-                        if (isShare){
-                            o.setIsDelay(1);
-                        }
+//                        if (isShare){
+//                            o.setIsDelay(1);
+//                        }
                         HuifuCreateOrderResult result = huiFuService.createOrder(o);
                         logger.info("创建汇付支付："+result);
                         FsStorePayment mt=new FsStorePayment();
@@ -1504,10 +1504,10 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
                         mt.setTradeNo(result.getHf_seq_id());
                         //多小程序支付 更新小程序appid
                         mt.setAppId(appId);
-                        if (isShare) {
-                            mt.setIsShare(1);
-                            mt.setShareCode("package");
-                        }
+//                        if (isShare) {
+//                            mt.setIsShare(1);
+//                            mt.setShareCode("package");
+//                        }
                         storePaymentService.updateFsStorePayment(mt);
                         return R.ok().put("isPay", 0).put("data", result).put("type", "hf");
                     }

fs-service/src/main/java/com/fs/his/service/impl/FsStoreAfterSalesServiceImpl.java

@@ -606,6 +606,7 @@ public class FsStoreAfterSalesServiceImpl implements IFsStoreAfterSalesService {
         request.setOrdAmt(payment.getPayMoney().toString());
         request.setOrgReqDate(new SimpleDateFormat("yyyyMMdd").format(payment.getCreateTime()));
         request.setReqSeqId("refund-" + payment.getPayCode());
+        request.setAppId(payment.getAppId());
         Map<String, Object> extendInfoMap = new HashMap<>();
         extendInfoMap.put("org_req_seq_id", orderType + "-" + payment.getPayCode());
         request.setExtendInfo(extendInfoMap);

fs-service/src/main/java/com/fs/his/service/impl/FsStorePaymentServiceImpl.java

@@ -503,6 +503,7 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService {
         request.setOrdAmt(payment.getPayMoney().toString());
         request.setOrgReqDate(new SimpleDateFormat("yyyyMMdd").format(payment.getCreateTime()));
         request.setReqSeqId("refund-" + payment.getPayCode());
+        request.setAppId(payment.getAppId());
         Map<String, Object> extendInfoMap = new HashMap<>();
         extendInfoMap.put("org_req_seq_id", orderType + "-" + payment.getPayCode());
         request.setExtendInfo(extendInfoMap);

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

@@ -969,6 +969,7 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
         request.setOrdAmt(payment.getPayMoney().toString());
         request.setOrgReqDate(new SimpleDateFormat("yyyyMMdd").format(payment.getCreateTime()));
         request.setReqSeqId("refund-" + payment.getPayCode());
+        request.setAppId(payment.getAppId());
         Map<String, Object> extendInfoMap = new HashMap<>();
         extendInfoMap.put("org_req_seq_id", orderType + "-" + payment.getPayCode());
         request.setExtendInfo(extendInfoMap);

fs-service/src/main/java/com/fs/huifuPay/sdk/opps/core/request/V2TradePaymentScanpayRefundRequest.java

@@ -43,6 +43,8 @@ public class V2TradePaymentScanpayRefundRequest extends BaseRequest {
     @JSONField(name = "org_hf_seq_id")
     private String orgHfSeqId;
 
+    private String appId;
+
     @Override
     public FunctionCodeEnum getFunctionCode() {
         return FunctionCodeEnum.V2_TRADE_PAYMENT_SCANPAY_REFUND;
@@ -106,4 +108,12 @@ public class V2TradePaymentScanpayRefundRequest extends BaseRequest {
     public void setOrgHfSeqId(String orgHfSeqId) {
         this.orgHfSeqId = orgHfSeqId;
     }
+
+    public String getAppId() {
+        return appId;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
 }

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

@@ -77,12 +77,12 @@ public class HuiFuServiceImpl implements HuiFuService {
             // 禁用信用卡标记
             extendInfoMap.put("limit_pay_type", "NO_CREDIT");
             // 是否延迟交易 Y 为延迟 N为不延迟，不传默认N
-            if (order.getIsDelay() == 1) {
-                extendInfoMap.put("delay_acct_flag", "Y");
-            } else {
-                extendInfoMap.put("delay_acct_flag", "N");
-            }
-            //extendInfoMap.put("delay_acct_flag", "N");
+//            if (order.getIsDelay() == 1) {
+//                extendInfoMap.put("delay_acct_flag", "Y");
+//            } else {
+//                extendInfoMap.put("delay_acct_flag", "N");
+//            }
+            extendInfoMap.put("delay_acct_flag", "N");
             extendInfoMap.put("pay_scene", "02");
             // 传入分帐遇到优惠的处理规则 1: 按比例分，2: 按分账明细顺序保障，3: 只给交易商户（默认)
             extendInfoMap.put("term_div_coupon_type", "0");
@@ -168,7 +168,19 @@ public class HuiFuServiceImpl implements HuiFuService {
     public HuiFuRefundResult refund(V2TradePaymentScanpayRefundRequest request) {
         HuiFuRefundResult huiFuRefundResult=null;
         try {
-            doInit(getMerConfig());
+            if (request.getAppId() != null) {
+                FsHfpayConfigMapper fsHfpayConfigMapper = SpringUtils.getBean(FsHfpayConfigMapper.class);
+                FsHfpayConfig fsHfpayConfig = fsHfpayConfigMapper.selectByAppId(request.getAppId());
+                if (fsHfpayConfig != null) {
+                    //多汇付支付获取配置
+                    doInit(getMerConfig(fsHfpayConfig));
+                } else {
+                    //多小程序
+                    doInit(getMerConfig());
+                }
+            } else {
+                doInit(getMerConfig());
+            }
             request.setReqDate(DateTools.getCurrentDateYYYYMMDD());
             Map<String, Object> response = doExecute(request);
             String jsonString = JSONObject.toJSONString(response);