diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java index c68f6a5fc..1d8b28882 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java @@ -14,7 +14,11 @@ public interface WxCouponOrderMapper extends CommonMapper { List findList(WxCouponOrder wxCouponOrder); Integer countList(WxCouponOrder wxCouponOrder); + + Integer dayCountCarList(Map params); + List findCarListOfCUser(WxCouponOrderCarCVo wxCouponOrder); + List findListOfOrderedByDate(Map dateMap); List findListOfVerifiedByDate(Map dateMap); @@ -27,7 +31,19 @@ public interface WxCouponOrderMapper extends CommonMapper { List findListOfCUser(WxCouponOrderCVo wxCouponOrder); List findListOfAdmin(WxCouponOrderBVo wxCouponOrder); - List findCarListOfCUser(WxCouponOrderCarCVo wxCouponOrder); + /** + * 查询用户核销/领券数 + * @param cUserId + * @param startTime + * @param endTime + * @return + */ + int findOrderedCountForCUser(@Param("cUserId")Long cUserId,@Param("startTime") Date startTime,@Param("endTime")Date endTime); + int findVerifiedCountForCUser(@Param("cUserId")Long cUserId,@Param("startTime") Date startTime,@Param("endTime")Date endTime); + + + + //营销报表 券数据图表 List couponDataMap(HashMap params); @@ -65,26 +81,10 @@ public interface WxCouponOrderMapper extends CommonMapper { int queryPriceTotal(@Param("tenantId")String tenantId, @Param("startTime") Date startTime, @Param("endTime")Date endTime); - - void offExpiredCouponOrderByValidDate(); - List findExpiredCouponOrderByValidDate(); - - List queryForSceneRepotyHistoryVerified(HashMap params); - /** - * 查询用户核销/领券数 - * @param cUserId - * @param startTime - * @param endTime - * @return - */ - int findOrderedCountForCUser(@Param("cUserId")Long cUserId,@Param("startTime") Date startTime,@Param("endTime")Date endTime); - int findVerifiedCountForCUser(@Param("cUserId")Long cUserId,@Param("startTime") Date startTime,@Param("endTime")Date endTime); - /** * 查询核销/领券数 - * @param cUserId * @param startTime * @param endTime * @return @@ -92,4 +92,10 @@ public interface WxCouponOrderMapper extends CommonMapper { int findOrderedCount(@Param("tenantId")String tenantId, @Param("startTime") Date startTime,@Param("endTime")Date endTime); int findVerifiedCount(@Param("tenantId")String tenantId, @Param("startTime") Date startTime,@Param("endTime")Date endTime); + + + + void offExpiredCouponOrderByValidDate(); + + List findExpiredCouponOrderByValidDate(); } diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index c432bf46a..d1e5710d3 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -132,7 +132,7 @@ + select="com.iformall.mapper.WxCouponMerchantMapper.findMerchantNameList" > diff --git a/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml index 84f589fe5..084a62e85 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml @@ -94,4 +94,18 @@ left join wx_mall_floor mf on s.floor = mf.id where cm.product_id = #{productId} + + + + m.id,m.name,m.status + + + + diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 1d49b120f..3bbc9f424 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -102,8 +102,10 @@ - + + + @@ -356,16 +358,38 @@ + +