|
|
|
@@ -15,12 +15,10 @@ import com.iformall.mapper.WxOrderMapper; |
|
|
|
import com.iformall.pay.WxPayConstant; |
|
|
|
import com.iformall.service.*; |
|
|
|
import lombok.AllArgsConstructor; |
|
|
|
import net.sf.saxon.expr.Component; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.slf4j.Logger; |
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.transaction.annotation.Propagation; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
import org.springframework.web.bind.annotation.RequestBody; |
|
|
|
|
|
|
|
@@ -220,6 +218,7 @@ public class PosServiceImpl implements PosService { |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public Map<String, String> couponOrderVerifyDo(@RequestBody Map<String, String> params, EnumVerifyActionType actionType) throws MallinkException { |
|
|
|
Map<String, String> retMap = new HashMap<>(); |
|
|
|
|
|
|
|
@@ -322,6 +321,7 @@ public class PosServiceImpl implements PosService { |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public Map<String, String> couponOrderVerifyListDo(@RequestBody Map<String, String> params, EnumVerifyActionType actionType) throws MallinkException { |
|
|
|
Map<String, String> retMap = new HashMap<>(); |
|
|
|
|
|
|
|
@@ -558,7 +558,6 @@ public class PosServiceImpl implements PosService { |
|
|
|
retMap.put(WxPayConstant.PRE_VERIFY, "true"); |
|
|
|
retMap.put(WxPayConstant.DEDUCT_AMOUNT, String.valueOf(couponOrderCVo.getPrice())); |
|
|
|
retMap.put(WxPayConstant.REMAIN_AMOUNT, String.valueOf(posAmount - couponOrderCVo.getPrice())); |
|
|
|
posAmount = posAmount - couponOrderCVo.getPrice(); |
|
|
|
return retMap; |
|
|
|
} |
|
|
|
if (couponOrderCVo.getCouponOrderStatus().equals(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode())) { |
|
|
|
@@ -569,7 +568,6 @@ public class PosServiceImpl implements PosService { |
|
|
|
retMap.put(WxPayConstant.PRE_VERIFY, "true"); |
|
|
|
retMap.put(WxPayConstant.DEDUCT_AMOUNT, String.valueOf(couponOrderCVo.getPrice())); |
|
|
|
retMap.put(WxPayConstant.REMAIN_AMOUNT, String.valueOf(posAmount - couponOrderCVo.getPrice())); |
|
|
|
posAmount = posAmount - couponOrderCVo.getPrice(); |
|
|
|
return retMap; |
|
|
|
} catch (MallinkException e) { |
|
|
|
logger.error(e.getMessage()); |
|
|
|
@@ -634,7 +632,6 @@ public class PosServiceImpl implements PosService { |
|
|
|
retMap.put(WxPayConstant.VERIFY, "true"); |
|
|
|
retMap.put(WxPayConstant.DEDUCT_AMOUNT, String.valueOf(couponOrderCVo.getPrice())); |
|
|
|
retMap.put(WxPayConstant.REMAIN_AMOUNT, String.valueOf(posAmount - couponOrderCVo.getPrice())); |
|
|
|
posAmount = posAmount - couponOrderCVo.getPrice(); |
|
|
|
return retMap; |
|
|
|
} catch (MallinkException e) { |
|
|
|
logger.error(e.getMessage()); |
|
|
|
@@ -652,6 +649,7 @@ public class PosServiceImpl implements PosService { |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public Map<String, String> couponOrderVerifyCancel(Map<String, String> params, EnumVerifyActionType actionType) { |
|
|
|
Map<String, String> retMap = new HashMap<>(); |
|
|
|
|
|
|
|
@@ -740,7 +738,7 @@ public class PosServiceImpl implements PosService { |
|
|
|
throw new MallinkException(ErrorCode.VERIFY_PRE_BUSER_NOT_EQUAL); |
|
|
|
} |
|
|
|
try { |
|
|
|
cancelPreVerify(couponOrderCVo, buUserId, posOrderId); |
|
|
|
cancelPreVerify(couponOrderCVo, posOrderId); |
|
|
|
return retMap; |
|
|
|
} catch (MallinkException e) { |
|
|
|
logger.error(e.getMessage()); |
|
|
|
@@ -776,7 +774,6 @@ public class PosServiceImpl implements PosService { |
|
|
|
* @param couponOrderCVo |
|
|
|
* @param posOrderId |
|
|
|
*/ |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public void doPreVerify(WxCouponOrderCVo couponOrderCVo, Long buUserId, Long posOrderId) { |
|
|
|
int num = 0; |
|
|
|
// 1. insert posOrderId |
|
|
|
@@ -817,11 +814,9 @@ public class PosServiceImpl implements PosService { |
|
|
|
/** |
|
|
|
* 预核销回退 |
|
|
|
* @param couponOrderCVo |
|
|
|
* @param buUserId |
|
|
|
* @param posOrderId |
|
|
|
*/ |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public void cancelPreVerify(WxCouponOrderCVo couponOrderCVo, Long buUserId, Long posOrderId) { |
|
|
|
public void cancelPreVerify(WxCouponOrderCVo couponOrderCVo, Long posOrderId) { |
|
|
|
int num = 0; |
|
|
|
// 1. update posOrderId |
|
|
|
PosCouponOrderVerify posCouponOrderVerify = new PosCouponOrderVerify(); |
|
|
|
@@ -864,7 +859,7 @@ public class PosServiceImpl implements PosService { |
|
|
|
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); |
|
|
|
} |
|
|
|
if (num != 1) { |
|
|
|
logger.error("核销异常:updatete num " + num); |
|
|
|
logger.error("预核销异常:updatete num " + num); |
|
|
|
throw new MallinkException(ErrorCode.VERIFY_ERROR.getCode(), "updatete num " + num); |
|
|
|
} |
|
|
|
logger.info("预核销已取消: " + couponOrderCVo.getId()); |
|
|
|
@@ -877,7 +872,6 @@ public class PosServiceImpl implements PosService { |
|
|
|
* @param buUserId |
|
|
|
* @param posOrderId |
|
|
|
*/ |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public void doVerify(WxCouponOrderCVo couponOrderCVo, WxCoupon coupon, Long merchantId, Long buUserId, Long posOrderId, Map<String, String> retMap) { |
|
|
|
int num = 0; |
|
|
|
// 1. insert posOrderId |
|
|
|
@@ -913,7 +907,7 @@ public class PosServiceImpl implements PosService { |
|
|
|
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); |
|
|
|
} |
|
|
|
if (num != 1) { |
|
|
|
logger.error("核销异常:updatete num " + num); |
|
|
|
logger.error("核销异常:update num " + num); |
|
|
|
throw new MallinkException(ErrorCode.VERIFY_ERROR.getCode(), "updatete num " + num); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -957,7 +951,6 @@ public class PosServiceImpl implements PosService { |
|
|
|
* @param buUserId |
|
|
|
* @param posOrderId |
|
|
|
*/ |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public void cancelVerify(WxCouponOrderCVo couponOrderCVo, Long buUserId, Long posOrderId) { |
|
|
|
// 1. 积分历史回退 |
|
|
|
try { |
|
|
|
|