装修配置修改

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/AppletDataAssetAreaDTO.java

@@ -35,6 +35,21 @@ public class AppletDataAssetAreaDTO implements Serializable{
      */
     private String mallOrderName;
 
+    /**
+     * 签到 系统默认主卡，不可编辑
+     */
+    private String signIn;
+
+    /**
+     * 会员成就 系统默认主卡，不可编辑
+     */
+    private String memberAchievement;
+
+    /**
+     * 会员任务 系统默认主卡，不可编辑
+     */
+    private String memberTask;
+
     public String getIntegral() {
         return integral;
     }
@@ -74,4 +89,28 @@ public class AppletDataAssetAreaDTO implements Serializable{
     public void setMallOrderName(String mallOrderName) {
         this.mallOrderName = mallOrderName;
     }
+
+    public String getSignIn() {
+        return signIn;
+    }
+
+    public void setSignIn(String signIn) {
+        this.signIn = signIn;
+    }
+
+    public String getMemberAchievement() {
+        return memberAchievement;
+    }
+
+    public void setMemberAchievement(String memberAchievement) {
+        this.memberAchievement = memberAchievement;
+    }
+
+    public String getMemberTask() {
+        return memberTask;
+    }
+
+    public void setMemberTask(String memberTask) {
+        this.memberTask = memberTask;
+    }
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/AppletDecorationConfigApiServiceImpl.java

@@ -64,6 +64,19 @@ public class AppletDecorationConfigApiServiceImpl implements AppletDecorationCon
         ShopDTO shopDTO = shopResult.getResult();
         appletDataAssetArea.setMallOrder(shopDTO.getId().toString());
         appletDataAssetArea.setMallOrderName(shopDTO.getName());
+
+        //默认配置信息
+        ServiceResponse<Long> mainCardResult = getMainCard(dto.getAppId(), dto.getEnterpriseId());
+        if (!mainCardResult.isSuccess()) {
+            return ServiceResponse.failure(mainCardResult.getCode(), mainCardResult.getMessage());
+        }
+        String mainCardId = mainCardResult.getResult().toString();
+        //签到 系统默认主卡，不可编辑
+        appletDataAssetArea.setSignIn(mainCardId);
+        //会员成就 系统默认主卡，不可编辑
+        appletDataAssetArea.setMemberAchievement(mainCardId);
+        //会员任务 系统默认主卡，不可编辑
+        appletDataAssetArea.setMemberTask(mainCardId);
         //数据资产设置
         dto.setDataAssetArea(JSON.toJSONString(appletDataAssetArea));
         return ServiceResponse.success(appletDecorationConfigService.save(dto));
@@ -90,6 +103,18 @@ public class AppletDecorationConfigApiServiceImpl implements AppletDecorationCon
         AppletDataAssetAreaDTO old = JSON.parseObject(record.getDataAssetArea(), AppletDataAssetAreaDTO.class);
         AppletDataAssetAreaDTO appletDataAssetArea = dto.getAppletDataAssetArea();
         appletDataAssetArea.setMallOrder(old.getMallOrder());
+        //默认配置信息
+        ServiceResponse<Long> mainCardResult = getMainCard(dto.getAppId(), dto.getEnterpriseId());
+        if (!mainCardResult.isSuccess()) {
+            return ServiceResponse.failure(mainCardResult.getCode(), mainCardResult.getMessage());
+        }
+        String mainCardId = mainCardResult.getResult().toString();
+        //签到 系统默认主卡，不可编辑
+        appletDataAssetArea.setSignIn(mainCardId);
+        //会员成就 系统默认主卡，不可编辑
+        appletDataAssetArea.setMemberAchievement(mainCardId);
+        //会员任务 系统默认主卡，不可编辑
+        appletDataAssetArea.setMemberTask(mainCardId);
         //数据资产设置
         dto.setDataAssetArea(JSON.toJSONString(appletDataAssetArea));
         appletDecorationConfigService.edit(dto);

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/AppletDecorationConfigController.java

 package com.gic.enterprise.web.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.enterprise.dto.AppletDataAssetAreaDTO;
 import com.gic.enterprise.dto.AppletDecorationConfigDTO;
 import com.gic.enterprise.service.AppletDecorationConfigApiService;
 import com.gic.enterprise.utils.ResultControllerUtils;
@@ -17,13 +19,17 @@ public class AppletDecorationConfigController {
     private AppletDecorationConfigApiService appletDecorationConfigApiService;
 
     @RequestMapping("/save")
-    public RestResponse save(AppletDecorationConfigDTO dto) {
+    public RestResponse save(AppletDecorationConfigDTO dto, String dataAreaJson) {
+        AppletDataAssetAreaDTO dataAssetAreaDTO = JSON.parseObject(dataAreaJson, AppletDataAssetAreaDTO.class);
+        dto.setAppletDataAssetArea(dataAssetAreaDTO);
         dto.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
         return ResultControllerUtils.commonResult(appletDecorationConfigApiService.save(dto));
     }
 
     @RequestMapping("/edit")
-    public RestResponse edit(AppletDecorationConfigDTO dto) {
+    public RestResponse edit(AppletDecorationConfigDTO dto, String dataAreaJson) {
+        AppletDataAssetAreaDTO dataAssetAreaDTO = JSON.parseObject(dataAreaJson, AppletDataAssetAreaDTO.class);
+        dto.setAppletDataAssetArea(dataAssetAreaDTO);
         return ResultControllerUtils.commonResult(appletDecorationConfigApiService.edit(dto));
     }