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

Dev

See merge request quanshu/mp-server!929

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/UserDeliverOrderMgrController.java

@@ -13,6 +13,7 @@ import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.core.page.TableDataInfo;
 import com.qs.mp.common.enums.BusinessType;
 import com.qs.mp.common.enums.DeliverOrderStatusEnum;
+import com.qs.mp.common.enums.DeliverOrderTypeEnum;
 import com.qs.mp.common.enums.DeliverTypeEnum;
 import com.qs.mp.common.enums.ErrorCodeEnum;
 import com.qs.mp.common.enums.PayTypeEnum;
@@ -170,6 +171,15 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 			return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
 
+		UserDeliverOrder userDeliverOrder = userDeliverOrderService.getById(shipParam.getOrderId());
+		if (userDeliverOrder == null) {
+			return AjaxResult.error("订单不存在");
+		}
+
+		if (DeliverOrderTypeEnum.CARD.getValue().equals(userDeliverOrder.getType())) {
+			return AjaxResult.error("卡密订单不支持手动发货");
+		}
+
 		Integer deliveryType = shipParam.getDeliveryType();
 		if (null == deliveryType) {
 			deliveryType = 1;
@@ -231,6 +241,11 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 			return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
 
+		UserDeliverOrder userDeliverOrder = userDeliverOrderService.getById(shipParam.getOrderId());
+		if (DeliverOrderTypeEnum.CARD.getValue().equals(userDeliverOrder.getType())) {
+			return AjaxResult.error("卡密订单不支持修改");
+		}
+
 		Integer deliveryType = shipParam.getDeliveryType();
 		if (null == deliveryType) {
 			shipParam.setDeliveryType(1);
@@ -250,7 +265,7 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 		boolean res = userDeliverOrderService.updateShipInfo(shipParam);
 
 
-		return res ? AjaxResult.success() : AjaxResult.error("消息修改失败");
+		return res ? AjaxResult.success() : AjaxResult.error("信息修改失败");
 	}
 
 

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserDeliverOrderController.java

@@ -267,9 +267,9 @@ public class UserDeliverOrderController extends BaseApiController {
         Integer goodsType = goodsList.get(0).getType();
         // 设置订单类型
         if (GoodsTypeEnum.CARD_GOODS.getValue().equals(goodsType)) {
-            orderSettleVO.setOrderType(DeliverOrderTypeEnum.ORDINARY.getValue());
-        } else {
             orderSettleVO.setOrderType(DeliverOrderTypeEnum.CARD.getValue());
+        } else {
+            orderSettleVO.setOrderType(DeliverOrderTypeEnum.ORDINARY.getValue());
         }
 
         for (Goods goods : goodsList) {

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

@@ -352,6 +352,10 @@ public class UserDeliverOrderServiceImpl extends ServiceImpl<UserDeliverOrderMap
                 if (Objects.isNull(userDeliverOrder)) {
                     flag = false;
                     failContent = "订单不存在";
+                } else if (DeliverOrderTypeEnum.CARD.getValue().equals(userDeliverOrder.getType())) {
+                    flag = false;
+                    failContent = "卡密订单不支持批量发货";
+
                 } else {
                     if (!DeliverOrderStatusEnum.NOT_DELIVER.equals(userDeliverOrder.getStatus())
                         && !DeliverOrderStatusEnum.PART_DELIVER.equals(userDeliverOrder.getStatus())) {