remove imports

order-common/src/main/java/com/poyee/constant/OrderConstant.java

@@ -5,4 +5,6 @@ public class OrderConstant {
     public static final String ORDER = "ORDER";
 
     public static final String RECYCLE = "RECYCLE";
+
+    public static final String SUB = "sub";
 }

order-web/src/main/java/com/poyee/facade/impl/OrderBaseFacade.java

@@ -1,5 +1,6 @@
 package com.poyee.facade.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
@@ -136,7 +137,10 @@ public class OrderBaseFacade implements IOrderBaseFacade {
                     return res;
                 })
                 .collect(Collectors.toList());
-        return PageInfo.of(orderBaseListResList);
+        PageInfo<OrderBaseListRes> orderBaseListResPageInfo = new PageInfo<>();
+        BeanUtil.copyProperties(orderBasePageInfo, orderBaseListResPageInfo);
+        orderBaseListResPageInfo.setList(orderBaseListResList);
+        return orderBaseListResPageInfo;
     }
 
     @Transactional
@@ -147,8 +151,8 @@ public class OrderBaseFacade implements IOrderBaseFacade {
         Assert.isTrue(Objects.equals(orderBase.getOrderStatus(), SalesOrderStatusEnum.PENDING_SHIPMENT.getCode()),
                 "only_supports_shipping_for_flash_purchase_orders");
         List<OrderItem> orderItemList = orderItemService.lambdaQuery().eq(OrderItem::getRelationTable, OrderConstant.ORDER).eq(OrderItem::getRelationNo, orderBaseSearchReq.getOrderNo()).list();
-        boolean noneMatch = orderItemList.stream().noneMatch(item -> Objects.equals(item.getItemType(), ItemTypeEnum.FLASH_SALE.getCode()));
-        Assert.isTrue(noneMatch, "only_supports_shipping_for_flash_purchase_orders");
+        boolean anyMatch = orderItemList.stream().anyMatch(item -> Objects.equals(item.getItemType(), ItemTypeEnum.FLASH_SALE.getCode()));
+        Assert.isTrue(anyMatch, "only_supports_shipping_for_flash_purchase_orders");
         List<OrderAddress> list = orderAddressService.lambdaQuery().eq(OrderAddress::getRelationNo, orderBase.getOrderNo())
                 .eq(OrderAddress::getRelationTable, OrderConstant.ORDER)
                 .eq(OrderAddress::getValid, WhetherEnum.YES.getCode()).list();
@@ -162,7 +166,7 @@ public class OrderBaseFacade implements IOrderBaseFacade {
                 .trackingNo(orderBaseSearchReq.getTrackingNo())
                 .logisticsTime(LocaleTimeZoneUtil.nowUtc())
                 .createTime(LocaleTimeZoneUtil.nowUtc())
-                .createBy(Objects.nonNull(ServletUtils.getCurrentUser()) ? ServletUtils.getCurrentUser().getString("sub") : null)
+                .createBy(Objects.nonNull(ServletUtils.getCurrentUser()) ? ServletUtils.getCurrentUser().getString(OrderConstant.SUB) : null)
                 .build();
         orderLogisticsService.save(orderLogistics);
         return this.orderBaseService.updateById(orderBase);
@@ -171,10 +175,10 @@ public class OrderBaseFacade implements IOrderBaseFacade {
     @Transactional
     @Override
     public Boolean approveAddress(OrderAddressAuditReq req) {
-        String operator = Objects.nonNull(ServletUtils.getCurrentUser()) ? ServletUtils.getCurrentUser().getString("sub") : null;
+        String operator = Objects.nonNull(ServletUtils.getCurrentUser()) ? ServletUtils.getCurrentUser().getString(OrderConstant.SUB) : null;
         LocalDateTime now = LocaleTimeZoneUtil.nowUtc();
         OrderAddress pending = orderAddressService.lambdaQuery()
-                .eq(OrderAddress::getRelationTable, req.getOrderNo())
+                .eq(OrderAddress::getRelationNo, req.getOrderNo())
                 .eq(OrderAddress::getRelationTable, OrderConstant.ORDER)
                 .eq(OrderAddress::getValid, WhetherEnum.YES.getCode())
                 .one();
@@ -206,7 +210,7 @@ public class OrderBaseFacade implements IOrderBaseFacade {
                 .eq(OrderAddress::getValid, WhetherEnum.YES.getCode())
                 .one();
         Assert.notNull(pending, "no_pending_address_modification_request");
-        String operator = Objects.nonNull(ServletUtils.getCurrentUser()) ? ServletUtils.getCurrentUser().getString("sub") : null;
+        String operator = Objects.nonNull(ServletUtils.getCurrentUser()) ? ServletUtils.getCurrentUser().getString(OrderConstant.SUB) : null;
         pending.setValid(2);//审核拒绝
         pending.setUpdateTime(LocaleTimeZoneUtil.nowUtc());
         pending.setUpdateBy(operator);

order-web/src/main/java/com/poyee/facade/impl/RecycleOrderFacade.java

@@ -1,5 +1,6 @@
 package com.poyee.facade.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -13,6 +14,7 @@ import com.poyee.enums.AddressTypeEnum;
 import com.poyee.enums.WhetherEnum;
 import com.poyee.facade.IRecycleOrderFacade;
 import com.poyee.req.RecycleListSearchReq;
+import com.poyee.res.OrderBaseListRes;
 import com.poyee.res.RecycleListRes;
 import com.poyee.service.OrderAddressService;
 import com.poyee.service.OrderItemService;
@@ -115,7 +117,10 @@ public class RecycleOrderFacade implements IRecycleOrderFacade {
                     return res;
                 })
                 .collect(Collectors.toList());
-        return PageInfo.of(resList);
+        PageInfo<RecycleListRes> recycleListResPageInfo = new PageInfo<>();
+        BeanUtil.copyProperties(pageInfo, recycleListResPageInfo);
+        recycleListResPageInfo.setList(resList);
+        return recycleListResPageInfo;
     }
 
 

order-web/src/main/resources/i18n/messages.properties

@@ -6,4 +6,5 @@ tracking_no_can_not_be_empty=\u5FEB\u9012\u5355\u53F7\u4E0D\u80FD\u4E3A\u7A7A
 order_not_found=\u8BA2\u5355\u4E0D\u5B58\u5728
 order_status_error=\u8BA2\u5355\u72B6\u6001\u9519\u8BEF
 order_with_address_modification_request_Please_approve_and_redo_the_operation=\u8BA2\u5355\u6709\u5730\u5740\u4FEE\u6539\u7533\u8BF7,\u8BF7\u5BA1\u6279\u540E\u91CD\u65B0\u64CD\u4F5C
-only_supports_shipping_for_flash_purchase_orders=\u4EC5\u652F\u6301\u5BF9\u95EA\u8D2D\u8BA2\u5355\u53D1\u8D27
+only_supports_shipping_for_flash_purchase_orders=\u4EC5\u652F\u6301\u5BF9\u95EA\u8D2D\u8BA2\u5355\u53D1\u8D27
+no_pending_address_modification_request=\u6CA1\u6709\u5F85\u5904\u7406\u5730\u5740\u4FEE\u6539\u7533\u8BF7

order-web/src/main/resources/i18n/messages_en_US.properties

@@ -6,4 +6,5 @@ tracking_no_can_not_be_empty=tracking no can not be empty
 order_not_found=order not found
 order_status_error=order status error
 order_with_address_modification_request_Please_approve_and_redo_the_operation=order with address modification request Please approve and redo the operation
-only_supports_shipping_for_flash_purchase_orders=Only supports shipping for flash purchase orders
+only_supports_shipping_for_flash_purchase_orders=Only supports shipping for flash purchase orders
+no_pending_address_modification_request=no pending address modification request

order-web/src/main/resources/i18n/messages_en_zh_TW.properties

@@ -5,4 +5,5 @@ tracking_no_can_not_be_empty=\u5FEB\u905E\u55AE\u865F\u4E0D\u80FD\u70BA\u7A7A
 order_not_found=\u8A02\u55AE\u4E0D\u5B58\u5728
 order_status_error=\u8A02\u55AE\u72C0\u614B\u932F\u8AA4
 order_with_address_modification_request_Please_approve_and_redo_the_operation=\u8A02\u55AE\u6709\u5730\u5740\u4FEE\u6539\u7533\u8ACB\uFF0C\u8ACB\u5BE9\u6279\u5F8C\u91CD\u65B0\u64CD\u4F5C\uFF0C\u8ACB\u5BE9\u6279\u5F8C\u91CD\u65B0\u64CD\u4F5C
-only_supports_shipping_for_flash_purchase_orders=\u50C5\u652F\u6301\u5C0D\u9583\u8CFC\u8A02\u55AE\u767C\u8CA8
+only_supports_shipping_for_flash_purchase_orders=\u50C5\u652F\u6301\u5C0D\u9583\u8CFC\u8A02\u55AE\u767C\u8CA8
+no_pending_address_modification_request=\u6C92\u6709\u5F85\u8655\u7406\u5730\u5740\u4FEE\u6539\u7533\u8ACB