Merge branch 'dev' into 'mp-server-test'

卡密提货订单插入异步任务

See merge request quanshu/mp-server!930

mp-service/src/main/java/com/qs/mp/user/service/impl/UserDeliverOrderServiceImpl.java

@@ -175,6 +175,15 @@ public class UserDeliverOrderServiceImpl extends ServiceImpl<UserDeliverOrderMap
 
         }
 
+        if (orderSettleVO.getPayAmt() == 0 && DeliverOrderTypeEnum.CARD.getValue().equals(orderSettleVO.getOrderType())) {
+            // 无需支付的卡密订单插入自动发货的异步任务
+            AsyncTask asyncTask = new AsyncTask();
+            asyncTask.setBizId(userDeliverOrder.getOrderId());
+            asyncTask.setType(AsyncTaskTypeEnum.CARD_ORDER_DELIVER.getValue());
+            boolean rtn = asyncTaskService.save(asyncTask);
+            Assert.isTrue(rtn, "提交卡密提货订单时，插入异步任务失败。userDeliverOrder:" + JSONObject.toJSONString(userDeliverOrder));
+        }
+
         return userDeliverOrder.getOrderId();
     }