From c167389389b63dfe1b54b36e4415419b28d06ad1 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 15 Jul 2020 17:42:34 +0800 Subject: [PATCH 1/3] fix bug --- .../src/main/java/com/iformall/tenant/TenantInfoImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 38afaebd9..caf5d3ff6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -115,6 +115,9 @@ public class TenantInfoImpl implements TenantInfo { if ("wx_c_user".equals(tableName)) { return true; } + if ("wx_c_user_basic_info".equals(tableName)) { + return true; + } if ("wx_c_user_car".equals(tableName)) { return true; } From ce1d013f71f14ef209ed46a96ec301df110ed8e0 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 22 Jul 2020 09:47:56 +0800 Subject: [PATCH 2/3] oss ---- http ----https --- mallinkAdmin/src/main/resources/application-dev.yml | 2 +- mallinkAdmin/src/main/resources/application-prod.yml | 2 +- mallinkBApi/src/main/resources/application-dev.yml | 2 +- mallinkBApi/src/main/resources/application-prod.yml | 2 +- mallinkCApi/src/main/resources/application-dev.yml | 2 +- mallinkCApi/src/main/resources/application-prod.yml | 2 +- mallinkCallback/src/main/resources/application-dev.yml | 2 +- mallinkCallback/src/main/resources/application-prod.yml | 2 +- mallinkMQConsumer/src/main/resources/application-dev.yml | 2 +- mallinkMQConsumer/src/main/resources/application-prod.yml | 2 +- mallinkPosApi/src/main/resources/application-dev.yml | 2 +- mallinkPosApi/src/main/resources/application-prod.yml | 2 +- mallinkSchedule/src/main/resources/application-dev.yml | 2 +- mallinkSchedule/src/main/resources/application-prod.yml | 2 +- mallinkSysAdmin/src/main/resources/application-dev.yml | 2 +- mallinkSysAdmin/src/main/resources/application-prod.yml | 2 +- mallinkWebSocketServer/src/main/resources/application-dev.yml | 2 +- mallinkWebSocketServer/src/main/resources/application-prod.yml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index c8195e0ad..bafc0102f 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -59,7 +59,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinkadmin - filedomain: http://formall.oss-accelerate.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: diff --git a/mallinkAdmin/src/main/resources/application-prod.yml b/mallinkAdmin/src/main/resources/application-prod.yml index 69ae8b3c2..26c10ca4f 100644 --- a/mallinkAdmin/src/main/resources/application-prod.yml +++ b/mallinkAdmin/src/main/resources/application-prod.yml @@ -54,7 +54,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinkadmin - filedomain: http://formall.oss-accelerate.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: host: smtp.exmail.qq.com diff --git a/mallinkBApi/src/main/resources/application-dev.yml b/mallinkBApi/src/main/resources/application-dev.yml index e34037bc7..f71808cc8 100644 --- a/mallinkBApi/src/main/resources/application-dev.yml +++ b/mallinkBApi/src/main/resources/application-dev.yml @@ -58,7 +58,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinkbapi - filedomain: http://formall.oss-accelerate.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: diff --git a/mallinkBApi/src/main/resources/application-prod.yml b/mallinkBApi/src/main/resources/application-prod.yml index 673236766..b06feacc4 100644 --- a/mallinkBApi/src/main/resources/application-prod.yml +++ b/mallinkBApi/src/main/resources/application-prod.yml @@ -53,7 +53,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinkadmin - filedomain: http://formall.oss-accelerate.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: host: smtp.exmail.qq.com diff --git a/mallinkCApi/src/main/resources/application-dev.yml b/mallinkCApi/src/main/resources/application-dev.yml index 7307d0404..b0137237b 100644 --- a/mallinkCApi/src/main/resources/application-dev.yml +++ b/mallinkCApi/src/main/resources/application-dev.yml @@ -58,7 +58,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinkcapi - filedomain: http://formall.oss-accelerate.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: diff --git a/mallinkCApi/src/main/resources/application-prod.yml b/mallinkCApi/src/main/resources/application-prod.yml index 93fe8adab..5efbe5257 100644 --- a/mallinkCApi/src/main/resources/application-prod.yml +++ b/mallinkCApi/src/main/resources/application-prod.yml @@ -52,7 +52,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinkadmin - filedomain: http://formall.oss-accelerate.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: diff --git a/mallinkCallback/src/main/resources/application-dev.yml b/mallinkCallback/src/main/resources/application-dev.yml index 1bfa02852..71c852d84 100644 --- a/mallinkCallback/src/main/resources/application-dev.yml +++ b/mallinkCallback/src/main/resources/application-dev.yml @@ -59,7 +59,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinkcallback - filedomain: http://formall.oss-accelerate.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: diff --git a/mallinkCallback/src/main/resources/application-prod.yml b/mallinkCallback/src/main/resources/application-prod.yml index 9ebbf91b7..1c425ee19 100644 --- a/mallinkCallback/src/main/resources/application-prod.yml +++ b/mallinkCallback/src/main/resources/application-prod.yml @@ -53,7 +53,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinkadmin - filedomain: http://formall.oss-accelerate.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: diff --git a/mallinkMQConsumer/src/main/resources/application-dev.yml b/mallinkMQConsumer/src/main/resources/application-dev.yml index 46adaa728..252666a91 100644 --- a/mallinkMQConsumer/src/main/resources/application-dev.yml +++ b/mallinkMQConsumer/src/main/resources/application-dev.yml @@ -60,7 +60,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinkmqconsumer - filedomain: http://formall.oss-accelerate.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: diff --git a/mallinkMQConsumer/src/main/resources/application-prod.yml b/mallinkMQConsumer/src/main/resources/application-prod.yml index b6787707f..0c0d51aed 100644 --- a/mallinkMQConsumer/src/main/resources/application-prod.yml +++ b/mallinkMQConsumer/src/main/resources/application-prod.yml @@ -53,7 +53,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinkadmin - filedomain: http://formall.oss-accelerate.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: host: smtp.exmail.qq.com diff --git a/mallinkPosApi/src/main/resources/application-dev.yml b/mallinkPosApi/src/main/resources/application-dev.yml index 119bbf5f1..c16e5c7b4 100644 --- a/mallinkPosApi/src/main/resources/application-dev.yml +++ b/mallinkPosApi/src/main/resources/application-dev.yml @@ -58,7 +58,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinkposapi - filedomain: http://formall.oss-accelerate.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: diff --git a/mallinkPosApi/src/main/resources/application-prod.yml b/mallinkPosApi/src/main/resources/application-prod.yml index 6f9d27193..d51c351a4 100644 --- a/mallinkPosApi/src/main/resources/application-prod.yml +++ b/mallinkPosApi/src/main/resources/application-prod.yml @@ -52,7 +52,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinkadmin - filedomain: http://formall.oss-accelerate.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: host: smtp.exmail.qq.com diff --git a/mallinkSchedule/src/main/resources/application-dev.yml b/mallinkSchedule/src/main/resources/application-dev.yml index 9692540ff..a5f805d7b 100644 --- a/mallinkSchedule/src/main/resources/application-dev.yml +++ b/mallinkSchedule/src/main/resources/application-dev.yml @@ -60,7 +60,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinkschedule - filedomain: http://formall.oss-accelerate.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: diff --git a/mallinkSchedule/src/main/resources/application-prod.yml b/mallinkSchedule/src/main/resources/application-prod.yml index c1ab1613c..c21611e26 100644 --- a/mallinkSchedule/src/main/resources/application-prod.yml +++ b/mallinkSchedule/src/main/resources/application-prod.yml @@ -53,7 +53,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinkadmin - filedomain: http://formall.oss-accelerate.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: host: smtp.exmail.qq.com diff --git a/mallinkSysAdmin/src/main/resources/application-dev.yml b/mallinkSysAdmin/src/main/resources/application-dev.yml index 3ac633170..bcbab2942 100644 --- a/mallinkSysAdmin/src/main/resources/application-dev.yml +++ b/mallinkSysAdmin/src/main/resources/application-dev.yml @@ -58,7 +58,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinksysadmin - filedomain: http://formall.oss-accelerate.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: diff --git a/mallinkSysAdmin/src/main/resources/application-prod.yml b/mallinkSysAdmin/src/main/resources/application-prod.yml index ad75e947d..7bc95517f 100644 --- a/mallinkSysAdmin/src/main/resources/application-prod.yml +++ b/mallinkSysAdmin/src/main/resources/application-prod.yml @@ -53,7 +53,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinkadmin - filedomain: http://formall.oss-accelerate.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: host: smtp.exmail.qq.com diff --git a/mallinkWebSocketServer/src/main/resources/application-dev.yml b/mallinkWebSocketServer/src/main/resources/application-dev.yml index 0e2f81464..7089a807a 100644 --- a/mallinkWebSocketServer/src/main/resources/application-dev.yml +++ b/mallinkWebSocketServer/src/main/resources/application-dev.yml @@ -60,7 +60,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinkwebsocketserver - filedomain: http://formall.oss-accelerate.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: diff --git a/mallinkWebSocketServer/src/main/resources/application-prod.yml b/mallinkWebSocketServer/src/main/resources/application-prod.yml index 0e231f47e..3c4283980 100644 --- a/mallinkWebSocketServer/src/main/resources/application-prod.yml +++ b/mallinkWebSocketServer/src/main/resources/application-prod.yml @@ -53,7 +53,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinkadmin - filedomain: http://formall.oss-accelerate.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: host: smtp.exmail.qq.com From 5d801378ae943d04d2d7e546ed9091d9056a2777 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Sat, 25 Jul 2020 12:12:09 +0800 Subject: [PATCH 3/3] fix schedule bug --- .../schedule/CouponOrderExpiringSchedule.java | 6 +++++- .../com/iformall/schedule/OrderExpiringSchedule.java | 12 ++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java index 63891ec68..a232e4d33 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java @@ -73,7 +73,11 @@ public class CouponOrderExpiringSchedule { List list = wxCouponOrderMapper.findExpiredCouponOrderByValidDate(); CouponOrderExpiringSchedule proxy = (CouponOrderExpiringSchedule) AopContext.currentProxy(); list.stream().forEach(co -> { - proxy.refund(co); + try { + proxy.refund(co); + }catch(Exception e) { + logger.error(e.getMessage()); + } }); } diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java index 36f19672a..a9898dde5 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java @@ -158,6 +158,7 @@ public class OrderExpiringSchedule { order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode()); wxOrderMapper.selectList(new QueryWrapper(order)).stream().forEach(o -> { try { + proxy.orderGroupBreak((WxOrder) o); proxy.returnMoney((WxOrder) o); } catch (Exception e) { logger.error("拼团券下架退款失败" + e.getMessage()); @@ -304,6 +305,17 @@ public class OrderExpiringSchedule { wxOrderService.orderClose(updateOrder); logger.info("拼团订单: " + order.getId() + " create at " + order.getCreateDate() + " expired at " + curDate); } + + @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) + public void orderGroupBreak(WxOrder order) { + Date curDate = new Date(); + WxOrder updateOrder = new WxOrder(); + updateOrder.setId(order.getId()); + updateOrder.updateTenantInfo(order); + updateOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_BREAK.getCode()); + updateOrder.setUpdateDate(curDate); + wxOrderMapper.updateById(updateOrder); + } /** * 回调会再次扣减库存