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

提货订单校验商品数量不能小于等于0

See merge request quanshu/mp-server!978

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

@@ -107,6 +107,11 @@ public class UserDeliverOrderServiceImpl extends ServiceImpl<UserDeliverOrderMap
         userDeliverOrder.setFreightAmt(orderSettleVO.getFreightAmt());
         userDeliverOrder.setAppId(orderSettleVO.getAppId());
         userDeliverOrder.setMemo(memo);
+
+        if (userDeliverOrder.getOrderNum() <= 0) {
+            throw new ServiceException("订单商品数量不能为0");
+        }
+
         if (orderSettleVO.getPayAmt() > 0) {
             userDeliverOrder.setStatus(DeliverOrderStatusEnum.NOT_PAY);
         } else {