From a48a8661602f6ca2c98304d50756736af2df8fef Mon Sep 17 00:00:00 2001 From: hupeng Date: Tue, 28 Aug 2018 19:49:00 +0800 Subject: [PATCH] =?UTF-8?q?[B=E7=AB=AF][=E4=BF=AE=E5=A4=8D]:=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E4=BB=8A=E6=97=A5=E4=B8=8B=E5=8D=95=E6=80=BB=E9=A2=9D?= =?UTF-8?q?=E5=92=8C=E6=B5=81=E6=B0=B4=E6=BC=8F=E6=8E=89=E4=BB=8A=E6=97=A5?= =?UTF-8?q?=E6=A0=B8=E9=94=80=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/simple/schedule/DaliyAmountSchedule.java | 2 +- .../java/com/simple/mapper/WxCouponOrderMapper.java | 4 ++-- .../service/impl/WxCouponOrderServiceImpl.java | 4 ++-- .../main/resources/mapper/WxCouponOrderMapper.xml | 12 ++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/schedule/DaliyAmountSchedule.java b/mallinkAdmin/src/main/java/com/simple/schedule/DaliyAmountSchedule.java index e58ea293e..d3b6b641c 100644 --- a/mallinkAdmin/src/main/java/com/simple/schedule/DaliyAmountSchedule.java +++ b/mallinkAdmin/src/main/java/com/simple/schedule/DaliyAmountSchedule.java @@ -80,7 +80,7 @@ public class DaliyAmountSchedule { dateMap.put("endDate", new Date()); dateMap.put("merchantID",merchant.getId()); - List list = wxCouponOrderMapper.findListOfUnverifiedByDate(dateMap); + List list = wxCouponOrderMapper.findListOfOrderedByDate(dateMap); logger.info("find " + list.size() + " coupon order from " + startDate + " to " + new Date()); int total_price = 0; for(WxCouponOrder couponOrder : list) { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java index 94491d665..9ca433cad 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java @@ -12,10 +12,10 @@ public interface WxCouponOrderMapper extends CommonMapper { List findList(WxCouponOrder wxCouponOrder); Integer countList(WxCouponOrder wxCouponOrder); - List findListOfUnverifiedByDate(Map dateMap); + List findListOfOrderedByDate(Map dateMap); List findListOfVerifiedByDate(Map dateMap); - List findListOfUnverifiedByDateForBUser(Map dateMap); + List findListOfOrderedByDateForBUser(Map dateMap); List findListOfVerifiedByDateForBUser(Map dateMap); WxCouponOrderCVo selectDetailOfUser(Map paramMap); diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java index 5b5a8a715..56032c63f 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java @@ -134,7 +134,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { if(isVerified) list = wxCouponOrderMapper.findListOfVerifiedByDate(dateMap); else - list = wxCouponOrderMapper.findListOfUnverifiedByDate(dateMap); + list = wxCouponOrderMapper.findListOfOrderedByDate(dateMap); logger.info("find " + list.size() + " coupon order from " + startDate + " to " + new Date()); int total_price = 0; for (WxCouponOrder couponOrder : list) { @@ -146,7 +146,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { if (isVerified) resultMap.put("list", PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfVerifiedByDateForBUser(dateMap))); 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); } diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 1d396e8ee..128bebfc6 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -128,7 +128,7 @@ bu.name,cu.phone - + 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, 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 - + select from wx_coupon_order co,wx_order o,wx_coupon c,wx_c_user cu where o.id = co.order_id and o.merchant_id = #{merchantID} @@ -151,7 +151,7 @@ AND co.create_date < #{endDate,jdbcType=TIMESTAMP} - AND co.coupon_order_status = '0' + AND (co.coupon_order_status = '0' or co.coupon_order_status = '1') order by co.create_date desc @@ -243,7 +243,7 @@ - select from wx_coupon_order co,wx_order o where o.id = co.order_id @@ -254,7 +254,7 @@ AND co.create_date < #{endDate,jdbcType=TIMESTAMP} - AND co.coupon_order_status = '0' + AND (co.coupon_order_status = '0' or co.coupon_order_status = '1')