调整汇付回调信息

fs-service/src/main/java/com/fs/his/domain/FsPayConfig.java

@@ -26,7 +26,16 @@ public class FsPayConfig {
     private String huifuId;
     private String hfRsaPrivateKey;
     private String hfRsaPublicKey;
+
+    /**
+     * 商城汇付回调地址
+     */
     private String hfPayNotifyUrl;
+
+    /**
+     * 互医汇付回调地址
+     */
+    private String hfHyPayNotifyUrl;
     private String hfPayOnlineNotifyUrl;
     private String hfRefundNotifyUrl;
     private String hfOnlineRefundNotifyUrl;

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

@@ -556,7 +556,7 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
         }
 
         FsPackageOrder  order=new FsPackageOrder();
-        String orderSn =  OrderCodeUtils.getOrderSn();
+        String orderSn = IdUtil.getSnowflake(0, 0).nextIdStr();
         if(StringUtils.isEmpty(orderSn)){
             return R.error("订单生成失败，请重试");
         }
@@ -985,7 +985,7 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
 
         if(user!=null&& StringUtils.isNotEmpty(openId)){
             if(fsPackageOrder.getPayMoney().compareTo(new BigDecimal(0))==1){
-                String payCode =  OrderCodeUtils.getOrderSn();
+                String payCode = IdUtil.getSnowflake(0, 0).nextIdStr();
                 if(StringUtils.isEmpty(payCode)){
                     return R.error("订单生成失败，请重试");
                 }
@@ -1182,7 +1182,7 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
         FsUser user=userService.selectFsUserByUserId(param.getUserId());
         if(user!=null){
             if(fsPackageOrder.getPayMoney().compareTo(new BigDecimal(0))==1){
-                String payCode =  OrderCodeUtils.getOrderSn();
+                String payCode = IdUtil.getSnowflake(0, 0).nextIdStr();
                 if(StringUtils.isEmpty(payCode)){
                     return R.error("订单生成失败，请重试");
                 }
@@ -1327,7 +1327,7 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
             if(fsPackageOrder.getPayMoney().compareTo(new BigDecimal(0))==1){
 //                String json = configService.selectConfigByKey("his.pay");
 //                PayConfigDTO payConfigDTO = JSONUtil.toBean(json, PayConfigDTO.class);
-                String payCode =  OrderCodeUtils.getOrderSn();
+                String payCode = IdUtil.getSnowflake(0, 0).nextIdStr();
                 if(StringUtils.isEmpty(payCode)){
                     return R.error("订单生成失败，请重试");
                 }

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

@@ -3928,6 +3928,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                     } catch (Exception e) {
                         logger.error("-------------分账出错：{}", e.getMessage());
                     }
+                    o.setIsPayNotifyUrl(true);
                     HuifuCreateOrderResult result = huiFuService.createOrder(o);
                     if(result.getResp_code()!=null&&(result.getResp_code().equals("00000000")||result.getResp_code().equals("00000100"))){
                         FsStorePaymentScrm mt=new FsStorePaymentScrm();
@@ -4056,6 +4057,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                 o.setReqSeqId("store-"+storePayment.getPayCode());
                 o.setTransAmt(storePayment.getPayMoney().toString());
                 o.setGoodsDesc("商城订单支付");
+                o.setIsPayNotifyUrl(true);
                 HuifuCreateOrderResult result = huiFuService.createOrder(o);
                 if(result.getResp_code()!=null&&(result.getResp_code().equals("00000000")||result.getResp_code().equals("00000100"))){
 
@@ -4172,6 +4174,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                 o.setReqSeqId("store-"+storePayment.getPayCode());
                 o.setTransAmt(storePayment.getPayMoney().toString());
                 o.setGoodsDesc("商城订单支付");
+                o.setIsPayNotifyUrl(true);
                 HuifuCreateOrderResult result = huiFuService.createOrder(o);
                 if(result.getResp_code()!=null&&(result.getResp_code().equals("00000000")||result.getResp_code().equals("00000100"))){
 
@@ -4273,6 +4276,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                 o.setReqSeqId("store_remain-"+storePayment.getPayCode());
                 o.setTransAmt(storePayment.getPayMoney().toString());
                 o.setGoodsDesc("商城订单尾款支付");
+                o.setIsPayNotifyUrl(true);
                 HuifuCreateOrderResult result = huiFuService.createOrder(o);
                 //创建订单
                 if(result.getResp_code()!=null&&(result.getResp_code().equals("00000000")||result.getResp_code().equals("00000100"))){

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

@@ -901,6 +901,7 @@ public class FsStorePaymentScrmServiceImpl implements IFsStorePaymentScrmService
         } catch (Exception e) {
             logger.error("-------------微信收款分账出错：{}", e.getMessage());
         }
+        o.setIsPayNotifyUrl(true);
         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/huifuPay/domain/HuiFuCreateOrder.java

@@ -22,4 +22,5 @@ public class HuiFuCreateOrder {
     String appId; //多小程序支付
     String acctSplitBunch; //公司分账参数
     String delayAcctFlag; //延时交易 延迟分账需要
+    Boolean isPayNotifyUrl = false; //判断是否为商城会回调
 }

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

@@ -105,7 +105,11 @@ public class HuiFuServiceImpl implements HuiFuService {
             request.setGoodsDesc(order.getGoodsDesc());
             extendInfoMap.put("fq_mer_discount_flag", "N");
             logger.info("汇付回调地址=================："+config.getHfPayNotifyUrl());
-            extendInfoMap.put("notify_url", config.getHfPayNotifyUrl());
+            if (order.getIsPayNotifyUrl()){
+                extendInfoMap.put("notify_url", config.getHfPayNotifyUrl());
+            }else {
+                extendInfoMap.put("notify_url", config.getHfHyPayNotifyUrl());
+            }
             extendInfoMap.put("remark", "string");
             request.setExtendInfo(extendInfoMap);
             logger.info("汇付传参："+request);

fs-service/src/main/resources/application-config-druid-cqtyt.yml

@@ -65,6 +65,12 @@ watch:
 fs :
   commonApi: http://172.16.0.9:8010
   h5CommonApi: http://192.168.0.18:7771
+  jwt:
+    # 加密秘钥
+    secret: f4e2e52034348f86b67cde581c0f9eb5
+    # token有效时长，7天，单位秒
+    expire: 31536000
+    header: AppToken
 nuonuo:
   key: 10924508
   secret: A2EB20764D304D16