|
|
|
@@ -25,6 +25,7 @@ import io.swagger.annotations.ApiImplicitParams; |
|
|
|
import io.swagger.annotations.ApiOperation; |
|
|
|
import org.apache.commons.collections.CollectionUtils; |
|
|
|
import org.apache.commons.collections.map.HashedMap; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.slf4j.Logger; |
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
@@ -66,6 +67,11 @@ public class WxCouponController extends BaseController { |
|
|
|
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode()); |
|
|
|
} |
|
|
|
wxCoupon.setMerchantId(getUser().getMerchantId()); |
|
|
|
|
|
|
|
if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){ |
|
|
|
wxCoupon.setSortColumn("c."+wxCoupon.getSortColumn()); |
|
|
|
} |
|
|
|
|
|
|
|
return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表 |
|
|
|
} |
|
|
|
|
|
|
|
@@ -88,6 +94,10 @@ public class WxCouponController extends BaseController { |
|
|
|
EnumCouponType.COUPON_PRESS.getCode()}; |
|
|
|
|
|
|
|
wxCoupon.setTypes(Arrays.asList(typeArray)); |
|
|
|
wxCoupon.setMerchantId(getUser().getMerchantId()); |
|
|
|
if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){ |
|
|
|
wxCoupon.setSortColumn("c."+wxCoupon.getSortColumn()); |
|
|
|
} |
|
|
|
return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表 |
|
|
|
} |
|
|
|
|
|
|
|
|