Merge branch 'developer' into 'master'

Developer

See merge request !20

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

 package com.gic.enterprise.web.controller;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import com.gic.enterprise.web.vo.GradeConfigListVO;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.webapi.reponse.RestResponse;
@@ -9,6 +20,7 @@ import com.gic.enterprise.service.LinkApiService;
 import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.enterprise.utils.UserDetailUtils;
 import com.gic.enterprise.web.vo.ActivityThemeVO;
+import com.gic.enterprise.web.vo.AppletsConfigSimpleOutputVO;
 import com.gic.mall.api.dto.activity.MallActivityPageSerchDTO;
 import com.gic.mall.api.dto.activity.MallActivityThemeDTO;
 import com.gic.mall.api.service.MallActivityThemeApiService;
@@ -16,16 +28,10 @@ import com.gic.mall.share.api.dto.shop.ShopDTO;
 import com.gic.mall.share.api.service.ShopApiService;
 import com.gic.member.config.api.dto.AppletCardRelationDTO;
 import com.gic.member.config.api.dto.AppletsConfigSimpleOutputDTO;
+import com.gic.member.config.api.dto.GradeConfigListDTO;
 import com.gic.member.config.api.service.AppletsConfigApiService;
+import com.gic.member.config.api.service.GradeConfigApiService;
 import com.gic.member.config.api.service.ServiceConfigApiService;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
 
 /**
  *
@@ -46,6 +52,8 @@ public class LinkController {
     private ShopApiService shopApiService;
     @Autowired
     private MallActivityThemeApiService mallActivityThemeApiService;
+    @Autowired
+    private GradeConfigApiService gradeConfigApiService;
 
     @RequestMapping("/list-link-data")
     public RestResponse listLinkData(Integer parentId) {
@@ -106,4 +114,35 @@ public class LinkController {
         }
     }
 
+    /**
+     * 会员卡ID查询关联的小程序列表
+     * @Title: listAppletByMemberCard

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

+     * @return  com.gic.commons.webapi.reponse.RestResponse

+    
*/
+    @RequestMapping("/list-applet-by-member-card")
+    public RestResponse listAppletByMemberCard(Long cardId) {
+        ServiceResponse<List<AppletsConfigSimpleOutputDTO>> response = appletsConfigApiService
+                .queryAppletAreaIdBycardId(UserDetailUtils.getUserDetail().getEnterpriseId(), cardId);
+        if (response.isSuccess()) {
+            List<AppletsConfigSimpleOutputDTO> dtoList = response.getResult();
+            if (CollectionUtils.isNotEmpty(dtoList)) {
+                return RestResponse.success(dtoList
+                        .stream()
+                        .map(e -> new AppletsConfigSimpleOutputVO().setAppId(e.getAppId()).setName(e.getAppletConfigName()))
+                        .collect(Collectors.toList()));
+            }
+        }
+        return ResultControllerUtils.commonResult(response);
+    }
+
+    @RequestMapping("/list-member-grade-by-member-card")
+    public RestResponse listMemberGradeByMemberCard(Long cardId) {
+        ServiceResponse<List<GradeConfigListDTO>> response = gradeConfigApiService
+                .queryGradeConfigList(cardId, UserDetailUtils.getUserDetail().getEnterpriseId());
+        return ResultControllerUtils.commonResult(response, GradeConfigListVO.class);
+    }
+
 }

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

