装修配置挑战：添加可用积分已经会员卡列表数据调整

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/AppletDecorationConfigApiService.java

@@ -62,4 +62,16 @@ public interface AppletDecorationConfigApiService {
      * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Object>

     
*/
     ServiceResponse<Object> listAppletCardOfTotalIntegral(String appId, Integer enterpriseId);
+
+    /**
+     * 根据平衡组主卡查询子卡列表
+     * @Title: listAppletCardByCardId

+     * @Description:
+    
* @author guojuxing
+     * @param cardId
+     * @param appId
+     * @param enterpriseId

+     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Object>

+    
*/
+    ServiceResponse<Object> listAppletCardByCardId(String cardId, String appId, Integer enterpriseId);
 }

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

@@ -160,6 +160,30 @@ public class AppletDecorationConfigApiServiceImpl implements AppletDecorationCon
         return ServiceResponse.success(result);
     }
 
+    @Override
+    public ServiceResponse<Object> listAppletCardByCardId(String cardId, String appId, Integer enterpriseId) {
+        //校验参数数值是否非法
+        ServiceResponse<List<AppletCardDTO>> appletCardResult = getMemberCardByAppId(appId, enterpriseId);
+        if (!appletCardResult.isSuccess()) {
+            return ServiceResponse.failure(appletCardResult.getCode(), appletCardResult.getMessage());
+        }
+        List<AppletCardDTO> appletCardList = appletCardResult.getResult();
+        List<AppletCardDTO> result = new ArrayList<>();
+        for (AppletCardDTO cardDTO : appletCardList) {
+            if (cardDTO.getCardConfigId().toString().equals(cardId)) {
+                result.add(new AppletCardDTO().setCardConfigId(cardDTO.getCardConfigId())
+                        .setCardName(cardDTO.getCardName()));
+                List<AppletCardDTO> subList = cardDTO.getSubList();
+                if (CollectionUtils.isNotEmpty(subList)) {
+                    for (AppletCardDTO sub : subList) {
+                        result.add(sub);
+                    }
+                }
+            }
+        }
+        return ServiceResponse.success(result);
+    }
+
     private ServiceResponse valueValid(AppletDecorationConfigDTO dto) {
         String appId = dto.getAppId();
         Integer enterpriseId = dto.getEnterpriseId();

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

@@ -8,6 +8,7 @@ import com.gic.enterprise.service.AppletDecorationConfigApiService;
 import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.enterprise.utils.UserDetailUtils;
 import com.gic.enterprise.web.vo.AppletCardRealtionVO;
+import com.gic.enterprise.web.vo.AppletSubCardVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -51,4 +52,10 @@ public class AppletDecorationConfigController {
         return ResultControllerUtils.commonResult(appletDecorationConfigApiService.listAppletCardOfTotalIntegral(appId,
                 UserDetailUtils.getUserDetail().getEnterpriseId()), AppletCardRealtionVO.class);
     }
+
+    @RequestMapping("/list-applet-card-by-card-id")
+    public RestResponse listAppletCardOfTotalIntegral(String appId, String cardId) {
+        return ResultControllerUtils.commonResult(appletDecorationConfigApiService.listAppletCardByCardId(cardId, appId,
+                UserDetailUtils.getUserDetail().getEnterpriseId()), AppletSubCardVO.class);
+    }
 }

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/vo/AppletCardRealtionVO.java

@@ -23,8 +23,4 @@ public class AppletCardRealtionVO implements Serializable{
     private String cardName;
     private Boolean mainCard;
 
-    /**
-     * 子卡列表
-     */
-    private List<AppletCardDTO> subList;
 }

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/vo/AppletSubCardVO.java

+package com.gic.enterprise.web.vo;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+
+/**
+ * 小程序会员卡列表
+ * @ClassName: AppletCardRealtionVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/2/13 10:49 AM

+ */
+@Data
+public class AppletSubCardVO implements Serializable{
+    private static final long serialVersionUID = -4411940910579516581L;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long cardConfigId;
+    private String cardName;
+
+}