装修配置添加可用积分

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

 package com.gic.enterprise.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 /**
  * 小程序装修配置 数据资产范围
@@ -8,6 +10,7 @@ import java.io.Serializable;
  * @author guojuxing
  
  * @date 2019/12/31 9:26 AM
 
  */
+@Data
 public class AppletDataAssetAreaDTO implements Serializable{
     private static final long serialVersionUID = -8555323283383515771L;
 
@@ -17,6 +20,11 @@ public class AppletDataAssetAreaDTO implements Serializable{
     private String integral;
 
     /**
+     * 可用积分
+     */
+    private String availableIntegral;
+
+    /**
      * 卡券包 会员卡ID，英文逗号隔开
      */
     private String coupon;
@@ -49,68 +57,4 @@ public class AppletDataAssetAreaDTO implements Serializable{
      * 会员任务 系统默认主卡，不可编辑
      */
     private String memberTask;
-
-    public String getIntegral() {
-        return integral;
-    }
-
-    public void setIntegral(String integral) {
-        this.integral = integral;
-    }
-
-    public String getCoupon() {
-        return coupon;
-    }
-
-    public void setCoupon(String coupon) {
-        this.coupon = coupon;
-    }
-
-    public String getOrder() {
-        return order;
-    }
-
-    public void setOrder(String order) {
-        this.order = order;
-    }
-
-    public String getMallOrder() {
-        return mallOrder;
-    }
-
-    public void setMallOrder(String mallOrder) {
-        this.mallOrder = mallOrder;
-    }
-
-    public String getMallOrderName() {
-        return mallOrderName;
-    }
-
-    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

@@ -100,9 +100,17 @@ public class AppletDecorationConfigApiServiceImpl implements AppletDecorationCon
             //GPS智能判定卡 默认关闭
             dto.setGpsDecisionCard(0);
         }
-        AppletDataAssetAreaDTO old = JSON.parseObject(record.getDataAssetArea(), AppletDataAssetAreaDTO.class);
+        //默认选中和主卡关联的店铺，不可编辑 //实时调用
+        ServiceResponse<ShopDTO> shopResult = getMainCardStore(record.getAppId(), record.getEnterpriseId());
+        if (!shopResult.isSuccess()) {
+            return ServiceResponse.failure(shopResult.getCode(), shopResult.getMessage());
+        }
+
         AppletDataAssetAreaDTO appletDataAssetArea = dto.getAppletDataAssetArea();
-        appletDataAssetArea.setMallOrder(old.getMallOrder());
+
+        ShopDTO shopDTO = shopResult.getResult();
+        appletDataAssetArea.setMallOrder(shopDTO.getId().toString());
+        appletDataAssetArea.setMallOrderName(shopDTO.getName());
         //默认配置信息
         ServiceResponse<Long> mainCardResult = getMainCard(dto.getAppId(), dto.getEnterpriseId());
         if (!mainCardResult.isSuccess()) {
@@ -202,6 +210,7 @@ public class AppletDecorationConfigApiServiceImpl implements AppletDecorationCon
         needValidMap.put("数据资产-积分", appletDataAssetArea.getIntegral());
         needValidMap.put("数据资产-卡券包", appletDataAssetArea.getCoupon());
         needValidMap.put("数据资产-零售订", appletDataAssetArea.getOrder());
+        needValidMap.put("数据资产-可用积分", appletDataAssetArea.getAvailableIntegral());
 
         ServiceResponse valueValid;
         for (Map.Entry<String, String> entry : needValidMap.entrySet()) {