商城代码，上线测试缺陷修复2

fs-service/src/main/java/com/fs/his/utils/ConfigUtil.java

@@ -46,6 +46,13 @@ public class ConfigUtil {
     public <T> T generateConfigByKey(String key, Class<T> clazz){
         SysConfig sysConfig = sysConfigMapper.selectConfigByConfigKey(key);
         String configValue = sysConfig.getConfigValue();
+        if(configValue != null && configValue.trim().startsWith("[")){
+            JSONArray array = JSON.parseArray(configValue);
+            if (array.size() > 0) {
+                return array.getObject(0, clazz);
+            }
+            return null;
+        }
         return JSON.parseObject(configValue, clazz);
     }
 

fs-service/src/main/java/com/fs/hisStore/domain/FsPayConfigScrm.java

@@ -25,4 +25,14 @@ public class FsPayConfigScrm {
     private String hfPayOnlineNotifyUrl;
     private String hfRefundNotifyUrl;
     private String hfOnlineRefundNotifyUrl;
+
+
+    private String keyPath;
+    private String wxApiV3Key;
+    private String privateKeyPath;
+    private String privateCertPath;
+    private String notifyUrl;
+    private String notifyUrlScrm;
+    private String publicKeyPath;
+    private String publicKeyId;
 }

fs-user-app/src/main/java/com/fs/app/controller/store/StoreOrderScrmController.java

@@ -18,7 +18,6 @@ import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.StringUtils;
 import com.fs.common.utils.ip.IpUtils;
 import com.fs.core.config.WxMaConfiguration;
-import com.fs.core.config.WxPayProperties;
 import com.fs.erp.service.IErpOrderService;
 import com.fs.his.utils.ConfigUtil;
 import com.fs.hisStore.config.FsErpConfig;
@@ -72,8 +71,6 @@ public class StoreOrderScrmController extends AppBaseController {
     private static final String STORE_PAY_CONF = "store.pay";
 
     Logger logger= LoggerFactory.getLogger(getClass());
-    @Autowired
-    private WxPayProperties wxPayProperties;
 
     @Autowired
     private WxMaProperties properties;
@@ -199,7 +196,7 @@ public class StoreOrderScrmController extends AppBaseController {
         List<FsStoreOrderItemVO> list=itemService.selectFsStoreOrderItemListByOrderId(orderId);
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(order.getCreateTime());
-        String json=configService.selectConfigByKey("store.config");
+        String json=configService.selectConfigByKey("his.store");
         StoreConfig config=JSONUtil.toBean(json,StoreConfig.class);
         calendar.add(Calendar.MINUTE,config.getUnPayTime());
         SimpleDateFormat format = new   SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -240,7 +237,7 @@ public class StoreOrderScrmController extends AppBaseController {
         order.setUserPhone(ParseUtils.parsePhone(order.getUserPhone()));
         order.setUserAddress(ParseUtils.parseIdCard(order.getUserAddress()));
 
-        String json=configService.selectConfigByKey("store.config");
+        String json=configService.selectConfigByKey("his.store");
         StoreConfig config=JSONUtil.toBean(json,StoreConfig.class);
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(order.getCreateTime());
@@ -304,7 +301,7 @@ public class StoreOrderScrmController extends AppBaseController {
 
             }
             else{
-                String config=configService.selectConfigByKey("store.config");
+                String config=configService.selectConfigByKey("his.store");
                 StoreConfig storeConfig= JSONUtil.toBean(config,StoreConfig.class);
                 if(param.getPayType().equals(1)){
                     order.setPayType("1");
@@ -384,8 +381,8 @@ public class StoreOrderScrmController extends AppBaseController {
                     payConfig.setMchKey(fsPayConfig.getWxMchKey());
                     payConfig.setSubAppId(org.apache.commons.lang3.StringUtils.trimToNull(null));
                     payConfig.setSubMchId(org.apache.commons.lang3.StringUtils.trimToNull(null));
-                    payConfig.setKeyPath(wxPayProperties.getKeyPath());
-                    payConfig.setNotifyUrl(wxPayProperties.getNotifyUrl());
+                    payConfig.setKeyPath(fsPayConfig.getKeyPath());
+                    payConfig.setNotifyUrl(fsPayConfig.getNotifyUrlScrm());
                     wxPayService.setConfig(payConfig);
                     WxPayUnifiedOrderRequest orderRequest = new WxPayUnifiedOrderRequest();
                     orderRequest.setOpenid(user.getMaOpenId());//公众号支付提供用户openid
@@ -460,7 +457,7 @@ public class StoreOrderScrmController extends AppBaseController {
                 //改过价不做处理
             }
             else{
-                String config=configService.selectConfigByKey("store.config");
+                String config=configService.selectConfigByKey("his.store");
                 StoreConfig storeConfig= JSONUtil.toBean(config,StoreConfig.class);
                 if(param.getPayType().equals(1)){
                     order.setPayType("1");
@@ -577,7 +574,7 @@ public class StoreOrderScrmController extends AppBaseController {
                 payConfig.setSubAppId(org.apache.commons.lang3.StringUtils.trimToNull(null));
                 payConfig.setSubMchId(org.apache.commons.lang3.StringUtils.trimToNull(null));
                 payConfig.setKeyPath(null);
-                payConfig.setNotifyUrl(wxPayProperties.getNotifyUrl());
+                payConfig.setNotifyUrl(fsPayConfig.getNotifyUrlScrm());
                 wxPayService.setConfig(payConfig);
                 WxPayUnifiedOrderRequest orderRequest = new WxPayUnifiedOrderRequest();
                 orderRequest.setOpenid(user.getMaOpenId());//公众号支付提供用户openid
@@ -696,7 +693,7 @@ public class StoreOrderScrmController extends AppBaseController {
                 payConfig.setSubAppId(org.apache.commons.lang3.StringUtils.trimToNull(null));
                 payConfig.setSubMchId(org.apache.commons.lang3.StringUtils.trimToNull(null));
                 payConfig.setKeyPath(null);
-                payConfig.setNotifyUrl(wxPayProperties.getNotifyUrl());
+                payConfig.setNotifyUrl(fsPayConfig.getNotifyUrlScrm());
                 wxPayService.setConfig(payConfig);
                 WxPayUnifiedOrderRequest orderRequest = new WxPayUnifiedOrderRequest();
                 orderRequest.setOpenid(user.getMaOpenId());//公众号支付提供用户openid
@@ -816,7 +813,7 @@ public class StoreOrderScrmController extends AppBaseController {
                 payConfig.setSubAppId(org.apache.commons.lang3.StringUtils.trimToNull(null));
                 payConfig.setSubMchId(org.apache.commons.lang3.StringUtils.trimToNull(null));
                 payConfig.setKeyPath(null);
-                payConfig.setNotifyUrl(wxPayProperties.getNotifyUrl());
+                payConfig.setNotifyUrl(fsPayConfig.getNotifyUrlScrm());
                 wxPayService.setConfig(payConfig);
                 WxPayUnifiedOrderRequest orderRequest = new WxPayUnifiedOrderRequest();
                 orderRequest.setOpenid(user.getMaOpenId());//公众号支付提供用户openid