Sfoglia il codice sorgente

update

release_toaliyun_real
xhxu 5 anni fa
parent
commit
7acf482621
3 ha cambiato i file con 5 aggiunte e 10 eliminazioni
  1. +0
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  2. +4
    -7
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java
  3. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java

+ 0
- 3
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java Vedi File

@@ -129,9 +129,6 @@ public class WxCouponController extends BaseController {
if (wxCoupon.getId() == null) { if (wxCoupon.getId() == null) {
return new ResultData(ResultData.ERROR, "缺少id"); return new ResultData(ResultData.ERROR, "缺少id");
} }
if(null == wxCoupon.getSourceType()){
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode());
}
wxCoupon.updateTenantInfo(getTenantInfo()); wxCoupon.updateTenantInfo(getTenantInfo());
if(EnumDelFlag.YES.getCode().equals(wxCoupon.getIsDel())){ if(EnumDelFlag.YES.getCode().equals(wxCoupon.getIsDel())){
WxCouponChannel query = new WxCouponChannel(); WxCouponChannel query = new WxCouponChannel();


+ 4
- 7
mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java Vedi File

@@ -96,7 +96,7 @@ public class WxCouponController extends BaseController {
wxCoupon.updateTenantInfo(tenantEntity); wxCoupon.updateTenantInfo(tenantEntity);


if(null == wxCoupon.getSourceType()){ if(null == wxCoupon.getSourceType()){
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode());
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode());
} }


ResultData resultData = wxCouponService.saveOrUpdate(wxCoupon); ResultData resultData = wxCouponService.saveOrUpdate(wxCoupon);
@@ -121,9 +121,6 @@ public class WxCouponController extends BaseController {
if (wxCoupon.getId() == null) { if (wxCoupon.getId() == null) {
return new ResultData(ResultData.ERROR, "缺少id"); return new ResultData(ResultData.ERROR, "缺少id");
} }
if(null == wxCoupon.getSourceType()){
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode());
}
wxCoupon.updateTenantInfo(getTenantInfo()); wxCoupon.updateTenantInfo(getTenantInfo());
if(EnumDelFlag.YES.getCode().equals(wxCoupon.getIsDel())){ if(EnumDelFlag.YES.getCode().equals(wxCoupon.getIsDel())){
WxCouponChannel query = new WxCouponChannel(); WxCouponChannel query = new WxCouponChannel();
@@ -302,7 +299,7 @@ public class WxCouponController extends BaseController {
if (wxCoupon.getEnddate() == null) { if (wxCoupon.getEnddate() == null) {
wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59"));
} }
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode());
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode());
PageInfo<WxCouponStatisVo> pageInfo = wxCouponService.findCountData(wxCoupon, pageNum, pageSize); PageInfo<WxCouponStatisVo> pageInfo = wxCouponService.findCountData(wxCoupon, pageNum, pageSize);
for (WxCouponStatisVo coupon : pageInfo.getList()) { for (WxCouponStatisVo coupon : pageInfo.getList()) {
if (coupon.getSaleAmount() == null) { if (coupon.getSaleAmount() == null) {
@@ -334,7 +331,7 @@ public class WxCouponController extends BaseController {
wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59"));
} }


wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode());
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode());


PageInfo<WxCouponStatisVo> pageInfo = wxCouponService.findCouponData(wxCoupon, pageNum, pageSize); PageInfo<WxCouponStatisVo> pageInfo = wxCouponService.findCouponData(wxCoupon, pageNum, pageSize);
for (WxCouponStatisVo coupon : pageInfo.getList()) { for (WxCouponStatisVo coupon : pageInfo.getList()) {
@@ -356,7 +353,7 @@ public class WxCouponController extends BaseController {
public ResultData findPressCountList(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { public ResultData findPressCountList(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) {
Map<String,Object> result = new HashedMap(); Map<String,Object> result = new HashedMap();
wxCoupon.updateTenantInfo(getTenantInfo()); wxCoupon.updateTenantInfo(getTenantInfo());
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode());
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode());
PageInfo<WxCouponStatisVo> pages = wxCouponService.findPressData(wxCoupon,pageNum,pageSize); PageInfo<WxCouponStatisVo> pages = wxCouponService.findPressData(wxCoupon,pageNum,pageSize);
return new ResultData(pages); return new ResultData(pages);
} }


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java Vedi File

@@ -741,4 +741,5 @@ public class WxCouponServiceImpl implements WxCouponService {
throw new MallinkException(ErrorCode.REMAIN_BACK_FAIL); throw new MallinkException(ErrorCode.REMAIN_BACK_FAIL);
} }
} }

} }

Caricamento…
Annulla
Salva