| @@ -80,7 +80,7 @@ public class DaliyAmountSchedule { | |||||
| dateMap.put("endDate", new Date()); | dateMap.put("endDate", new Date()); | ||||
| dateMap.put("merchantID",merchant.getId()); | dateMap.put("merchantID",merchant.getId()); | ||||
| List<WxCouponOrder> list = wxCouponOrderMapper.findListOfUnverifiedByDate(dateMap); | |||||
| List<WxCouponOrder> list = wxCouponOrderMapper.findListOfOrderedByDate(dateMap); | |||||
| logger.info("find " + list.size() + " coupon order from " + startDate + " to " + new Date()); | logger.info("find " + list.size() + " coupon order from " + startDate + " to " + new Date()); | ||||
| int total_price = 0; | int total_price = 0; | ||||
| for(WxCouponOrder couponOrder : list) { | for(WxCouponOrder couponOrder : list) { | ||||
| @@ -12,10 +12,10 @@ public interface WxCouponOrderMapper extends CommonMapper<WxCouponOrder, Long> { | |||||
| List<WxCouponOrder> findList(WxCouponOrder wxCouponOrder); | List<WxCouponOrder> findList(WxCouponOrder wxCouponOrder); | ||||
| Integer countList(WxCouponOrder wxCouponOrder); | Integer countList(WxCouponOrder wxCouponOrder); | ||||
| List<WxCouponOrder> findListOfUnverifiedByDate(Map dateMap); | |||||
| List<WxCouponOrder> findListOfOrderedByDate(Map dateMap); | |||||
| List<WxCouponOrder> findListOfVerifiedByDate(Map dateMap); | List<WxCouponOrder> findListOfVerifiedByDate(Map dateMap); | ||||
| List<WxCouponOrderBVo> findListOfUnverifiedByDateForBUser(Map dateMap); | |||||
| List<WxCouponOrderBVo> findListOfOrderedByDateForBUser(Map dateMap); | |||||
| List<WxCouponOrderBVo> findListOfVerifiedByDateForBUser(Map dateMap); | List<WxCouponOrderBVo> findListOfVerifiedByDateForBUser(Map dateMap); | ||||
| WxCouponOrderCVo selectDetailOfUser(Map paramMap); | WxCouponOrderCVo selectDetailOfUser(Map paramMap); | ||||
| @@ -134,7 +134,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| if(isVerified) | if(isVerified) | ||||
| list = wxCouponOrderMapper.findListOfVerifiedByDate(dateMap); | list = wxCouponOrderMapper.findListOfVerifiedByDate(dateMap); | ||||
| else | else | ||||
| list = wxCouponOrderMapper.findListOfUnverifiedByDate(dateMap); | |||||
| list = wxCouponOrderMapper.findListOfOrderedByDate(dateMap); | |||||
| logger.info("find " + list.size() + " coupon order from " + startDate + " to " + new Date()); | logger.info("find " + list.size() + " coupon order from " + startDate + " to " + new Date()); | ||||
| int total_price = 0; | int total_price = 0; | ||||
| for (WxCouponOrder couponOrder : list) { | for (WxCouponOrder couponOrder : list) { | ||||
| @@ -146,7 +146,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| if (isVerified) | if (isVerified) | ||||
| resultMap.put("list", PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfVerifiedByDateForBUser(dateMap))); | resultMap.put("list", PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfVerifiedByDateForBUser(dateMap))); | ||||
| else | else | ||||
| resultMap.put("list", PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfUnverifiedByDateForBUser(dateMap))); | |||||
| resultMap.put("list", PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfOrderedByDateForBUser(dateMap))); | |||||
| } | } | ||||
| return new ResultData(resultMap); | return new ResultData(resultMap); | ||||
| } | } | ||||
| @@ -128,7 +128,7 @@ | |||||
| bu.name,cu.phone | bu.name,cu.phone | ||||
| </sql> | </sql> | ||||
| <sql id="allBUserUnverifiedCouponOrderColumns"> | |||||
| <sql id="allBUserOrderedCouponOrderColumns"> | |||||
| co.id,co.tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price, | co.id,co.tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price, | ||||
| c.type,c.title,c.sale_price,c.use_price,c.price, | c.type,c.title,c.sale_price,c.use_price,c.price, | ||||
| cu.phone | cu.phone | ||||
| @@ -138,8 +138,8 @@ | |||||
| co.id,co.tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price | co.id,co.tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price | ||||
| </sql> | </sql> | ||||
| <select id="findListOfUnverifiedByDateForBUser" parameterType="map" resultMap="BVoResultMap"> | |||||
| select <include refid="allBUserUnverifiedCouponOrderColumns" /> | |||||
| <select id="findListOfOrderedByDateForBUser" parameterType="map" resultMap="BVoResultMap"> | |||||
| select <include refid="allBUserOrderedCouponOrderColumns" /> | |||||
| from wx_coupon_order co,wx_order o,wx_coupon c,wx_c_user cu | from wx_coupon_order co,wx_order o,wx_coupon c,wx_c_user cu | ||||
| where o.id = co.order_id | where o.id = co.order_id | ||||
| and o.merchant_id = #{merchantID} | and o.merchant_id = #{merchantID} | ||||
| @@ -151,7 +151,7 @@ | |||||
| <if test="startDate != null"> | <if test="startDate != null"> | ||||
| AND co.create_date < #{endDate,jdbcType=TIMESTAMP} | AND co.create_date < #{endDate,jdbcType=TIMESTAMP} | ||||
| </if> | </if> | ||||
| AND co.coupon_order_status = '0' | |||||
| AND (co.coupon_order_status = '0' or co.coupon_order_status = '1') | |||||
| order by co.create_date desc | order by co.create_date desc | ||||
| </select> | </select> | ||||
| @@ -243,7 +243,7 @@ | |||||
| </select> | </select> | ||||
| <select id="findListOfUnverifiedByDate" parameterType="map" resultMap="BaseResultMap"> | |||||
| <select id="findListOfOrderedByDate" parameterType="map" resultMap="BaseResultMap"> | |||||
| select <include refid="allCouponOrderColumns" /> | select <include refid="allCouponOrderColumns" /> | ||||
| from wx_coupon_order co,wx_order o | from wx_coupon_order co,wx_order o | ||||
| where o.id = co.order_id | where o.id = co.order_id | ||||
| @@ -254,7 +254,7 @@ | |||||
| <if test="startDate != null"> | <if test="startDate != null"> | ||||
| AND co.create_date < #{endDate,jdbcType=TIMESTAMP} | AND co.create_date < #{endDate,jdbcType=TIMESTAMP} | ||||
| </if> | </if> | ||||
| AND co.coupon_order_status = '0' | |||||
| AND (co.coupon_order_status = '0' or co.coupon_order_status = '1') | |||||
| </select> | </select> | ||||