Merge remote-tracking branch 'origin/Payment-Configuration' into Payment-Configuration

fs-admin/src/main/java/com/fs/his/controller/MerchantAppConfigController.java

@@ -77,6 +77,8 @@ public class MerchantAppConfigController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody MerchantAppConfig merchantAppConfig)
     {
+        merchantAppConfig.setCreatedBy(getUsername());
+        merchantAppConfig.setUpdatedBy(getUsername());
         return toAjax(merchantAppConfigService.insertMerchantAppConfig(merchantAppConfig));
     }
 
@@ -88,6 +90,7 @@ public class MerchantAppConfigController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody MerchantAppConfig merchantAppConfig)
     {
+        merchantAppConfig.setUpdatedBy(getUsername());
         return toAjax(merchantAppConfigService.updateMerchantAppConfig(merchantAppConfig));
     }
 

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

@@ -15,6 +15,9 @@ public class FsPayConfig {
     private String appId;
     private String wxMchId;
     private String wxMchKey;
+    private String keyPath;
+    private String wxApiV3Key;
+    private String notifyUrlScrm;
 
     private String ybNotifyUrl;
     private String tzPayDecrypt;

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

@@ -25,7 +25,7 @@ public class MerchantAppConfig extends BaseEntity{
     @Excel(name = "商户类型")
     private String merchantType;
 
-    /** 应用ID */
+    // 应用ID
     @Excel(name = "应用ID")
     private String appId;
 

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

@@ -111,6 +111,26 @@ public class MerchantAppConfigServiceImpl extends ServiceImpl<MerchantAppConfigM
     @Override
     public int insertMerchantAppConfig(MerchantAppConfig merchantAppConfig)
     {
+        FsPayConfig fsPayConfig = JSON.parseObject(merchantAppConfig.getDataJson(), FsPayConfig.class);
+        switch (merchantAppConfig.getMerchantType()){
+            case "yb": // 易宝
+                merchantAppConfig.setMerchantId(fsPayConfig.getYbAccount());
+                merchantAppConfig.setCallbackUrl(fsPayConfig.getYbNotifyUrl());
+
+                break;
+            case "tz": // 台州
+                merchantAppConfig.setMerchantId(fsPayConfig.getTzPlatMerCstNo());
+                break;
+            case "wx": // 微信
+                merchantAppConfig.setMerchantId(fsPayConfig.getWxMchId());
+                break;
+            case "hf": // 汇付
+                merchantAppConfig.setMerchantId(fsPayConfig.getHuifuId());
+                break;
+            default:
+                throw new RuntimeException("商户类型错误");
+        }
+
         return baseMapper.insertMerchantAppConfig(merchantAppConfig);
     }