From 8dc8133fb93405c6fc34c9c3c6c6bbce09ebe7f0 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期二, 24 十二月 2019 10:52:52 +0800 Subject: [PATCH] 品牌商品更新调整 订单维权修改 --- fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java index 8f36aa0..f742097 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java @@ -698,9 +698,9 @@ return; // 涓嬪崟鏃ユ湡鏄惁鏄鍚堜笂绾挎棩鏈� - long downOrderTime = thirdCreateTime.getTime(); - long limitDate = TimeUtil.parse(Constant.COUPON_REWARD_TIME).getTime(); - if (downOrderTime > limitDate) { + long downOrderTime = thirdCreateTime.getTime(); + long limitDate = TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME); + if (downOrderTime > limitDate) { // 2.1 寮�濮嬫柊鐗� rewardCounponLimitTime(order, accountTime); } else if (hasRewardCoupon) { @@ -872,7 +872,7 @@ return commonOrderMapper.listBySourceTypeAndOrderNo(sourceType, orderId); } - @Transactional + @Transactional(rollbackFor=Exception.class) @Override public List<CommonOrderAddResultDTO> addTaoBaoOrder(List<TaoBaoOrder> taoBaoOrders, Long uid) throws CommonOrderException { @@ -934,7 +934,7 @@ return commonOrderList; } - @Transactional + @Transactional(rollbackFor=Exception.class) @Override public List<CommonOrderAddResultDTO> addPDDOrder(List<PDDOrder> pddOrderList, Long uid) throws CommonOrderException { @@ -984,7 +984,7 @@ return commonOrderList; } - @Transactional + @Transactional(rollbackFor=Exception.class) @Override public List<CommonOrderAddResultDTO> addJDOrder(JDOrder jdOrder, Long uid) throws CommonOrderException { List<CommonOrderAddResultDTO> commonOrderList = new ArrayList<>(); @@ -1054,7 +1054,7 @@ * * @param commonOrder */ - @Transactional + @Transactional(rollbackFor=Exception.class) private CommonOrderAddResultDTO addCommonOrder(CommonOrder commonOrder) throws CommonOrderException { // 鍒ゆ柇鍟嗗搧鏄惁瀛樺湪 if (commonOrder == null) -- Gitblit v1.8.0