Merge remote-tracking branch 'origin/tea/dev' into tea/dev

crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java

@@ -1101,7 +1101,8 @@ public class OrderServiceImpl implements OrderService {
         storeOrder.setCreateTime(DateUtil.nowDateTime());
         storeOrder.setShippingType(request.getShippingType());
         storeOrder.setIsChannel(isChannel);
-        storeOrder.setPaid(false);
+        //storeOrder.setPaid(false);
+        storeOrder.setPaid(true);
         storeOrder.setCost(BigDecimal.ZERO);
         storeOrder.setType(0);
         if (orderInfoVo.getIsVideo()) {
@@ -1186,7 +1187,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());