更新！

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/paySetting/ProjectPaySettingController.java

@@ -36,22 +36,22 @@ public class ProjectPaySettingController {
 
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "保存项目的微信支付设置", description = "保存项目的微信支付设置")
-    @RequestMapping(value = "saveWxPayConfig", method = {RequestMethod.POST})
-    public ResultContent saveWxPayConfig(@RequestBody WxPayConfigParam param) {
+    @RequestMapping(value = "saveWxPayConfig", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, method = {RequestMethod.POST})
+    public ResultContent saveWxPayConfig(WxPayConfigParam param) {
         return projectPaySettingService.saveWxPayConfig(param);
     }
 
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "得到项目的微信支付配置", description = "得到项目的微信支付配置")
     @RequestMapping(value = "getWxPayConfig", method = {RequestMethod.POST})
-    public ResultContent<WxPayConfigParam> getWxPayConfig(@RequestBody ProjectOidParam param) {
+    public ResultContent<WxPayConfigModel> getWxPayConfig(@RequestBody ProjectOidParam param) {
         return projectPaySettingService.getWxPayConfig(param.getProjectOid());
     }
 
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "保存项目的拉卡拉支付设置", description = "保存项目的拉卡拉支付设置")
     @RequestMapping(value = "saveLaKaLaConfig", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, method = RequestMethod.POST)
-    public ResultContent saveLaKaLaConfig(@RequestBody LaKaLaCollectionConfigParam param) {
+    public ResultContent saveLaKaLaConfig(LaKaLaCollectionConfigParam param) {
         return projectPaySettingService.saveLaKaLaConfig(param);
     }
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/paySetting/ProjectPaySettingServiceImpl.java

@@ -60,7 +60,18 @@ public class ProjectPaySettingServiceImpl extends SuperService {
      */
     public ResultContent saveWxPayConfig(WxPayConfigParam param) {
         //TODO 检查微信支付参数等
-        return saveProjectPaySetting(param.getProjectOid(), PaymentType.WeChat, param);
+        ResultContent<WxPayConfigModel> resultContent = getWxPayConfig(param.getProjectOid());
+        WxPayConfigModel configModel = null;
+        if (resultContent.isSuccess()) {
+            configModel = resultContent.getContent();
+        }
+        if (ObjectUtils.isEmpty(configModel)) {
+            configModel = new WxPayConfigModel();
+        }
+        BeanUtils.copyProperties(param, configModel);
+        configModel.setPrivateKeyStr(AesUtils.turnMultipartFileToBase64(param.getPrivateKeyFile()));
+
+        return saveProjectPaySetting(param.getProjectOid(), PaymentType.WeChat, configModel);
     }
 
     /**
@@ -69,11 +80,11 @@ public class ProjectPaySettingServiceImpl extends SuperService {
      * @param projectOid
      * @return
      */
-    public ResultContent<WxPayConfigParam> getWxPayConfig(String projectOid) {
-        WxPayConfigParam model = null;
+    public ResultContent<WxPayConfigModel> getWxPayConfig(String projectOid) {
+        WxPayConfigModel model = null;
         ProjectPaySetting paySetting = getProjectPaySetting(projectOid, PaymentType.WeChat);
         if (ObjectUtils.isNotEmpty(paySetting)) {
-            model = (WxPayConfigParam) paySetting.getPayConfig();
+            model = (WxPayConfigModel) paySetting.getPayConfig();
         }
         return ResultContent.buildSuccess(model);
     }