Merge remote-tracking branch 'origin/zx_saas_goods' into zx_saas_goods

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupPaymentCalenderServiceImpl.java

@@ -1165,7 +1165,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
                 orderCreate.setOrderItemList(orderItems);
                 CommonResult<Boolean> result = mallFeignService.productOrderCreate(orderCreate);
                 if (result.getCode() != 200) {
-                    throw new BizException("同步商城订单失败",result.getMessage());
+                    throw new BizException(result.getMessage());
                 }
             }
             for (MusicGroupPaymentCalender musicGroupPaymentCalender : musicGroupPaymentCalenders) {

mec-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/impl/OmsOrderServiceImpl.java

@@ -653,7 +653,7 @@ public class OmsOrderServiceImpl implements OmsOrderService {
         // 查询订单是否已存在
         OmsOrder detail = orderMapper.getByOrderSn(order.getOrderNo());
         if (detail != null) {
-            throw new BizException("订单已存在");
+            throw new BizException("订单已存在，请勿重复提交");
         }
         UmsMember umsMember = null;
         // 学校订单和其他订单没有个人信息
@@ -713,12 +713,12 @@ public class OmsOrderServiceImpl implements OmsOrderService {
             // 获取商品信息
             PmsSkuStock pmsSkuStock = skuStockMapper.selectByPrimaryKey(orderItem.getProductSkuId());
             if (pmsSkuStock == null) {
-                throw new BizException("商品规格不存在");
+                throw new BizException("商品SKU已删除，请重新申请");
             }
             PmsProduct pmsProduct = pmsProductMapper.selectByPrimaryKey(pmsSkuStock.getProductId());
 
             if (pmsProduct == null) {
-                throw new BizException("商品不存在");
+                throw new BizException("商品货号已变更，请重新申请");
             }
 
             OmsOrderItem omsOrderItem = new OmsOrderItem();
@@ -749,14 +749,14 @@ public class OmsOrderServiceImpl implements OmsOrderService {
         pmsProductExample.createCriteria().andIdIn(productIds).andDeleteStatusEqualTo(1);
         List<PmsProduct> pmsProducts = pmsProductMapper.selectByExample(pmsProductExample);
         if (CollUtil.isNotEmpty(pmsProducts)) {
-            throw new BizException("商品已下架");
+            throw new BizException("商品已下架，请重新申请");
         }
         List<Long> skuIds = orderItemList.stream().map(OmsOrderItem::getProductSkuId).collect(Collectors.toList());
         PmsSkuStockExample pmsSkuStockExample = new PmsSkuStockExample();
         pmsSkuStockExample.createCriteria().andIdIn(skuIds).andDeleteStatusEqualTo(1);
         List<PmsSkuStock> pmsSkuStocks = skuStockMapper.selectByExample(pmsSkuStockExample);
         if (CollUtil.isNotEmpty(pmsSkuStocks)) {
-            throw new BizException("商品已下架");
+            throw new BizException("商品已下架，请重新申请");
         }
 
         // 保存数据