Browse Source

//商户建券

release_toaliyun_real
xhxu 3 years ago
parent
commit
4911a8e2ae
2 changed files with 8 additions and 2 deletions
  1. +4
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java
  2. +4
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java

+ 4
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java View File

@@ -72,8 +72,11 @@ public class WxCouponChannelController extends BaseController {
}
wxCouponChannel.updateTenantInfo(getTenantInfo());

if(null == wxCouponChannel.getSourceType()){
//默认A端建券
if(wxCouponChannel.getSourceType() == null){
wxCouponChannel.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode());
}else if(wxCouponChannel.getSourceType() == -1){
wxCouponChannel.setSourceType(null);
}

if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){


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

@@ -106,9 +106,12 @@ public class WxCouponController extends BaseController {
private ResultData couponList(WxCoupon wxCoupon, Integer pageNum, Integer pageSize,Boolean isList) {
//默认A端建券
if(null == wxCoupon.getSourceType()){
if(wxCoupon.getSourceType() == null){
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode());
}else if(wxCoupon.getSourceType() == -1){
wxCoupon.setSourceType(null);
}

//排序处理
if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){
String coryColumn = "c."+wxCoupon.getSortColumns();


Loading…
Cancel
Save