diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java index dd945dc8c..75ff805af 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java @@ -39,7 +39,10 @@ public interface WxCouponOrderMapper extends CommonMapper { List findListOfOrderedByDateForBUser(Map dateMap); List findListOfVerifiedByDateForBUser(Map dateMap); + @Deprecated List findListOfCUser(WxCouponOrder wxCouponOrder); + List findListOfCUserOptimize(WxCouponOrder wxCouponOrder); + WxCouponOrderCVo findDetailOfCUser(@Param("id")Long id); WxCouponOrderCVo findSimpleDetailOfCUser(@Param("id")Long id); List findListOfAdmin(WxCouponOrderBVo wxCouponOrder); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java index 5abb3da78..d88d33c8f 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java @@ -109,13 +109,20 @@ public interface WxCouponOrderService { ResultData listOnDateAsPage(Long bUserId, String date, Integer pageIndex, Integer pageSize, boolean isVerified); + /** + * C用户查券list + *@deprecated + * @param record C端用户 + */ + PageInfo listCUserVoAsPage(WxCouponOrder record, Integer pageIndex, Integer pageSize); + /** * C用户查券list * * @param record C端用户 */ - PageInfo listCUserVoAsPage(WxCouponOrder record, Integer pageIndex, Integer pageSize); + PageInfo listCUserVoAsPageOptimize(WxCouponOrder record, Integer pageIndex, Integer pageSize); /** * C用户查券详情 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index c76b71725..a6466f841 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -236,6 +236,12 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfCUser(record)); } + + @Override + public PageInfo listCUserVoAsPageOptimize(WxCouponOrder record, Integer pageIndex, Integer pageSize) { + + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfCUserOptimize(record)); + } @Override public WxCouponOrderCVo detailCUserVo(String couponOrderId) { diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 7498967d9..95edfc236 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -957,9 +957,76 @@ select="com.iformall.mapper.WxCouponMerchantMapper.findMerchantVoList" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - select from wx_coupon c,wx_coupon_order co left join wx_coupon_action_log cal on cal.coupon_order_id = co.id