From b519f81e933e8c049e044ef226ecd2e6304b9e4e Mon Sep 17 00:00:00 2001 From: = <=> Date: Sat, 28 Aug 2021 10:16:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?'=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hai/service/pay/impl/GoodsOrderServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hai-service/src/main/java/com/hai/service/pay/impl/GoodsOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/pay/impl/GoodsOrderServiceImpl.java index f756e344..ff633c51 100644 --- a/hai-service/src/main/java/com/hai/service/pay/impl/GoodsOrderServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/pay/impl/GoodsOrderServiceImpl.java @@ -114,7 +114,7 @@ public class GoodsOrderServiceImpl implements PayService { HighCoupon coupon = highCouponService.getCouponById(highChildOrder.getGoodsId()); // 贵州中石化 - if (coupon.getCouponSource() != 4) { + if (coupon.getCouponSource() == 4) { // 获取token JSONObject tokenObject = HuiLianTongConfig.getToken(); if (!tokenObject.getString("result").equals("success")) { From f27275ad084d774fc73f35f9f96210d57212bef5 Mon Sep 17 00:00:00 2001 From: = <=> Date: Sat, 28 Aug 2021 10:51:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hai/service/impl/HighDiscountAgentCodeServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/hai-service/src/main/java/com/hai/service/impl/HighDiscountAgentCodeServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighDiscountAgentCodeServiceImpl.java index eab6eba4..45722aaf 100644 --- a/hai-service/src/main/java/com/hai/service/impl/HighDiscountAgentCodeServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/HighDiscountAgentCodeServiceImpl.java @@ -56,7 +56,6 @@ public class HighDiscountAgentCodeServiceImpl implements HighDiscountAgentCodeSe } @Override - @Transactional(propagation= Propagation.REQUIRES_NEW) public void updateCode(HighDiscountAgentCode highDiscountAgentCode) { highDiscountAgentCodeMapper.updateByPrimaryKey(highDiscountAgentCode); }