Browse Source

fix bug

release_toaliyun_real
zhengfangyuan 3 years ago
parent
commit
263ea368c5
6 changed files with 58 additions and 5 deletions
  1. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponMall.java
  3. +16
    -0
      mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxCouponMallService.java
  5. +28
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponMallServiceImpl.java
  6. +7
    -0
      mallinkService/src/main/resources/mapper/WxMallMapper.xml

+ 2
- 2
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java View File

@@ -568,7 +568,7 @@ public class WxCouponController extends BaseController {
WxCouponMall wxCouponMall = new WxCouponMall();
wxCouponMall.updateTenantInfo(getTenantInfo());
wxCouponMall.setProductId(id);
return new ResultData(wxCouponMallService.list(wxCouponMall));
return new ResultData(wxCouponMallService.list(wxCouponMall,true));
}
@ApiOperation("商场查询:平台券商场列表")
@@ -589,7 +589,7 @@ public class WxCouponController extends BaseController {
//一个商场,每个平台券只有一条记录
wxCouponMall.setMallTenantId(tenantEntity.getTenantId());
wxCouponMall.setProductIds(Arrays.asList(ids));
List<WxCouponMall> mallList= wxCouponMallService.list(wxCouponMall);
List<WxCouponMall> mallList= wxCouponMallService.list(wxCouponMall,false);
if (null == mallList || mallList.size() <= 0 ) {
return new ResultData();
}


+ 4
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCouponMall.java View File

@@ -30,4 +30,8 @@ public class WxCouponMall extends TenantEntity {
private Date updateDate;
@io.swagger.annotations.ApiModelProperty(value="状态",name="status")
private Integer status;
@io.swagger.annotations.ApiModelProperty(value="商场信息",name="mall")
@TableField(exist = false)
protected WxMall mall;
}

+ 16
- 0
mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java View File

@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.EqualsAndHashCode;

import java.util.List;

import org.apache.commons.lang3.StringUtils;

/**
@@ -27,6 +30,10 @@ public class TenantEntity extends BaseEntity {
@JsonIgnore
@TableField(exist = false)
protected String shardTableSuffix;
@io.swagger.annotations.ApiModelProperty(value="租户编号列表,查询使用",name="tenantIdList")
@TableField(exist = false)
protected List<String> tenantIdList;

public void updateTenantInfo(TenantEntity info) {
tenantId = info.getTenantId();
@@ -82,4 +89,13 @@ public class TenantEntity extends BaseEntity {
public void setFinalTenantId(String finalTenantId) {
this.finalTenantId = finalTenantId;
}

public List<String> getTenantIdList() {
return tenantIdList;
}

public void setTenantIdList(List<String> tenantIdList) {
this.tenantIdList = tenantIdList;
}
}

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxCouponMallService.java View File

@@ -22,7 +22,7 @@ public interface WxCouponMallService {

PageInfo<WxCouponMall> listAsPage(WxCouponMall record, Integer pageIndex, Integer pageSize);
List<WxCouponMall> list(WxCouponMall wxCouponMall);
List<WxCouponMall> list(WxCouponMall wxCouponMall,boolean queryMall);
void finised(String tenantId,Long couponId,String mallTenantId);
void unfinised(String tenantId, Long couponId,Integer couponType, String mallTenantId) throws Exception;


+ 28
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxCouponMallServiceImpl.java View File

@@ -29,10 +29,36 @@ public class WxCouponMallServiceImpl implements WxCouponMallService {
TtCouponChannelPoiMapper ttCouponChannelPoiMapper;
@Autowired
WxCouponChannelMapper wxCouponChannelMapper;
@Autowired
WxMallMapper wxMallMapper;

@Override
public List<WxCouponMall> list(WxCouponMall wxCouponMall){
return wxCouponMallMapper.findList(wxCouponMall);
public List<WxCouponMall> list(WxCouponMall wxCouponMall,boolean queryMall){
List<WxCouponMall> list = wxCouponMallMapper.findList(wxCouponMall);
if (queryMall) {
if (null != list && list.size() > 0 ) {
List<String> mallTenantList = new ArrayList<String>();;
for (int i = 0 ;i <list.size() ; i++) {
String mt = list.get(i).getMallTenantId();
if (!mallTenantList.contains(mt)) {
mallTenantList.add(mt);
}
}
WxMall mallq = new WxMall();
mallq.setTenantIdList(mallTenantList);
List<WxMall> mallList = wxMallMapper.findList(mallq);
if (null != mallList && mallList.size() > 0) {
Map<String,WxMall> mallMap = new HashMap<String,WxMall>();
for (WxMall m:mallList) {
mallMap.put(m.getTenantId(), m);
}
for (WxCouponMall cm : list) {
cm.setMall(mallMap.get(cm.getMallTenantId()));
}
}
}
}
return list;
}
@Override


+ 7
- 0
mallinkService/src/main/resources/mapper/WxMallMapper.xml View File

@@ -145,6 +145,13 @@
and `group_support` = #{groupSupport}
</if>

<if test=" null != tenantIdList ">
and tenant_id in
<foreach collection="tenantIdList" index="index" item="tIdItem" open="(" separator="," close=")">
#{tIdItem}
</foreach>
</if>

<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">


Loading…
Cancel
Save