+package com.gic.enterprise.web.vo;
+
+import java.io.Serializable;
+
+public class AppletsConfigSimpleOutputVO implements Serializable{
+
+    private static final long serialVersionUID = 2594930275338549105L;
+    private String name;
+
+    private String appId;
+
+    public AppletsConfigSimpleOutputVO(String name, String appId) {
+        this.name = name;
+        this.appId = appId;
+    }
+
+    public AppletsConfigSimpleOutputVO() {
+
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public AppletsConfigSimpleOutputVO setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getAppId() {
+        return appId;
+    }
+
+    public AppletsConfigSimpleOutputVO setAppId(String appId) {
+        this.appId = appId;
+        return this;
+    }
+}

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

+package com.gic.enterprise.web.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
+
+public class GradeConfigListVO implements Serializable{
+    private static final long serialVersionUID = 2952365056441953832L;
+
+
+    /*
+     * 主键id
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long id;
+    /*
+     * 等级名称
+     */
+    private String gradeName;
+    /*
+     *  等级code
+     */
+    private String gradeCode;
+    /*
+     * 卡背面类型 1 纯色 2 自定义背景
+     */
+    private Integer backgroundType;
+    /*
+     *  卡面 颜色代码 或者背景图片地址
+     */
+    private String background;
+    /*
+     *  卡面文字背景颜色
+     */
+    private String backgroundWords;
+    /*
+     * 等级类型 1 常规卡  2 特殊卡
+     */
+    private Integer gradeType;
+    /*
+     * 排序
+     */
+    private Integer sort;
+
+    public Long getId() {
+        return id;
+    }
+
+    public GradeConfigListVO setId(Long id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getGradeName() {
+        return gradeName;
+    }
+
+    public GradeConfigListVO setGradeName(String gradeName) {
+        this.gradeName = gradeName;
+        return this;
+    }
+
+    public String getGradeCode() {
+        return gradeCode;
+    }
+
+    public GradeConfigListVO setGradeCode(String gradeCode) {
+        this.gradeCode = gradeCode;
+        return this;
+    }
+
+    public Integer getBackgroundType() {
+        return backgroundType;
+    }
+
+    public GradeConfigListVO setBackgroundType(Integer backgroundType) {
+        this.backgroundType = backgroundType;
+        return this;
+    }
+
+    public String getBackground() {
+        return background;
+    }
+
+    public GradeConfigListVO setBackground(String background) {
+        this.background = background;
+        return this;
+    }
+
+    public String getBackgroundWords() {
+        return backgroundWords;
+    }
+
+    public GradeConfigListVO setBackgroundWords(String backgroundWords) {
+        this.backgroundWords = backgroundWords;
+        return this;
+    }
+
+    public Integer getGradeType() {
+        return gradeType;
+    }
+
+    public GradeConfigListVO setGradeType(Integer gradeType) {
+        this.gradeType = gradeType;
+        return this;
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public GradeConfigListVO setSort(Integer sort) {
+        this.sort = sort;
+        return this;
+    }
+}

gic-platform-enterprise-web/src/main/resources/dubbo-gic-platform-enterprise-web.xml

@@ -106,6 +106,7 @@
     <dubbo:reference interface="com.gic.auth.service.MenuApiService" id="menuApiService" timeout="6000"/>
     <dubbo:reference interface="com.gic.enterprise.service.AppletDecorationConfigApiService" id="appletDecorationConfigApiService" timeout="6000"/>
     <dubbo:reference interface="com.gic.member.config.api.service.AppletsConfigApiService" id="appletsConfigApiService" timeout="6000"/>
+    <dubbo:reference interface="com.gic.member.config.api.service.GradeConfigApiService" id="gradeConfigApiService" timeout="6000"/>
     <dubbo:reference interface="com.gic.member.config.api.service.ServiceConfigApiService" id="serviceConfigApiService" timeout="6000"/>
 
     <dubbo:reference interface="com.gic.open.api.service.market.MarketUserApiService" id="marketUserApiService" timeout="6000" />

gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/LoginController.java

@@ -122,6 +122,7 @@ public class LoginController {
                 temp.setUserName(userDetailsVO.getRealName());
                 temp.setPhoneAreaCode(Constants.NATION_CODE);
                 temp.setSuperAdmin(1);
+                temp.setLoginType(1);
                 ServiceResponse<Integer> saveResult = userApiService.saveOperationUser(temp);
                 user = temp;
                 user.setUserId(saveResult.getResult());