|
|
|
@@ -1351,7 +1351,7 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
* @param coupon |
|
|
|
*/ |
|
|
|
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) |
|
|
|
public WxCouponOrder createCouponOrder(Date curr,WxOrder order, WxCUserBasicInfo user, WxCoupon coupon, Long couponPasswordId,EnumPayWay payWay,EnumPayVersion payVersion,Long merchantId,Long bUserId,Long parentCouponOrderId) { |
|
|
|
public WxCouponOrder createCouponOrder(Date curr,WxOrder order, WxCUserBasicInfo user, WxCoupon coupon, WxCouponPassword couponPassWord,EnumPayWay payWay,EnumPayVersion payVersion,Long merchantId,Long bUserId,Long parentCouponOrderId) { |
|
|
|
Date valid_date = null; |
|
|
|
//int limit_days = Constant.WX_LIMIT_DAYS; |
|
|
|
WxPayOrder payOrder = null; |
|
|
|
@@ -1455,7 +1455,8 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
cardInfo.setCouponId(order.getProductId()); |
|
|
|
cardInfo.setAmount(coupon.getPrice()); |
|
|
|
cardInfo.setSaleAmount(coupon.getSalePrice()); |
|
|
|
cardInfo.setCouponPasswordId(couponPasswordId); |
|
|
|
cardInfo.setCouponPasswordId(couponPassWord.getId()); |
|
|
|
cardInfo.setCouponPassword(couponPassWord.getPassword()); |
|
|
|
cardInfo.setRemainingAmount(coupon.getPrice()); |
|
|
|
if (!coupon.checkIsFree()) { |
|
|
|
//判断该transctionId是否已经存在,如果存在,则不添加 |
|
|
|
@@ -1489,7 +1490,7 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
cardInfo.setRateAmount(0); |
|
|
|
if (coupon.getPasswordSupport().equals(EnumCouponPasswordSupport.SUPPORTED.getCode())) { |
|
|
|
WxCouponPassword updateCPwd = new WxCouponPassword(); |
|
|
|
updateCPwd.setId(couponPasswordId); |
|
|
|
updateCPwd.setId(couponPassWord.getId()); |
|
|
|
updateCPwd.setCardId(cardInfo.getId()); |
|
|
|
updateCPwd.setStatus(EnumCouponPasswordStatus.USED.getCode()); |
|
|
|
couponPasswordMapper.updateById(updateCPwd); |
|
|
|
@@ -2999,7 +3000,7 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) |
|
|
|
@Override |
|
|
|
public WxOrder saveFreeOrderForCoupon(Date orderDate,boolean allowUnPayOrder,WxComposeOrder composeOrder,WxCUserBasicInfo user, WxCoupon coupon,int couponNumber, |
|
|
|
WxCouponChannel couponChannel, String formId, Long couponPasswordId,String extParam,EnumPayWay payWay,EnumPayVersion payVersion, |
|
|
|
WxCouponChannel couponChannel, String formId, WxCouponPassword wxCouponPassword,String extParam,EnumPayWay payWay,EnumPayVersion payVersion, |
|
|
|
Integer shippingType, UserBasicInfoAddress address,boolean isPressOrder) { |
|
|
|
WxOrderServiceImpl proxy = (WxOrderServiceImpl) AopContext.currentProxy(); |
|
|
|
|
|
|
|
@@ -3059,7 +3060,7 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
} |
|
|
|
// 5. 创建couponOrder |
|
|
|
try { |
|
|
|
proxy.createCouponOrder(orderDate,record, user, coupon, couponPasswordId,payWay,payVersion,null,null,null); |
|
|
|
proxy.createCouponOrder(orderDate,record, user, coupon, wxCouponPassword,payWay,payVersion,null,null,null); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("couponOrder失败:" + e.getMessage(),e); |
|
|
|
throw new MallinkException(ErrorCode.COUPON_ORDER_SAVE_ERR.getCode(),"["+coupon.getTitle()+"]保存券订单错误."+e.getMessage()); |
|
|
|
|