|
|
|
@@ -2769,7 +2769,7 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
RedisTemplate<String, WxCUserBasicInfo> cUserBasicInfoRedisTemplate; |
|
|
|
|
|
|
|
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) |
|
|
|
public WxComposeOrder savePlatPushOrderForCoupon(TenantEntity tenantEntity,boolean allowUnPayOrder,EnumComposeOrder composeOrderType,WxCUserBasicInfo user,List<PlatPushOrderSaveDto> platPushOrderList,EnumPayWay payWay) { |
|
|
|
public WxComposeOrder savePlatPushOrderForCoupon(TenantEntity tenantEntity,boolean allowUnPayOrder,EnumComposeOrder composeOrderType,WxCUserBasicInfo user,String allExtParam,List<PlatPushOrderSaveDto> platPushOrderList,EnumPayWay payWay) { |
|
|
|
WxOrderServiceImpl proxy = (WxOrderServiceImpl) AopContext.currentProxy(); |
|
|
|
// 防止同一用户重复下单,1秒内 |
|
|
|
String key = new StringBuilder().append("savePlatPushOrder:").append(user.getId()).toString(); |
|
|
|
@@ -2782,7 +2782,7 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
|
|
|
|
OrderAdapterService orderAdapterService = orderFactory.getOrderAdapterService(composeOrderType.getCode()); |
|
|
|
//从这里开始,就需要锁住渠道的价格,不能修改 |
|
|
|
WxComposeOrder composeOrder = orderAdapterService.createDBMainOrderByPushOrder(tenantEntity,user, platPushOrderList, payWay); |
|
|
|
WxComposeOrder composeOrder = orderAdapterService.createDBMainOrderByPushOrder(tenantEntity,user, allExtParam,platPushOrderList, payWay); |
|
|
|
Date orderDate = new Date(); |
|
|
|
WxOrder lastOrder = null; |
|
|
|
for (int i = 0 ; i < platPushOrderList.size(); i ++) { |
|
|
|
@@ -3398,7 +3398,7 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultData platPushSaveOrder(boolean allowUnPayOrder,EnumComposeOrder composeOrderType,List<PlatPushOrderSaveDto> platPushOrderList,Long cUserId,EnumPayWay payWay,TenantEntity tenantEntity) { |
|
|
|
public ResultData platPushSaveOrder(boolean allowUnPayOrder,EnumComposeOrder composeOrderType,String allExtParam,List<PlatPushOrderSaveDto> platPushOrderList,Long cUserId,EnumPayWay payWay,TenantEntity tenantEntity) { |
|
|
|
try { |
|
|
|
if (null == platPushOrderList || platPushOrderList.size() <= 0 ) { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"无商品信息"); |
|
|
|
@@ -3422,7 +3422,7 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
} |
|
|
|
WxOrderServiceImpl proxy = (WxOrderServiceImpl) AopContext.currentProxy(); |
|
|
|
try { |
|
|
|
WxComposeOrder order = proxy.savePlatPushOrderForCoupon(tenantEntity,allowUnPayOrder,composeOrderType,wxCUserBasicInfo, platPushOrderList, payWay); |
|
|
|
WxComposeOrder order = proxy.savePlatPushOrderForCoupon(tenantEntity,allowUnPayOrder,composeOrderType,wxCUserBasicInfo, allExtParam,platPushOrderList, payWay); |
|
|
|
return new ResultData(order); |
|
|
|
} catch (MallinkException e) { |
|
|
|
logger.error("saveOrderForCoupon error.",e); |
|
|
|
|