Compare commits

..

No commits in common. '2a517f3f0185924247147e95ba6534eb64ef65a9' and '47d5de74e1ef290eef98fe45b234aff86fe310d9' have entirely different histories.

@ -1101,8 +1101,7 @@ public class OrderServiceImpl implements OrderService {
storeOrder.setCreateTime(DateUtil.nowDateTime()); storeOrder.setCreateTime(DateUtil.nowDateTime());
storeOrder.setShippingType(request.getShippingType()); storeOrder.setShippingType(request.getShippingType());
storeOrder.setIsChannel(isChannel); storeOrder.setIsChannel(isChannel);
//storeOrder.setPaid(false); storeOrder.setPaid(false);
storeOrder.setPaid(true);
storeOrder.setCost(BigDecimal.ZERO); storeOrder.setCost(BigDecimal.ZERO);
storeOrder.setType(0); storeOrder.setType(0);
if (orderInfoVo.getIsVideo()) { if (orderInfoVo.getIsVideo()) {
@ -1187,7 +1186,7 @@ public class OrderServiceImpl implements OrderService {
} }
// 加入自动未支付自动取消队列 // 加入自动未支付自动取消队列
//redisUtil.lPush(Constants.ORDER_AUTO_CANCEL_KEY, storeOrder.getOrderId()); redisUtil.lPush(Constants.ORDER_AUTO_CANCEL_KEY, storeOrder.getOrderId());
// 发送后台管理员下单提醒通知短信 // 发送后台管理员下单提醒通知短信
sendAdminOrderNotice(storeOrder.getOrderId()); sendAdminOrderNotice(storeOrder.getOrderId());

Loading…
Cancel
Save