From a97363dbb828a7d8a311a2e3d449c0ee66d86a1f Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 19 Mar 2019 10:22:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E8=B4=A6=E5=8D=95][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=82=AC=E7=BC=B4=E6=97=B6=E9=97=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/schedule/BillNotificationSchedule.java | 2 +- mallinkService/src/main/resources/mapper/WxBillAllMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java index c3d06fd86..c40acc1a1 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java @@ -46,7 +46,7 @@ public class BillNotificationSchedule { /** * 每天9点执行 */ - @Scheduled(cron = "0 0 9 * * ?") + @Scheduled(cron = "0 0 14 * * ?") public void sendMsgFromBill() { logger.info("账单通知任务启动"); sendWaitPayBill(); diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index d586091b5..9ad31bc76 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -270,7 +270,7 @@ select bill.tenant_id,bill.merchant_id,bill.receive_date,ifnull(sum(need_pay),0) group by bill.tenant_id,bill.merchant_id,bill.receive_date) bill left join wx_merchant m on bill.merchant_id=m.id left join (select tenant_id,`name` appname from wx_appinfo app where type=1) app on bill.tenant_id=app.tenant_id - + where m.status=1 @@ -313,7 +313,7 @@ select bill.tenant_id,bill.merchant_id,bill.receive_date,ifnull(sum(need_pay),0) group by bill.tenant_id,bill.merchant_id) bill left join wx_merchant m on bill.merchant_id=m.id left join (select tenant_id,`name` appname from wx_appinfo app where type=1) app on bill.tenant_id=app.tenant_id - + where m.status=1 From c84a9d008f56c064f74a9a69b196e2f58be34047 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 19 Mar 2019 11:04:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E4=B8=8B=E8=AE=A2=E5=8D=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98][=E4=BF=AE=E6=94=B9]:=E6=97=A0=E6=B3=95=E4=B8=8B?= =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxOrderServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 182a7c894..c4ff162bd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -357,13 +357,15 @@ public class WxOrderServiceImpl implements WxOrderService { logger.error("商户不存在, couponId: " + couponIdStr); throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); } - if (!orderGroupId.equals(0L)) { + // 拼团 + /* + if (orderGroupId != null && !orderGroupId.equals(0L)) { WxOrderGroup group = wxOrderGroupMapper.selectByPrimaryKey(orderGroupId); if (group.getStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE.getCode())) { logger.error("下订单拼团人数已满>>>" + orderGroupId); throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_FINISHED); } - } + }*/ // 减库存操作 stockReduce(user, coupon, couponIdStr);