From 1878c7a7d370d683d9aa8b20b1fa493d3a072721 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 19 Mar 2019 11:19:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E8=90=A5=E9=94=80=E5=88=86=E6=9E=90][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0][=E5=8D=A1=E8=90=A5=E9=94=80=E5=88=97?= =?UTF-8?q?=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkMQConsumer/src/main/resources/application-prod.yml | 2 +- mallinkMQConsumer/src/main/resources/application-test.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mallinkMQConsumer/src/main/resources/application-prod.yml b/mallinkMQConsumer/src/main/resources/application-prod.yml index 8081ace96..71de10c00 100644 --- a/mallinkMQConsumer/src/main/resources/application-prod.yml +++ b/mallinkMQConsumer/src/main/resources/application-prod.yml @@ -1,6 +1,6 @@ spring: profiles: - include: rocketMQ + include: rabbitMQ # JDBC datasource: url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true diff --git a/mallinkMQConsumer/src/main/resources/application-test.yml b/mallinkMQConsumer/src/main/resources/application-test.yml index 14c53bbea..5e3d7ff63 100644 --- a/mallinkMQConsumer/src/main/resources/application-test.yml +++ b/mallinkMQConsumer/src/main/resources/application-test.yml @@ -1,3 +1,6 @@ +spring: + profiles: + include: rabbitMQ spring: # JDBC datasource: From 3ff0d07ddae7ffec21c24be8fee41053a0c7ba53 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 19 Mar 2019 11:21:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E6=8B=BC=E5=9B=A2][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BA=BA=E6=95=B0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxOrderServiceImpl.java | 4 ++-- 1 file changed, 2 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 c4ff162bd..472af5d28 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -358,14 +358,14 @@ public class WxOrderServiceImpl implements WxOrderService { throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); } // 拼团 - /* 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);