From fb0e8049f669b420b8385d41d51f815ffa0efcef Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 26 Jun 2019 02:17:13 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BC=98=E5=8C=96=E7=A0=8D=E4=BB=B7=E8=90=A5?= =?UTF-8?q?=E9=94=80=E6=95=B0=E6=8D=AE][=E4=BF=AE=E6=94=B9]:=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=B1=95=E7=A4=BA=E7=A0=8D=E4=BB=B7=E8=90=A5=E9=94=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # mallinkService/src/main/resources/mapper/WxCouponMapper.xml --- .../controller/market/WxCouponController.java | 7 +- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application-prod.yml | 2 +- .../src/main/resources/application-test.yml | 2 +- .../src/main/resources/application.yml | 2 +- .../com/iformall/mapper/WxCouponMapper.java | 8 +- .../service/impl/WxCouponServiceImpl.java | 7 ++ .../main/resources/mapper/WxCouponMapper.xml | 92 +++++++++++-------- 8 files changed, 77 insertions(+), 45 deletions(-) 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 679d3c9b9..88dda0528 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -274,7 +274,12 @@ public class WxCouponController extends BaseController { wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); } wxCoupon.setTenantId(getTenantId()); - return new ResultData(wxCouponService.findPressData(wxCoupon,pageNum,pageSize)); + PageInfo pages = wxCouponService.findPressData(wxCoupon,pageNum,pageSize); + List ids = new ArrayList<>(); + for(WxCouponStatisVo vo: pages.getList()) { + ids.add(vo.getId()); + } + return new ResultData(pages); } } diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index 40fcdb811..b42940e74 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -21,7 +21,7 @@ spring: testOnReturn: false poolPreparedStatements: true maxOpenPreparedStatements: 20 - connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=6000" + connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=60000" #jackson: #date-format: yyyy-MM-dd HH:mm:ss # REDIS diff --git a/mallinkAdmin/src/main/resources/application-prod.yml b/mallinkAdmin/src/main/resources/application-prod.yml index e1838b8ee..83bd12514 100644 --- a/mallinkAdmin/src/main/resources/application-prod.yml +++ b/mallinkAdmin/src/main/resources/application-prod.yml @@ -21,7 +21,7 @@ spring: testOnReturn: false poolPreparedStatements: true maxOpenPreparedStatements: 20 - connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=6000" + connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=60000" # REDIS redis: host: 127.0.0.1 diff --git a/mallinkAdmin/src/main/resources/application-test.yml b/mallinkAdmin/src/main/resources/application-test.yml index 9508fdc07..f6d7426ea 100644 --- a/mallinkAdmin/src/main/resources/application-test.yml +++ b/mallinkAdmin/src/main/resources/application-test.yml @@ -21,7 +21,7 @@ spring: testOnReturn: false poolPreparedStatements: true maxOpenPreparedStatements: 20 - connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=6000" + connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=60000" # REDIS redis: host: 127.0.0.1 diff --git a/mallinkAdmin/src/main/resources/application.yml b/mallinkAdmin/src/main/resources/application.yml index 0d5ba7966..8ece18bf3 100644 --- a/mallinkAdmin/src/main/resources/application.yml +++ b/mallinkAdmin/src/main/resources/application.yml @@ -60,7 +60,7 @@ mybatis: lazy-loading-enabled: true use-generated-keys: true default-fetch-size: 100 - default-statement-timeout: 10 + default-statement-timeout: 10000 #PageHelper diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java index 4a1294c88..e6dcdbde5 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java @@ -10,7 +10,13 @@ import com.iformall.domain.po.WxCoupon; public interface WxCouponMapper extends CommonMapper { List findPressData(WxCoupon wxCoupon); - List findCouponData(WxCoupon wxCoupon); + void updatePressData1(WxCoupon wxCoupon); + void updatePressData2(WxCoupon wxCoupon); + void updatePressData3(WxCoupon wxCoupon); + void updatePressData4(WxCoupon wxCoupon); + void updatePressData5(WxCoupon wxCoupon); + + List findCouponData(WxCoupon wxCoupon); List findCountData(WxCoupon wxCoupon); List findList(WxCoupon wxCoupon); 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 b290b300f..39b233f8a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -442,6 +442,13 @@ public class WxCouponServiceImpl implements WxCouponService { @Override public PageInfo findPressData(WxCoupon record, Integer pageNum, Integer pageSize) { + if(pageNum == 0) { + wxCouponMapper.updatePressData1(record); + wxCouponMapper.updatePressData2(record); + wxCouponMapper.updatePressData3(record); + wxCouponMapper.updatePressData4(record); + wxCouponMapper.updatePressData5(record); + } return PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxCouponMapper.findPressData(record)); } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index ada052c60..5b67d4f52 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -624,54 +624,68 @@ + + update wx_coupon_press_data cpd set change_rate = + IFNULL(round((select count(o.id) from wx_order o + where o.tenant_id = #{tenantId} and o.order_status = 1 and o.product_id = cpd.id)/ + (select count(wop.id) from wx_order o + left join wx_order_press wop on wop.order_id = o.id + where o.product_id = cpd.id and o.tenant_id = #{tenantId} and wop.first = 1)*100,2),0) + where cpd.tenant_id = #{tenantId} + + + + update wx_coupon_press_data cpd set press_count= (select count(wop.id) from wx_order o + left join wx_order_press wop on wop.order_id = o.id + where o.product_id = cpd.id and o.tenant_id = #{tenantId} and wop.first = 1) + where cpd.tenant_id=#{tenantId} + + + + update wx_coupon_press_data cpd set + press_succ_count = + (select count(o.id) from wx_order o + where o.product_id = cpd.id and o.tenant_id = #{tenantId} and o.order_status = 1) + where cpd.tenant_id=#{tenantId} + + + + update wx_coupon_press_data cpd set join_count = + (select count(wop.id) from wx_order o + left join wx_order_press wop on wop.order_id = o.id + where o.tenant_id = #{tenantId} and o.product_id = cpd.id and o.payment_type = 0) +where cpd.tenant_id=#{tenantId} + + + +