|
|
|
@@ -2031,10 +2031,8 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
WxOrder order = null; |
|
|
|
if (checkCouponIsFree(coupon,orderdto.getShippingType())) { |
|
|
|
// 免费券 |
|
|
|
order = proxy.saveFreeOrderForCoupon(composeOrder,user, coupon,perCouponNumber, |
|
|
|
orderdto.getSignleOrder().getCouponChannelId(), orderdto.getSignleOrder().getFormId(), |
|
|
|
null,payWay, |
|
|
|
orderdto.getShippingType(),orderdto.getAddress()); |
|
|
|
order = proxy.saveFreeOrderForCoupon(composeOrder,user, coupon,perCouponNumber,orderdto.getSignleOrder().getCouponChannelId(), |
|
|
|
orderdto.getSignleOrder().getFormId(),null,payWay,orderdto.getShippingType(),orderdto.getAddress()); |
|
|
|
if (order != null) { |
|
|
|
// 6. 下订单完成,发送内部消息 |
|
|
|
// 下订单完成,发送内部消息 |
|
|
|
@@ -2121,8 +2119,6 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
logger.error("下订单错误:" + e.getMessage(),e); |
|
|
|
throw new MallinkException(ErrorCode.ORDER_SAVE_ERR.getCode(),"["+coupon.getTitle()+"]保存订单错误."+e.getMessage()); |
|
|
|
} |
|
|
|
Integer aaa = null; |
|
|
|
System.out.println(aaa.intValue()); |
|
|
|
// 5. 创建couponOrder |
|
|
|
try { |
|
|
|
proxy.createCouponOrder(record, user, coupon, couponPasswordId,payWay,null,null); |
|
|
|
|