Skip to content

G
gic-platform-auth
Commit cff58dd3 by zhiwj
Options

资源组bug

parent 235862e0
Showing with 64 additions and 255 deletions
gic-platform-auth-api/src/main/java/com/gic/auth/dto/ResourceDTO.java
......@@ -26,20 +26,6 @@ public class ResourceDTO implements Serializable {
private Integer enterpriseId;
/**
* 会员卡资源控件id
*/
private Long memberCardResource;
/**
* 服务号资源
*/
private Long fwhResource;
/**
* 小程序资源
*/
private Long appletResource;
/**
* 用户资源
*/
private Long userResource;
......@@ -124,30 +110,6 @@ public class ResourceDTO implements Serializable {
this.enterpriseId = enterpriseId;
}
public Long getMemberCardResource() {
return memberCardResource;
}
public void setMemberCardResource(Long memberCardResource) {
this.memberCardResource = memberCardResource;
}
public Long getFwhResource() {
return fwhResource;
}
public void setFwhResource(Long fwhResource) {
this.fwhResource = fwhResource;
}
public Long getAppletResource() {
return appletResource;
}
public void setAppletResource(Long appletResource) {
this.appletResource = appletResource;
}
public Long getStoreResource() {
return storeResource;
}
......
gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/ResourceController.java
package com.gic.auth.web.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.constant.OrderResourceChannelEnum;
import com.gic.auth.dto.ChannelResourceDTO;
import com.gic.auth.dto.ResourceDTO;
import com.gic.auth.dto.SmsSignResourceDTO;
......@@ -13,7 +10,6 @@ import com.gic.auth.service.ResourceApiService;
import com.gic.auth.web.qo.OrderResourceQO;
import com.gic.auth.web.qo.PageQO;
import com.gic.auth.web.qo.ResourceQO;
import com.gic.auth.web.qo.StoreResouceQO;
import com.gic.auth.web.vo.*;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.webapi.reponse.RestResponse;
......@@ -36,7 +32,6 @@ import com.gic.open.api.dto.ApplicationDTO;
import com.gic.open.api.dto.ApplicationSubDTO;
import com.gic.open.api.service.AppTokenApiService;
import com.gic.open.api.service.ApplicationSubApiService;
import com.gic.store.dto.StoreWidgetDTO;
import com.gic.store.service.StoreWidgetApiService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
......@@ -45,7 +40,10 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
*
......@@ -113,11 +111,6 @@ public class ResourceController {
public RestResponse saveResource(@RequestBody ResourceQO resourceQO) {
ResourceDTO resourceDTO = EntityUtil.changeEntityByJSON(ResourceDTO.class, resourceQO);
resourceDTO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
// 门店资源
ServiceResponse<Integer> storeWidgetResponse = saveStoreWidget(resourceQO.getStoreResouceJSON());
if (storeWidgetResponse.isSuccess()) {
resourceDTO.setStoreResource(storeWidgetResponse.getResult().longValue());
}
GoodsRightsSelectorDTO goodsRightsSelectorDTO = EntityUtil.changeEntityByJSON(GoodsRightsSelectorDTO.class,
resourceQO.getGoodsResource());
ServiceResponse<GoodsRightsSelectorDTO> goodsResponse = this.goodsRightsSelectorApiService
......@@ -128,26 +121,7 @@ public class ResourceController {
// 订单资源
if (CollectionUtils.isNotEmpty(resourceQO.getOrderResourceJSON())) {
List<OrderResourceQO> orderResource = resourceQO.getOrderResourceJSON();
JSONArray orderResourceArray = new JSONArray();
for (OrderResourceQO orderResourceQO : orderResource) {
List<Integer> storeIds;
if (OrderResourceChannelEnum.OFFLINE.getCode().equals(orderResourceQO.getChannel())) {
ServiceResponse<Integer> widgetResponse = saveStoreWidget(orderResourceQO.getStoreResouceJSON());
Integer storeId = widgetResponse.getResult();
storeIds = Collections.singletonList(storeId);
} else {
storeIds = orderResourceQO.getStoreContent();
}
JSONObject jsonObject = new JSONObject();
jsonObject.put("channel", orderResourceQO.getChannel());
jsonObject.put("storeContent", storeIds);
orderResourceArray.add(jsonObject);
}
resourceDTO.setOrderResourceJson(JSON.toJSONString(orderResourceArray));
}
// 应用资源
if (CollectionUtils.isNotEmpty(resourceQO.getAppResourceJSON())) {
resourceDTO.setAppResourceJson(JSON.toJSONString(resourceQO.getAppResourceJSON()));
resourceDTO.setOrderResourceJson(JSON.toJSONString(orderResource));
}
// 短信签名资源
if (resourceQO.getSmsResourceJSON() != null) {
......@@ -191,27 +165,13 @@ public class ResourceController {
if (response.isSuccess()) {
ResourceDTO dto = response.getResult();
ResourceVO vo = EntityUtil.changeEntity(ResourceVO.class, dto);
StoreResouceVO storeResouceVO = getStoreResouce(dto.getStoreResource().intValue());
vo.setStoreResouce(storeResouceVO);
// StoreResouceVO storeResouceVO = getStoreResouce(dto.getStoreResource().intValue());
// vo.setStoreResouce(storeResouceVO);
if (StringUtils.isNotBlank(dto.getOrderResourceJson())) {
List<OrderResourceVO> orderResourceList = JSON.parseArray(dto.getOrderResourceJson(),
OrderResourceVO.class);
for (OrderResourceVO orderResourceVO : orderResourceList) {
Integer channel = orderResourceVO.getChannel();
if (OrderResourceChannelEnum.OFFLINE.getCode().equals(channel)) {
List<Integer> storeContent = orderResourceVO.getStoreContent();
StoreResouceVO orderStoreResouce = getStoreResouce(storeContent.get(0));
if (orderStoreResouce != null) {
orderResourceVO.setStoreResouce(orderStoreResouce);
}
}
}
vo.setOrderResourceJSON(orderResourceList);
}
if (StringUtils.isNotBlank(dto.getAppResourceJson())) {
List<List> appResourceList = JSON.parseArray(dto.getAppResourceJson(), List.class);
vo.setAppResourceJSON(appResourceList);
}
if (StringUtils.isNotBlank(dto.getSmsSignResourceJson())) {
SmsSignResourceDTO smsSignResourceDTO = JSON.parseObject(dto.getSmsSignResourceJson(),
SmsSignResourceDTO.class);
......@@ -252,28 +212,28 @@ public class ResourceController {
return RestResponse.success(map);
}
private StoreResouceVO getStoreResouce(Integer storeWidgetId) {
StoreResouceVO storeResouceVO = null;
ServiceResponse<StoreWidgetDTO> storeWidget = this.storeWidgetApiService.getStoreWidget(storeWidgetId);
if (storeWidget.isSuccess()) {
if (storeWidget.getResult() != null) {
storeResouceVO = new StoreResouceVO();
storeResouceVO.setStoreResourceId(storeWidgetId);
storeResouceVO.setAuthMode(storeWidget.getResult().getAuthMode());
storeResouceVO.setSearchParam(storeWidget.getResult().getSearchParam());
storeResouceVO.setWriteBackParam(storeWidget.getResult().getWriteBackParam());
}
}
return storeResouceVO;
}
private ServiceResponse<Integer> saveStoreWidget(StoreResouceQO storeResouce) {
StoreWidgetDTO storeWidgetDTO = new StoreWidgetDTO();
storeWidgetDTO.setAuthMode(storeResouce.getAuthMode());
storeWidgetDTO.setSearchParam(storeResouce.getSearchParam());
storeWidgetDTO.setStoreWidgetId(storeResouce.getStoreResourceId());
storeWidgetDTO.setWriteBackParam(storeResouce.getWriteBackParam());
return this.storeWidgetApiService.saveAuthStoreWidget(storeWidgetDTO);
}
// private StoreResouceVO getStoreResouce(Integer storeWidgetId) {
// StoreResouceVO storeResouceVO = null;
// ServiceResponse<StoreWidgetDTO> storeWidget = this.storeWidgetApiService.getStoreWidget(storeWidgetId);
// if (storeWidget.isSuccess()) {
// if (storeWidget.getResult() != null) {
// storeResouceVO = new StoreResouceVO();
// storeResouceVO.setStoreResourceId(storeWidgetId);
// storeResouceVO.setAuthMode(storeWidget.getResult().getAuthMode());
// storeResouceVO.setSearchParam(storeWidget.getResult().getSearchParam());
// storeResouceVO.setWriteBackParam(storeWidget.getResult().getWriteBackParam());
// }
// }
// return storeResouceVO;
// }
//
// private ServiceResponse<Integer> saveStoreWidget(StoreResouceQO storeResouce) {
// StoreWidgetDTO storeWidgetDTO = new StoreWidgetDTO();
// storeWidgetDTO.setAuthMode(storeResouce.getAuthMode());
// storeWidgetDTO.setSearchParam(storeResouce.getSearchParam());
// storeWidgetDTO.setStoreWidgetId(storeResouce.getStoreResourceId());
// storeWidgetDTO.setWriteBackParam(storeResouce.getWriteBackParam());
// return this.storeWidgetApiService.saveAuthStoreWidget(storeWidgetDTO);
// }
}
gic-platform-auth-web/src/main/java/com/gic/auth/web/qo/OrderResourceQO.java
......@@ -21,7 +21,7 @@ public class OrderResourceQO implements Serializable {
*/
private List<Integer> storeContent;
private StoreResouceQO storeResouceJSON;
private Integer storeWidgetId;
public Integer getChannel() {
return channel;
......@@ -39,11 +39,11 @@ public class OrderResourceQO implements Serializable {
this.storeContent = storeContent;
}
public StoreResouceQO getStoreResouceJSON() {
return storeResouceJSON;
public Integer getStoreWidgetId() {
return storeWidgetId;
}
public void setStoreResouceJSON(StoreResouceQO storeResouceJSON) {
this.storeResouceJSON = storeResouceJSON;
public void setStoreWidgetId(Integer storeWidgetId) {
this.storeWidgetId = storeWidgetId;
}
}
gic-platform-auth-web/src/main/java/com/gic/auth/web/qo/ResourceQO.java
......@@ -37,26 +37,12 @@ public class ResourceQO implements Serializable {
* 用户资源
*/
private Long userResource;
/**
* 会员卡资源控件id
*/
private Long memberCardResource;
/**
* 服务号资源
*/
private Long fwhResource;
/**
* 小程序资源
*/
private Long appletResource;
/**
* 门店资源
*/
// private Long storeResource;
private StoreResouceQO storeResouceJSON;
private Long storeResource;
// private StoreResouceQO storeResouceJSON;
/**
* 商品资源
......@@ -70,8 +56,6 @@ public class ResourceQO implements Serializable {
*/
private List<OrderResourceQO> orderResourceJSON;
private List<List<Long>> appResourceJSON;
private SmsSignResourceQO smsResourceJSON;
private ChannelResourceVO channelResourceVO;
......@@ -100,36 +84,28 @@ public class ResourceQO implements Serializable {
this.enterpriseId = enterpriseId;
}
public Long getMemberCardResource() {
return memberCardResource;
}
public void setMemberCardResource(Long memberCardResource) {
this.memberCardResource = memberCardResource;
}
public Long getFwhResource() {
return fwhResource;
public Long getUserResource() {
return userResource;
}
public void setFwhResource(Long fwhResource) {
this.fwhResource = fwhResource;
public void setUserResource(Long userResource) {
this.userResource = userResource;
}
public Long getAppletResource() {
return appletResource;
public Long getStoreResource() {
return storeResource;
}
public void setAppletResource(Long appletResource) {
this.appletResource = appletResource;
public void setStoreResource(Long storeResource) {
this.storeResource = storeResource;
}
public StoreResouceQO getStoreResouceJSON() {
return storeResouceJSON;
public GoodsResouceQO getGoodsResource() {
return goodsResource;
}
public void setStoreResouceJSON(StoreResouceQO storeResouceJSON) {
this.storeResouceJSON = storeResouceJSON;
public void setGoodsResource(GoodsResouceQO goodsResource) {
this.goodsResource = goodsResource;
}
public List<OrderResourceQO> getOrderResourceJSON() {
......@@ -140,30 +116,6 @@ public class ResourceQO implements Serializable {
this.orderResourceJSON = orderResourceJSON;
}
public List<List<Long>> getAppResourceJSON() {
return appResourceJSON;
}
public void setAppResourceJSON(List<List<Long>> appResourceJSON) {
this.appResourceJSON = appResourceJSON;
}
// public Long getGoodsResourceId() {
// return goodsResourceId;
// }
//
// public void setGoodsResourceId(Long goodsResourceId) {
// this.goodsResourceId = goodsResourceId;
// }
public GoodsResouceQO getGoodsResource() {
return goodsResource;
}
public void setGoodsResource(GoodsResouceQO goodsResource) {
this.goodsResource = goodsResource;
}
public SmsSignResourceQO getSmsResourceJSON() {
return smsResourceJSON;
}
......@@ -179,12 +131,4 @@ public class ResourceQO implements Serializable {
public void setChannelResourceVO(ChannelResourceVO channelResourceVO) {
this.channelResourceVO = channelResourceVO;
}
public Long getUserResource() {
return userResource;
}
public void setUserResource(Long userResource) {
this.userResource = userResource;
}
}
gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/OrderResourceVO.java
......@@ -23,7 +23,7 @@ public class OrderResourceVO implements Serializable {
*/
private List<Integer> storeContent;
private StoreResouceVO storeResouce;
private Integer storeWidgetId;
public Integer getChannel() {
return channel;
......@@ -41,11 +41,11 @@ public class OrderResourceVO implements Serializable {
this.storeContent = storeContent;
}
public StoreResouceVO getStoreResouce() {
return storeResouce;
public Integer getStoreWidgetId() {
return storeWidgetId;
}
public void setStoreResouce(StoreResouceVO storeResouce) {
this.storeResouce = storeResouce;
public void setStoreWidgetId(Integer storeWidgetId) {
this.storeWidgetId = storeWidgetId;
}
}
gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/ResourceVO.java
......@@ -30,20 +30,6 @@ public class ResourceVO implements Serializable{
private Integer enterpriseId;
private Long userResource;
/**
* 会员卡资源控件id
*/
private Long memberCardResource;
/**
* 服务号资源
*/
private Long fwhResource;
/**
* 小程序资源
*/
private Long appletResource;
/**
* 门店资源
......@@ -55,11 +41,8 @@ public class ResourceVO implements Serializable{
*/
private List<OrderResourceVO> orderResourceJSON;
private List<List> appResourceJSON;
private SmsSignResourceDTO smsResourceJSON;
private Integer userResourceCount;
private StoreResouceVO storeResouce;
private GoodsResouceVO goodsResouce;
private ChannelResourceDTO channelResourceJSON;
......@@ -88,28 +71,12 @@ public class ResourceVO implements Serializable{
this.enterpriseId = enterpriseId;
}
public Long getMemberCardResource() {
return memberCardResource;
}
public void setMemberCardResource(Long memberCardResource) {
this.memberCardResource = memberCardResource;
}
public Long getFwhResource() {
return fwhResource;
}
public void setFwhResource(Long fwhResource) {
this.fwhResource = fwhResource;
}
public Long getAppletResource() {
return appletResource;
public Long getUserResource() {
return userResource;
}
public void setAppletResource(Long appletResource) {
this.appletResource = appletResource;
public void setUserResource(Long userResource) {
this.userResource = userResource;
}
public Long getStoreResource() {
......@@ -128,12 +95,12 @@ public class ResourceVO implements Serializable{
this.orderResourceJSON = orderResourceJSON;
}
public List<List> getAppResourceJSON() {
return appResourceJSON;
public SmsSignResourceDTO getSmsResourceJSON() {
return smsResourceJSON;
}
public void setAppResourceJSON(List<List> appResourceJSON) {
this.appResourceJSON = appResourceJSON;
public void setSmsResourceJSON(SmsSignResourceDTO smsResourceJSON) {
this.smsResourceJSON = smsResourceJSON;
}
public Integer getUserResourceCount() {
......@@ -144,14 +111,6 @@ public class ResourceVO implements Serializable{
this.userResourceCount = userResourceCount;
}
public StoreResouceVO getStoreResouce() {
return storeResouce;
}
public void setStoreResouce(StoreResouceVO storeResouce) {
this.storeResouce = storeResouce;
}
public GoodsResouceVO getGoodsResouce() {
return goodsResouce;
}
......@@ -160,27 +119,11 @@ public class ResourceVO implements Serializable{
this.goodsResouce = goodsResouce;
}
public SmsSignResourceDTO getSmsResourceJSON() {
return smsResourceJSON;
}
public void setSmsResourceJSON(SmsSignResourceDTO smsResourceJSON) {
this.smsResourceJSON = smsResourceJSON;
}
public void setChannelResourceJSON(ChannelResourceDTO channelResourceJSON) {
this.channelResourceJSON = channelResourceJSON;
}
public ChannelResourceDTO getChannelResourceJSON() {
return channelResourceJSON;
}
public Long getUserResource() {
return userResource;
}
public void setUserResource(Long userResource) {
this.userResource = userResource;
public void setChannelResourceJSON(ChannelResourceDTO channelResourceJSON) {
this.channelResourceJSON = channelResourceJSON;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment