diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java index 7ecc5d660..6ddab10f7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java @@ -23,6 +23,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -65,7 +66,12 @@ public class WxCouponChannelController extends BaseController { wxCouponChannel.setStatus(null); } wxCouponChannel.updateTenantInfo(getTenantInfo()); - wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); + wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC); + + if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){ + wxCouponChannel.setSortColumn("cc."+wxCouponChannel.getSortColumn()); + } + final PageInfo page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); return new ResultData(page); } 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 9fc6a9493..57951886c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -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; @@ -68,6 +69,9 @@ public class WxCouponController extends BaseController { if(null == wxCoupon.getSourceType()){ wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); } + if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){ + wxCoupon.setSortColumn("c."+wxCoupon.getSortColumn()); + } return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表 } @@ -91,6 +95,9 @@ public class WxCouponController extends BaseController { EnumCouponType.COUPON_PRESS.getCode()}; wxCoupon.setTypes(Arrays.asList(typeArray)); + if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){ + wxCoupon.setSortColumn("c."+wxCoupon.getSortColumn()); + } return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表 } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java index 9a5d1f970..d2df602d6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java @@ -54,7 +54,11 @@ public class MemCouponController extends BaseController { wxCouponChannel.updateTenantInfo(getTenantInfo()); wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_H5.getCode()); wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); - wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); + wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC); + + if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){ + wxCouponChannel.setSortColumn("cc."+wxCouponChannel.getSortColumn()); + } final PageInfo page = couponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index 16b5b73f4..94213295b 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -19,6 +19,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -57,8 +58,13 @@ public class WxCouponChannelController extends BaseController { if (wxCouponChannel.getStatus() != null && wxCouponChannel.getStatus() == -1) { wxCouponChannel.setStatus(null); } + wxCouponChannel.setMerchantId(getUser().getMerchantId()); wxCouponChannel.updateTenantInfo(getTenantInfo()); - wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); + wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC); + + if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){ + wxCouponChannel.setSortColumn("cc."+wxCouponChannel.getSortColumn()); + } final PageInfo page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java index 9fb169707..d949bf301 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -1,5 +1,6 @@ package com.iformall.controller; +import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.Result; @@ -7,6 +8,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.po.WxCouponPassword; +import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCouponStatisVo; import com.iformall.enums.*; @@ -14,6 +16,7 @@ import com.iformall.mapper.WxCouponChannelMapper; import com.iformall.service.WxCouponPasswordService; import com.iformall.service.WxCouponService; import com.iformall.service.WxFlowService; +import com.iformall.service.WxMerchantService; import com.iformall.utils.DateUtils; import com.iformall.utils.RedisLock; import io.swagger.annotations.Api; @@ -22,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; @@ -29,10 +33,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; @RestController @RequestMapping("/api/coupon") @@ -49,6 +50,8 @@ public class WxCouponController extends BaseController { @Autowired private WxFlowService wxFlowService; @Autowired + private WxMerchantService wxMerchantService; + @Autowired RedisLock redisLock; @ApiOperation("分页列表接口") @@ -63,6 +66,12 @@ public class WxCouponController extends BaseController { if(null == wxCoupon.getSourceType()){ 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); //全列表 } @@ -85,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); //全列表 } @@ -98,6 +111,11 @@ public class WxCouponController extends BaseController { if(null == wxCoupon.getSourceType()){ wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode()); } + List merchantList = new ArrayList<>(); + WxMerchant wxMerchant = wxMerchantService.getById(getUser().getMerchantId()); + merchantList.add(wxMerchant); + + wxCoupon.setMerchantParams(JSONObject.toJSONString(merchantList)); ResultData resultData = wxCouponService.saveOrUpdate(wxCoupon); if (resultData.code != 200) { @@ -132,6 +150,12 @@ public class WxCouponController extends BaseController { } } + List merchantList = new ArrayList<>(); + WxMerchant wxMerchant = wxMerchantService.getById(getUser().getMerchantId()); + merchantList.add(wxMerchant); + + wxCoupon.setMerchantParams(JSONObject.toJSONString(merchantList)); + WxCoupon coupon = wxCouponService.getById(wxCoupon.getId()); if (null == coupon) { return new ResultData(ResultData.ERROR, "券未查询到。"+wxCoupon.getId()); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index e297af145..6287be36e 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -4,6 +4,7 @@ import java.util.Date; import java.util.Map; 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; @@ -55,7 +56,11 @@ public class WxCouponChannelController extends BaseController { wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); wxCouponChannel.setCouponStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()); - wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC, BaseEntity.SortField.Id_DESC); + wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC, BaseEntity.SortField.CCId_DESC); + + if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){ + wxCouponChannel.setSortColumn("cc."+wxCouponChannel.getSortColumn()); + } PageInfo page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); filterTimed(wxCouponChannel, page); return new ResultData(page); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index 28b2a9e49..0de8dcb4a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -145,6 +145,8 @@ public class WxCoupon extends TenantEntity { @TableField(exist = false) private String merchantParams; + @TableField(exist = false) + private Long merchantId; @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="投放频道参数,用来过滤",name="targetAd") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java index 0f1d11285..e0ae7d218 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java @@ -134,9 +134,18 @@ public class BaseEntity implements Serializable { Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), + CId_ASC("c.`id` ASC"), + CId_DESC("c.`id` DESC"), + + CCId_ASC("cc.`id` ASC"), + CCId_DESC("cc.`id` DESC"), + CreateDate_ASC("`create_date` ASC"), CreateDate_DESC("`create_date` DESC"), + CCreateDate_ASC("c.`create_date` ASC"), + CCreateDate_DESC("c.`create_date` DESC"), + SId_ASC("s.`id` ASC"), SId_DESC("s.`id` DESC"), @@ -146,6 +155,9 @@ public class BaseEntity implements Serializable { UpdateDate_ASC("`update_date` ASC"), UpdateDate_DESC("`update_date` DESC"), + CCUpdateDate_ASC("cc.`update_date` ASC"), + CCUpdateDate_DESC("cc.`update_date` DESC"), + Createtime_ASC("`createtime` ASC"), Createtime_DESC("`createtime` DESC"), 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 0bec73408..82cfabbea 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -85,7 +85,7 @@ public class WxCouponServiceImpl implements WxCouponService { @Override public ResultData list(WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { if (null == wxCoupon) wxCoupon = new WxCoupon(); - wxCoupon.setSortColumns(BaseEntity.SortField.CreateDate_DESC, BaseEntity.SortField.Id_DESC); + wxCoupon.setSortColumns(BaseEntity.SortField.CCreateDate_DESC, BaseEntity.SortField.CId_DESC); PageInfo page = null; if (wxCoupon.getStatus() != null && wxCoupon.getStatus() == -1) wxCoupon.setStatus(null); diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index f914a55a7..79a12e863 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -21,7 +21,7 @@ - cc.`id`,cc.`tenant_id`,cc.`parent_tenant_id`,cc.`coupon_id`,cc.`coupon_status`,cc.`type`,cc.`title`,cc.`target_ad`,cc.`business`,cc.`sub_business`,cc.`begin_time`,cc.`end_time`,cc.`status`,cc.`create_date`,cc.`update_date`,cc.`sub_target_id`,cc.qr_code + distinct cc.`id`,cc.`tenant_id`,cc.`parent_tenant_id`,cc.`coupon_id`,cc.`coupon_status`,cc.`type`,cc.`title`,cc.`target_ad`,cc.`business`,cc.`sub_business`,cc.`begin_time`,cc.`end_time`,cc.`status`,cc.`create_date`,cc.`update_date`,cc.`sub_target_id`,cc.qr_code @@ -100,9 +100,11 @@ - and `source_type` = #{sourceType} + and c.`source_type` = #{sourceType} + + + and cm.`merchant_id` = #{merchantId} - and cc.id in @@ -150,7 +152,7 @@ , - c.remain_inventory,c.inventory,c.cover_img,c.title,c.sub_title,c.sale_price, + c.remain_inventory,c.inventory,c.cover_img,c.sub_title,c.sale_price, c.use_price,c.price,c.unit,c.use_limit_quantity,c.send_type,c.support_transfer,c.press_limit_num,c.auto_refund,c.conditions, c.valid_type,c.valid_start_date,c.valid_end_date,c.valid_days,c.credit_price,c.content_type,c.source_type @@ -206,6 +208,7 @@ select from wx_coupon_channel cc left join wx_coupon c on cc.coupon_id = c.id + left join wx_coupon_merchant cm on c.id = cm.product_id and cm.status = 0 diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index c0e19ca55..07cb51e3a 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -98,11 +98,12 @@ - `id`,`tenant_id`,`parent_tenant_id`,`type`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`sub_title`,`sale_price`,`use_price`,`use_limit_quantity`,`send_type`, - `valid_type`,`valid_start_date`,`valid_end_date`,`valid_days`,`detail`,`price`,`unit`,`remain_inventory`,`inventory`, - `remark`,`status`,`create_date`,`update_date`,`business`,`sub_business`,`support_transfer`,`subsidy_num`,`subsidy_type`, - `press_limit_num`, `press_limit_hours`, `auto_refund`,`credit_price`,`credit_refund`,`put_apply_status`,`stock_apply_status`,`cancle_apply_status`, - `conditions`,approval_type,content_type,source_type + distinct c.`id`,c.`tenant_id`,c.`parent_tenant_id`,c.`type`,c.`cover_img`,c.`cover_picture`,c.`detail_picture`, + c.`title`,c.`sub_title`,c.`sale_price`,c.`use_price`,c.`use_limit_quantity`,c.`send_type`, + c.`valid_type`,c.`valid_start_date`,c.`valid_end_date`,c.`valid_days`,c.`detail`,c.`price`,c.`unit`,c.`remain_inventory`,c.`inventory`, + c.`remark`,c.`status`,c.`create_date`,c.`update_date`,c.`business`,c.`sub_business`,c.`support_transfer`,c.`subsidy_num`,c.`subsidy_type`, + c.`press_limit_num`, c.`press_limit_hours`, c.`auto_refund`,c.`credit_price`,c.`credit_refund`,c.`put_apply_status`,c.`stock_apply_status`,c.`cancle_apply_status`, + c.`conditions`,c.approval_type,c.content_type,c.source_type @@ -294,7 +295,7 @@ @@ -315,7 +316,7 @@ - where is_del = 0 + where c.is_del = 0 and 0 = (select count(*) from wx_coupon_channel cc where c.`id` = cc.coupon_id @@ -427,7 +428,7 @@ - and `sub_business` = #{subBusiness} + and c.`sub_business` = #{subBusiness} @@ -459,10 +460,10 @@ - and `put_apply_status` = #{putApplyStatus} + and c.`put_apply_status` = #{putApplyStatus} - and `put_apply_status` != 2 + and c.`put_apply_status` != 2 @@ -477,10 +478,14 @@ and c.`source_type` = #{sourceType} - + + and cm.`merchant_id` = #{merchantId} + + + and c.id in @@ -550,6 +555,7 @@ select from wx_coupon c + left join wx_coupon_merchant cm on c.id = cm.product_id and cm.status = 0 @@ -559,8 +565,9 @@ @@ -650,7 +657,7 @@