no message

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/enums/TakeGoodsTypeEnum.java

@@ -11,7 +11,7 @@ import lombok.RequiredArgsConstructor;
 @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
 public enum TakeGoodsTypeEnum implements BaseEnum {
     Z("0","自提"),
-    Y("1","邮寄"),
+    Y("1","商家配送"),
     ;
 
     @EnumValue

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/OrderLogic.java

@@ -172,7 +172,6 @@ public class OrderLogic {
             throw new RemoteServiceException(1100, "请选择提货方式");
         }
         if (StringUtils.isBlank(orderBuyBean.getUserAddressId())
-                && (orderBuyBean.getPayTypeId().equals(PayTypeEnum.ONLINE.getKey()) || orderBuyBean.getPayTypeId().equals(PayTypeEnum.CREDIT.getKey()))
                 && orderBuyBean.getTakeGoodsType().equals(TakeGoodsTypeEnum.Y.getKey())) {
             throw new RemoteServiceException(1100, "请选择收货地址");
         }
@@ -233,7 +232,6 @@ public class OrderLogic {
         // 收货地址
         UserAddress userAddress = null;
         if (StringUtils.isNotBlank(orderBuyBean.getUserAddressId())
-                && (orderBuyBean.getPayTypeId().equals(PayTypeEnum.ONLINE.getKey()) || orderBuyBean.getPayTypeId().equals(PayTypeEnum.CREDIT.getKey()))
                 && orderBuyBean.getTakeGoodsType().equals(TakeGoodsTypeEnum.Y.getKey())) {
             userAddress = userAddressService.getById(orderBuyBean.getUserAddressId());
         }