注释-> configService.selectConfigByKey("store.pay")->改-> configService.selectConfigByKey("his.pay")

fs-admin/src/main/java/com/fs/hisStore/controller/FsStorePaymentScrmController.java

@@ -194,11 +194,11 @@ public class FsStorePaymentScrmController extends BaseController
 
         if(payment.getPayTypeCode().equals("weixin")){
             String json;
-            if (CloudHostUtils.hasCloudHostName("康年堂")){
+//            if (CloudHostUtils.hasCloudHostName("康年堂")){
                 json = configService.selectConfigByKey("his.pay");
-            } else {
-                json = configService.selectConfigByKey("store.pay");
-            }
+//            } else {
+//                json = configService.selectConfigByKey("store.pay");
+//            }
             if (StringUtils.isBlank(json)) {
                 return R.error("缺少支付相关配置");
             }
@@ -226,6 +226,7 @@ public class FsStorePaymentScrmController extends BaseController
                 Map<String, Object> extendInfoMap = new HashMap<>();
                 extendInfoMap.put("org_party_order_id", payment.getBankSerialNo());
                 request.setExtendInfo(extendInfoMap);
+                logger.info("请求参数："+request);
                 HuiFuRefundResult refund = huiFuService.refund(request);
                 logger.info("退款："+refund);
                 if((refund.getResp_code().equals("00000000")||refund.getResp_code().equals("00000100"))&&(refund.getTrans_stat().equals("S")||refund.getTrans_stat().equals("P"))){
@@ -243,7 +244,8 @@ public class FsStorePaymentScrmController extends BaseController
                     return R.error(refund.getResp_desc());
                 }
 
-            }else if (payment.getPayMode()!=null&&payment.getPayMode().equals("wx")){
+            }
+            else if (payment.getPayMode()!=null&&payment.getPayMode().equals("wx")){
 
             }
 

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

@@ -1423,7 +1423,8 @@ public class FsStoreAfterSalesScrmServiceImpl implements IFsStoreAfterSalesScrmS
         }
         if (payments != null && payments.size() > 0) {
             FsStorePaymentScrm payment = payments.get(0);
-            String json = configService.selectConfigByKey("store.pay");
+//            String json = configService.selectConfigByKey("store.pay");
+            String json = configService.selectConfigByKey("his.pay");
             FsPayConfigScrm fsPayConfig = JSON.parseObject(json, FsPayConfigScrm.class);
             if (payment.getPayMode().equals("wx")) {
                 WxPayConfig payConfig = new WxPayConfig();

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

@@ -5004,7 +5004,8 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                 // 获取未结算订单
                 List<FsStoreOrderScrm> orderScrmList = fsStoreOrderMapper.getUnsettledOrder();
 
-                String payConfig = configService.selectConfigByKey("store.pay");
+//                String payConfig = configService.selectConfigByKey("store.pay");
+                String payConfig = configService.selectConfigByKey("his.pay");
                 JSONObject js = JSON.parseObject(payConfig);
                 String appId = js.getString("appId");
 

fs-service/src/main/java/com/fs/live/service/impl/LiveOrderServiceImpl.java

@@ -2769,7 +2769,8 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
             }
             FsUserScrm user = userMapper.selectFsUserById(Long.valueOf(liveOrder.getUserId()));
             if(user == null) return R.error("用户不存在");
-            String json = configService.selectConfigByKey("store.pay");
+//            String json = configService.selectConfigByKey("store.pay");
+            String json = configService.selectConfigByKey("his.pay");
             FsPayConfig fsPayConfig = JSON.parseObject(json, FsPayConfig.class);
             String payCode =  OrderCodeUtils.getOrderSn();
             if(StringUtils.isEmpty(payCode)){
@@ -3017,7 +3018,8 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
                 // 获取未结算订单
                 List<LiveOrder> orderScrmList = liveOrderMapper.getUnsettledOrder();
 
-                String payConfig = configService.selectConfigByKey("store.pay");
+//                String payConfig = configService.selectConfigByKey("store.pay");
+                String payConfig = configService.selectConfigByKey("his.pay");
                 JSONObject js = JSON.parseObject(payConfig);
                 String appId = js.getString("appId");