diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 886abfbd2..9fc6a9493 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -129,9 +129,6 @@ public class WxCouponController extends BaseController { if (wxCoupon.getId() == null) { return new ResultData(ResultData.ERROR, "缺少id"); } - if(null == wxCoupon.getSourceType()){ - wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); - } wxCoupon.updateTenantInfo(getTenantInfo()); if(EnumDelFlag.YES.getCode().equals(wxCoupon.getIsDel())){ WxCouponChannel query = new WxCouponChannel(); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java index c63c56363..9fb169707 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -96,7 +96,7 @@ public class WxCouponController extends BaseController { wxCoupon.updateTenantInfo(tenantEntity); if(null == wxCoupon.getSourceType()){ - wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); + wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode()); } ResultData resultData = wxCouponService.saveOrUpdate(wxCoupon); @@ -121,9 +121,6 @@ public class WxCouponController extends BaseController { if (wxCoupon.getId() == null) { return new ResultData(ResultData.ERROR, "缺少id"); } - if(null == wxCoupon.getSourceType()){ - wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); - } wxCoupon.updateTenantInfo(getTenantInfo()); if(EnumDelFlag.YES.getCode().equals(wxCoupon.getIsDel())){ WxCouponChannel query = new WxCouponChannel(); @@ -302,7 +299,7 @@ public class WxCouponController extends BaseController { if (wxCoupon.getEnddate() == null) { 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 pageInfo = wxCouponService.findCountData(wxCoupon, pageNum, pageSize); for (WxCouponStatisVo coupon : pageInfo.getList()) { 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.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); + wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode()); PageInfo pageInfo = wxCouponService.findCouponData(wxCoupon, pageNum, pageSize); for (WxCouponStatisVo coupon : pageInfo.getList()) { @@ -356,7 +353,7 @@ public class WxCouponController extends BaseController { public ResultData findPressCountList(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { Map result = new HashedMap(); wxCoupon.updateTenantInfo(getTenantInfo()); - wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); + wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode()); PageInfo pages = wxCouponService.findPressData(wxCoupon,pageNum,pageSize); return new ResultData(pages); } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java index d73e6b1d4..ecaf79ef6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java @@ -106,6 +106,9 @@ public class WxCouponOrderBVo extends WxCouponOrder { @io.swagger.annotations.ApiModelProperty(value = "补贴类型", name = "subsidyType") private Integer subsidyType; + @io.swagger.annotations.ApiModelProperty(value="1:A端发卷,2:B端发卷",name="sourceType") + private Integer sourceType; + public String getbUserName() { return bUserName; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 8394cbee9..0bec73408 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -741,4 +741,5 @@ public class WxCouponServiceImpl implements WxCouponService { throw new MallinkException(ErrorCode.REMAIN_BACK_FAIL); } } + } diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 818ac6818..a167bd8c3 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -720,6 +720,7 @@ + @@ -749,7 +750,7 @@ co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status, co.create_date,co.update_date,co.coupon_price, co.verify_type, co.pay_vendor,c.title,c.sale_price,c.use_price,c.price, - c.unit,c.auto_refund,c.business,c.subsidy_type,ms.subsidy subsidy_num, + c.unit,c.auto_refund,c.business,c.subsidy_type,c.source_type,ms.subsidy subsidy_num, (CASE WHEN couc.mc = 1 THEN m1.name ELSE '[多商户通用]' END) AS merchant_name, (CASE WHEN couc.mc = 1 THEN m1.id ELSE 0 END) AS merchant_id, cu.phone,m2.name AS verify_merchant_name,cal.channel_type @@ -854,6 +855,9 @@ and c.business = #{business} + + and c.`source_type` = #{sourceType} + and bu.verify_merchant_name = #{verifyMerchantName}