服务周期修改

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

@@ -21,6 +21,8 @@ public class AppletCardDTO implements Serializable{
     private Long cardConfigId;
     private String cardName;
 
+    private Boolean mainCard;
+
     /**
      * 子卡列表
      */

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

@@ -21,6 +21,6 @@ public class AppletMainCardDTO implements Serializable{
     /**
      * 是否是主卡，否：关联的平衡组主卡
      */
-    private Boolean isMainCard;
+    private Boolean mainCard;
 
 }

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

@@ -142,16 +142,17 @@ public class AppletDecorationConfigApiServiceImpl implements AppletDecorationCon
         //添加主卡
         AppletCardRelationDTO mainCard = mainCardResult.getResult();
         result.add(new AppletMainCardDTO().setCardConfigId(mainCard.getCardConfigId())
-                .setCardName(mainCard.getCardName()).setIsMainCard(true));
+                .setCardName(mainCard.getCardName()).setMainCard(true));
 
+        String mainCardId = mainCard.getCardConfigId().toString();
         List<AppletCardDTO> appletCardList = appletCardResult.getResult();
         for (AppletCardDTO cardDTO : appletCardList) {
             List<AppletCardDTO> subList = cardDTO.getSubList();
             if (CollectionUtils.isNotEmpty(subList)) {
                 for (AppletCardDTO cardDTO1 : subList) {
-                    if (cardDTO1.getCardConfigId().toString().equals(mainCard.getAppletConfId().toString())) {
-                        result.add(new AppletMainCardDTO().setCardConfigId(mainCard.getCardConfigId())
-                                .setCardName(mainCard.getCardName()).setIsMainCard(false));
+                    if (cardDTO1.getCardConfigId().toString().equals(mainCardId)) {
+                        result.add(new AppletMainCardDTO().setCardConfigId(cardDTO.getCardConfigId())
+                                .setCardName(cardDTO.getCardName()).setMainCard(false));
                     }
                 }
             }
@@ -308,6 +309,14 @@ public class AppletDecorationConfigApiServiceImpl implements AppletDecorationCon
             return ServiceResponse.failure(appletResult.getCode(), appletResult.getMessage());
         }
         long appletConfigId = appletResult.getResult();
+
+        //默认主卡
+        ServiceResponse<Long> mainCardResult = getMainCard(appId, enterpriseId);
+        String mainCardId = "";
+        if (mainCardResult.isSuccess()) {
+            mainCardId = mainCardResult.getResult().toString();
+        }
+
         ServiceResponse<List<MemberCardRelDTO>> appletCardResult = appletsConfigApiService
                 .queryAppletIntegralBalanceCardRel(appletConfigId, enterpriseId);
         if (appletCardResult.isSuccess()) {
@@ -316,15 +325,18 @@ public class AppletDecorationConfigApiServiceImpl implements AppletDecorationCon
             if (CollectionUtils.isNotEmpty(cardList)) {
                 for (MemberCardRelDTO card : cardList) {
                     List<MemberCardRelDTO> sub = card.getRelCards();
+                    Boolean isMainCard = card.getId().toString().endsWith(mainCardId);
+
                     List<AppletCardDTO> subList = new ArrayList<>();
                     if (CollectionUtils.isNotEmpty(sub)) {
                         for (MemberCardRelDTO subTemp : sub) {
+                            Boolean isMainCardTemp = subTemp.getId().toString().endsWith(mainCardId);
                             subList.add(new AppletCardDTO().setCardConfigId(subTemp.getId())
-                                    .setCardName(subTemp.getName()));
+                                    .setCardName(subTemp.getName()).setMainCard(isMainCardTemp));
                         }
                     }
                     resultList.add(new AppletCardDTO().setCardName(card.getName()).setCardConfigId(card.getId())
-                            .setSubList(subList));
+                            .setSubList(subList).setMainCard(isMainCard));
                 }
             }
             return ServiceResponse.success(resultList);

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

@@ -45,4 +45,10 @@ public class AppletDecorationConfigController {
         return ResultControllerUtils.commonResult(appletDecorationConfigApiService.listAppletCard(appId,
                 UserDetailUtils.getUserDetail().getEnterpriseId()), AppletCardRealtionVO.class);
     }
+
+    @RequestMapping("/list-applet-card-of-total-integral")
+    public RestResponse listAppletCardOfTotalIntegral(String appId) {
+        return ResultControllerUtils.commonResult(appletDecorationConfigApiService.listAppletCardOfTotalIntegral(appId,
+                UserDetailUtils.getUserDetail().getEnterpriseId()), AppletCardRealtionVO.class);
+    }
 }