Browse Source

fix bug

release_toaliyun_real
lin 3 years ago
parent
commit
7ec7876ef0
4 changed files with 79 additions and 60 deletions
  1. +60
    -50
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  2. +13
    -10
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java
  3. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
  4. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java

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

@@ -456,16 +456,18 @@ public class WxCouponController extends BaseController {
// wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59"));
// }
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode());
//根据上架时间查询券
WxCouponChannel couponChannelQ = new WxCouponChannel();
couponChannelQ.updateTenantInfo(tenantEntity);
couponChannelQ.setStartdate(wxCoupon.getStartdate());
couponChannelQ.setEnddate(wxCoupon.getEnddate());
List<Long> couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ);
if (null != couponIds && couponIds.size() > 0 ) {
wxCoupon.setIds(couponIds);
}else {
wxCoupon.setId(-1L);
if (EnumYesOrNo.YES.getCode() == wxCoupon.getPutIn()) {
//根据上架时间查询券
WxCouponChannel couponChannelQ = new WxCouponChannel();
couponChannelQ.updateTenantInfo(tenantEntity);
couponChannelQ.setStartdate(wxCoupon.getStartdate());
couponChannelQ.setEnddate(wxCoupon.getEnddate());
List<Long> couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ);
if (null != couponIds && couponIds.size() > 0 ) {
wxCoupon.setIds(couponIds);
}else {
wxCoupon.setId(-1L);
}
}
PageInfo<WxCouponStatisVo> pageInfo = wxCouponService.findCountData(wxCoupon,tenantEntitys, pageNum, pageSize);
for (WxCouponStatisVo coupon : pageInfo.getList()) {
@@ -498,16 +500,18 @@ public class WxCouponController extends BaseController {
// wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59"));
// }
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode());
//根据上架时间查询券
WxCouponChannel couponChannelQ = new WxCouponChannel();
couponChannelQ.updateTenantInfo(tenantEntity);
couponChannelQ.setStartdate(wxCoupon.getStartdate());
couponChannelQ.setEnddate(wxCoupon.getEnddate());
List<Long> couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ);
if (null != couponIds && couponIds.size() > 0 ) {
wxCoupon.setIds(couponIds);
}else {
wxCoupon.setId(-1L);
if (EnumYesOrNo.YES.getCode() == wxCoupon.getPutIn()) {
//根据上架时间查询券
WxCouponChannel couponChannelQ = new WxCouponChannel();
couponChannelQ.updateTenantInfo(tenantEntity);
couponChannelQ.setStartdate(wxCoupon.getStartdate());
couponChannelQ.setEnddate(wxCoupon.getEnddate());
List<Long> couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ);
if (null != couponIds && couponIds.size() > 0 ) {
wxCoupon.setIds(couponIds);
}else {
wxCoupon.setId(-1L);
}
}
wxCouponService.exportCardData(wxCoupon,tenantEntitys, request, response);
}
@@ -532,16 +536,18 @@ public class WxCouponController extends BaseController {
// }

wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode());
//根据上架时间查询券
WxCouponChannel couponChannelQ = new WxCouponChannel();
couponChannelQ.updateTenantInfo(tenantEntity);
couponChannelQ.setStartdate(wxCoupon.getStartdate());
couponChannelQ.setEnddate(wxCoupon.getEnddate());
List<Long> couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ);
if (null != couponIds && couponIds.size() > 0 ) {
wxCoupon.setIds(couponIds);
}else {
wxCoupon.setId(-1L);
if (EnumYesOrNo.YES.getCode() == wxCoupon.getPutIn()) {
//根据上架时间查询券
WxCouponChannel couponChannelQ = new WxCouponChannel();
couponChannelQ.updateTenantInfo(tenantEntity);
couponChannelQ.setStartdate(wxCoupon.getStartdate());
couponChannelQ.setEnddate(wxCoupon.getEnddate());
List<Long> couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ);
if (null != couponIds && couponIds.size() > 0 ) {
wxCoupon.setIds(couponIds);
}else {
wxCoupon.setId(-1L);
}
}

