Przeglądaj źródła

/、.test

release_toaliyun_real
xhxu 4 lat temu
rodzic
commit
9b0fe214f7
2 zmienionych plików z 6 dodań i 11 usunięć
  1. +0
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
  2. +6
    -9
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java

+ 0
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java Wyświetl plik

@@ -142,8 +142,6 @@ public class WxCoupon extends TenantEntity {
private String remark; private String remark;
@io.swagger.annotations.ApiModelProperty(value="状态(-1:全部,0:草稿/待生效,1:已生效,2:已失效,3:已作废)",name="status") @io.swagger.annotations.ApiModelProperty(value="状态(-1:全部,0:草稿/待生效,1:已生效,2:已失效,3:已作废)",name="status")
private Integer status; private Integer status;
@TableField(exist = false)
private List<Integer> statusList;
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate")
private Date createDate; private Date createDate;
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")


+ 6
- 9
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Wyświetl plik

@@ -806,10 +806,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
retPageInfo.setPageSize(pageSize); retPageInfo.setPageSize(pageSize);
retPageInfo.setPages(pageInfo.getPages()); retPageInfo.setPages(pageInfo.getPages());
retPageInfo.setTotal(pageInfo.getTotal()); retPageInfo.setTotal(pageInfo.getTotal());
if (null != pageInfo && null != pageInfo.getList()){
List<WxCouponOrderBVo> volist = handleQueryResult(pageInfo.getList(), wxCouponOrderBVo);
retPageInfo.setList(volist);
}
retPageInfo.setList(handleQueryResult(pageInfo.getList(), wxCouponOrderBVo));


return new ResultData(retPageInfo); return new ResultData(retPageInfo);
} }
@@ -957,7 +954,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
} }
return retList; return retList;
} }
return null;
return new ArrayList<>();
} }
@@ -2738,9 +2735,11 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
merchantIds.add(record.getMerchantId()); merchantIds.add(record.getMerchantId());
List<Long> couponIds = wxCouponMerchantMapper.findMerchantProductIds(record.getTenantId(),merchantIds,null); List<Long> couponIds = wxCouponMerchantMapper.findMerchantProductIds(record.getTenantId(),merchantIds,null);
if (null == couponIds || couponIds.isEmpty()) { if (null == couponIds || couponIds.isEmpty()) {
retPageInfo.setList(new ArrayList<>());
retPageInfo.setPageNum(pageIndex); retPageInfo.setPageNum(pageIndex);
retPageInfo.setPageSize(pageSize); retPageInfo.setPageSize(pageSize);
retPageInfo.setPages(0); retPageInfo.setPages(0);
retPageInfo.setTotal(0);
return retPageInfo; return retPageInfo;
} }
//查询商户下的券 //查询商户下的券
@@ -2749,10 +2748,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
retPageInfo.setPageNum(pageIndex); retPageInfo.setPageNum(pageIndex);
retPageInfo.setPageSize(pageSize); retPageInfo.setPageSize(pageSize);
retPageInfo.setPages(pageInfo.getPages()); retPageInfo.setPages(pageInfo.getPages());
if (null != pageInfo && null != pageInfo.getList()){
List<WxCouponOrderBVo> volist = handleQueryResult(pageInfo.getList(), record);
retPageInfo.setList(volist);
}
retPageInfo.setTotal(pageInfo.getTotal());
retPageInfo.setList(handleQueryResult(pageInfo.getList(), record));
return retPageInfo; return retPageInfo;
} }


Ładowanie…
Anuluj
Zapisz