Merge branch 'pre' into dev

dev-discount
= 4 years ago
commit 7f98b2c05f
  1. 1
      hai-service/src/main/java/com/hai/service/impl/HighDiscountAgentCodeServiceImpl.java
  2. 2
      hai-service/src/main/java/com/hai/service/pay/impl/GoodsOrderServiceImpl.java

@ -56,7 +56,6 @@ public class HighDiscountAgentCodeServiceImpl implements HighDiscountAgentCodeSe
} }
@Override @Override
@Transactional(propagation= Propagation.REQUIRES_NEW)
public void updateCode(HighDiscountAgentCode highDiscountAgentCode) { public void updateCode(HighDiscountAgentCode highDiscountAgentCode) {
highDiscountAgentCodeMapper.updateByPrimaryKey(highDiscountAgentCode); highDiscountAgentCodeMapper.updateByPrimaryKey(highDiscountAgentCode);
} }

@ -114,7 +114,7 @@ public class GoodsOrderServiceImpl implements PayService {
HighCoupon coupon = highCouponService.getCouponById(highChildOrder.getGoodsId()); HighCoupon coupon = highCouponService.getCouponById(highChildOrder.getGoodsId());
// 贵州中石化 // 贵州中石化
if (coupon.getCouponSource() != 4) { if (coupon.getCouponSource() == 4) {
// 获取token // 获取token
JSONObject tokenObject = HuiLianTongConfig.getToken(); JSONObject tokenObject = HuiLianTongConfig.getToken();
if (!tokenObject.getString("result").equals("success")) { if (!tokenObject.getString("result").equals("success")) {

Loading…
Cancel
Save