PageInfo<WxCouponStatisVo> pageInfo = wxCouponService.findCouponData(wxCoupon, tenantEntitys, pageNum, pageSize);
@@ -572,16 +578,18 @@ public class WxCouponController extends BaseController {
// }

wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode());
//根据上架时间查询券
WxCouponChannel couponChannelQ = new WxCouponChannel();
couponChannelQ.updateTenantInfo(tenantEntity);
couponChannelQ.setStartdate(wxCoupon.getStartdate());
couponChannelQ.setEnddate(wxCoupon.getEnddate());
List<Long> couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ);
if (null != couponIds && couponIds.size() > 0 ) {
wxCoupon.setIds(couponIds);
}else {
wxCoupon.setId(-1L);
if (EnumYesOrNo.YES.getCode() == wxCoupon.getPutIn()) {
//根据上架时间查询券
WxCouponChannel couponChannelQ = new WxCouponChannel();
couponChannelQ.updateTenantInfo(tenantEntity);
couponChannelQ.setStartdate(wxCoupon.getStartdate());
couponChannelQ.setEnddate(wxCoupon.getEnddate());
List<Long> couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ);
if (null != couponIds && couponIds.size() > 0 ) {
wxCoupon.setIds(couponIds);
}else {
wxCoupon.setId(-1L);
}
}
wxCouponService.exportCouponData(wxCoupon,tenantEntitys, request, response);
}
@@ -624,16 +632,18 @@ public class WxCouponController extends BaseController {

//根据投放时间搜索
private void handleCouponStartDate(WxCoupon wxCoupon){
WxCouponChannel couponChannelQ = new WxCouponChannel();
couponChannelQ.updateTenantInfo(wxCoupon);
couponChannelQ.setStartdate(wxCoupon.getStartdate());
couponChannelQ.setEnddate(wxCoupon.getEnddate());
List<Long> couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ);
if (null != couponIds && couponIds.size() > 0 ) {
wxCoupon.setIds(couponIds);
}else {
wxCoupon.setId(-1L);
}
if (EnumYesOrNo.YES.getCode() == wxCoupon.getPutIn()) {
WxCouponChannel couponChannelQ = new WxCouponChannel();
couponChannelQ.updateTenantInfo(wxCoupon);
couponChannelQ.setStartdate(wxCoupon.getStartdate());
couponChannelQ.setEnddate(wxCoupon.getEnddate());
List<Long> couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ);
if (null != couponIds && couponIds.size() > 0 ) {
wxCoupon.setIds(couponIds);
}else {
wxCoupon.setId(-1L);
}
}
}

@GetMapping("exportCouponPassword")


+ 13
- 10
mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java View File

@@ -8,6 +8,7 @@ import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxCouponChannel;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.WxOrderGroupMarketing;
import com.iformall.enums.EnumYesOrNo;
import com.iformall.service.WxCouponChannelService;
import com.iformall.service.WxMallService;
import com.iformall.service.WxOrderGroupService;
@@ -79,16 +80,18 @@ public class WxOrderGroupController extends BaseController {

//处理投放时间
private void handleCouponStartDate(WxOrderGroupMarketing wxOrderGroupMarketing){
WxCouponChannel couponChannelQ = new WxCouponChannel();
couponChannelQ.updateTenantInfo(wxOrderGroupMarketing);
couponChannelQ.setStartdate(wxOrderGroupMarketing.getStartdate());
couponChannelQ.setEnddate(wxOrderGroupMarketing.getEnddate());
List<Long> couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ);
if (null != couponIds && couponIds.size() > 0 ) {
wxOrderGroupMarketing.setCouponIdList(couponIds);
}else {
wxOrderGroupMarketing.setCouponId("-1");
}
if (EnumYesOrNo.YES.getCode() == wxOrderGroupMarketing.getPutIn()) {
WxCouponChannel couponChannelQ = new WxCouponChannel();
couponChannelQ.updateTenantInfo(wxOrderGroupMarketing);
couponChannelQ.setStartdate(wxOrderGroupMarketing.getStartdate());
couponChannelQ.setEnddate(wxOrderGroupMarketing.getEnddate());
List<Long> couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ);
if (null != couponIds && couponIds.size() > 0 ) {
wxOrderGroupMarketing.setCouponIdList(couponIds);
}else {
wxOrderGroupMarketing.setCouponId("-1");
}
}
}

}

+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java View File

@@ -400,6 +400,9 @@ public class WxCoupon extends TenantEntity {
@TableField(exist = false)
private String[] mallTenantIds;
@TableField(exist = false)
private Integer putIn;//是否已投放

public String getSalePriceStr() {
if(salePrice!=null) {


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java View File

@@ -59,5 +59,8 @@ public class WxOrderGroupMarketing extends TenantEntity {
@TableField(exist = false)
private List<Long> couponIdList;
@TableField(exist = false)
private Integer putIn;//是否已投放

}

Loading…
Cancel
Save