Commit bba68716 by shuhu.hou

移除创建&支付订单上传微信

parent c5647b37
......@@ -200,8 +200,6 @@ public class OrderServiceImpl implements Orderservice {
@Autowired
private AssortmentCustomerInfoManager customerInfoManager;
@Autowired
private WechatPushProcessor wechatPushProcessor;
@Autowired
private CheckOrder checkOrder;
@Autowired
private RedisCache redisCache;
......@@ -459,11 +457,11 @@ public class OrderServiceImpl implements Orderservice {
buriedPointService.BuriedPointPayment(requestDto, orderBean);
// 推荐优惠插件用户支付完成数据上报
if (message.getTotal_fee() != 0) {
orderBean.setStatus(OrderStatus.TAKE_ORDER.getCode());
wechatPushProcessor.statusOrderPay(orderBean, sessionId, message.getPaid_no(), message.getOut_trade_no()
, message.getEndTransId(), message.getPlatformMchId(), message.getTerminalId());
}
// if (message.getTotal_fee() != 0) {
// orderBean.setStatus(OrderStatus.TAKE_ORDER.getCode());
// wechatPushProcessor.statusOrderPay(orderBean, sessionId, message.getPaid_no(), message.getOut_trade_no()
// , message.getEndTransId(), message.getPlatformMchId(), message.getTerminalId());
// }
// 开通会员卡
if (StringUtils.isNotBlank(ruleId)) {
......@@ -1817,7 +1815,7 @@ public class OrderServiceImpl implements Orderservice {
createOrderResponse.setPaySuccess(true);
}
// 推荐优惠插件用户下单数据上报
wechatPushProcessor.statusOrderCreate(userLoginInfoDto, createOrderResponse.getOid(), createOrderVo.getPartnerId());
//wechatPushProcessor.statusOrderCreate(userLoginInfoDto, createOrderResponse.getOid(), createOrderVo.getPartnerId());
if (!createOrderResponse.getPaySuccess()) {
return ResponseUtil.success(createOrderResponse);
} else {
......@@ -2191,7 +2189,7 @@ public class OrderServiceImpl implements Orderservice {
}
CreateOrderResponseVo createOrderResponse = orderAdapter.convent2CreateFatherSonOrderResponseVo(orderPayResponse, productOrderBean);
// 推荐优惠插件用户下单数据上报
wechatPushProcessor.statusOrderCreate(userLoginInfoDto, createOrderResponse.getOid(), createOrderVo.getPartnerId());
//wechatPushProcessor.statusOrderCreate(userLoginInfoDto, createOrderResponse.getOid(), createOrderVo.getPartnerId());
//设置是否唤起微信支付
if (totalAmount > 0 && StringUtils.isBlank(createOrderVo.getCardCode()) && StringUtils.isBlank(createOrderVo.getFaceCode())) {
createOrderResponse.setPaySuccess(false);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment