Commit fd865d46 by 陶光胜

联合商户保存

parent 55226ead
......@@ -7,7 +7,10 @@ import com.gic.auth.dto.UnionEnterpriseDTO;
import com.gic.auth.service.AuthCodeApiService;
import com.gic.auth.service.UnionEnterpriseApiService;
import com.gic.auth.web.qo.PageQO;
import com.gic.auth.web.qo.StoreResouceQO;
import com.gic.auth.web.qo.UnionEnterpriseQO;
import com.gic.auth.web.vo.StoreResouceVO;
import com.gic.auth.web.vo.UnionEnterpriseVO;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.enterprise.error.ErrorCode;
......@@ -64,7 +67,19 @@ public class UnionEnterpriseController {
}
ServiceResponse<UnionEnterpriseDTO> response = this.unionEnterpriseApiService.getUnionEnterpriseById(unionId);
if(response.isSuccess()){
return RestResponse.success(response.getResult());
UnionEnterpriseVO vo = EntityUtil.changeEntityByJSON(UnionEnterpriseVO.class, response.getResult());
ServiceResponse<StoreWidgetDTO> storeWidget = this.storeWidgetApiService.getStoreWidget(response.getResult().getStoreResourceId().intValue());
if(storeWidget.isSuccess()){
if(storeWidget.getResult() != null){
StoreResouceVO storeResouceVO = new StoreResouceVO();
storeResouceVO.setStoreResourceId(response.getResult().getStoreResourceId().intValue());
storeResouceVO.setAuthMode(storeWidget.getResult().getAuthMode());
storeResouceVO.setSearchParam(storeWidget.getResult().getSearchParam());
storeResouceVO.setWriteBackParam(storeWidget.getResult().getWriteBackParam());
vo.setStoreResouce(storeResouceVO);
}
}
return RestResponse.success(vo);
}
return EnterpriseRestResponse.failure(response);
}
......
package com.gic.auth.web.vo;
import java.io.Serializable;
public class StoreResouceVO implements Serializable {
private Integer storeResourceId;
private Integer authMode;
private String searchParam;
private String writeBackParam;
public Integer getStoreResourceId() {
return storeResourceId;
}
public void setStoreResourceId(Integer storeResourceId) {
this.storeResourceId = storeResourceId;
}
public Integer getAuthMode() {
return authMode;
}
public void setAuthMode(Integer authMode) {
this.authMode = authMode;
}
public String getSearchParam() {
return searchParam;
}
public void setSearchParam(String searchParam) {
this.searchParam = searchParam;
}
public String getWriteBackParam() {
return writeBackParam;
}
public void setWriteBackParam(String writeBackParam) {
this.writeBackParam = writeBackParam;
}
}
package com.gic.auth.web.vo;
import java.io.Serializable;
public class UnionEnterpriseVO implements Serializable {
private Integer unionEnterpriseId;
private String unionEnterpriseName;
private String authCode;
private Long memberCardResourceId;
private Long fwhResourceId;
private Long appletResourceId;
private StoreResouceVO storeResouce;
private Long goodsResourceId;
private Long orderResourceId;
private Integer authCodeId;
private Integer unionId;
public Integer getUnionEnterpriseId() {
return unionEnterpriseId;
}
public void setUnionEnterpriseId(Integer unionEnterpriseId) {
this.unionEnterpriseId = unionEnterpriseId;
}
public String getUnionEnterpriseName() {
return unionEnterpriseName;
}
public void setUnionEnterpriseName(String unionEnterpriseName) {
this.unionEnterpriseName = unionEnterpriseName;
}
public String getAuthCode() {
return authCode;
}
public void setAuthCode(String authCode) {
this.authCode = authCode;
}
public Integer getAuthCodeId() {
return authCodeId;
}
public void setAuthCodeId(Integer authCodeId) {
this.authCodeId = authCodeId;
}
public Integer getUnionId() {
return unionId;
}
public void setUnionId(Integer unionId) {
this.unionId = unionId;
}
public Long getMemberCardResourceId() {
return memberCardResourceId;
}
public void setMemberCardResourceId(Long memberCardResourceId) {
this.memberCardResourceId = memberCardResourceId;
}
public Long getFwhResourceId() {
return fwhResourceId;
}
public void setFwhResourceId(Long fwhResourceId) {
this.fwhResourceId = fwhResourceId;
}
public Long getAppletResourceId() {
return appletResourceId;
}
public void setAppletResourceId(Long appletResourceId) {
this.appletResourceId = appletResourceId;
}
public Long getGoodsResourceId() {
return goodsResourceId;
}
public void setGoodsResourceId(Long goodsResourceId) {
this.goodsResourceId = goodsResourceId;
}
public Long getOrderResourceId() {
return orderResourceId;
}
public void setOrderResourceId(Long orderResourceId) {
this.orderResourceId = orderResourceId;
}
public StoreResouceVO getStoreResouce() {
return storeResouce;
}
public void setStoreResouce(StoreResouceVO storeResouce) {
this.storeResouce = storeResouce;
}
}
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