小程序装修配置

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

@@ -27,9 +27,13 @@ public class AppletDataAssetAreaDTO implements Serializable{
     private String order;
 
     /**
-     * 商城订单 默认选中和主卡关联的店铺，不可编辑
+     * 商城订单 默认选中和主卡关联的店铺， 店铺ID， 不可编辑
      */
     private String mallOrder;
+    /**
+     * 商城订单 默认选中和主卡关联的店铺，不可编辑，名称，详情里需要用到
+     */
+    private String mallOrderName;
 
     public String getIntegral() {
         return integral;
@@ -62,4 +66,12 @@ public class AppletDataAssetAreaDTO implements Serializable{
     public void setMallOrder(String mallOrder) {
         this.mallOrder = mallOrder;
     }
+
+    public String getMallOrderName() {
+        return mallOrderName;
+    }
+
+    public void setMallOrderName(String mallOrderName) {
+        this.mallOrderName = mallOrderName;
+    }
 }

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

@@ -41,4 +41,15 @@ public interface AppletDecorationConfigApiService {
      * @return  com.gic.api.base.commons.ServiceResponse<com.gic.enterprise.dto.AppletDecorationConfigDTO>

     
 */
     ServiceResponse<AppletDecorationConfigDTO> getDetailByAppId(String appId, Integer enterpriseId);
+
+    /**
+     * 会员卡列表
+     * @Title: listAppletCard

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

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

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

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

@@ -119,6 +119,7 @@ public class AppletDecorationConfigApiServiceImpl implements AppletDecorationCon
             dataAssetArea.setCoupon(mainCardId.toString());
             dataAssetArea.setIntegral(mainCardId.toString());
             dataAssetArea.setMallOrder(shopDTO.getId().toString());
+            dataAssetArea.setMallOrderName(shopDTO.getName());
             //会员中心页面卡范围
             result.setMemberCardArea(mainCardId.toString());
             //数据资产对象
@@ -139,6 +140,15 @@ public class AppletDecorationConfigApiServiceImpl implements AppletDecorationCon
         return ServiceResponse.success(dto);
     }
 
+    @Override
+    public ServiceResponse<Object> listAppletCard(String appId, Integer enterpriseId) {
+        ServiceResponse<List<AppletCardRelationDTO>> result = getMemberCardByAppId(appId, enterpriseId);
+        if (result.isSuccess()) {
+            return ServiceResponse.success(result.getResult());
+        }
+        return ServiceResponse.failure(result.getCode(), result.getMessage());
+    }
+
     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

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