Merge branch 'dev_kuaidi_20221026'

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -531,8 +531,8 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         // if (!member.getId().equals(order.getMemberId())) {
         //     Asserts.fail("不能确认他人订单！");
         // }
-        if (order.getStatus() != 2) {
-            Asserts.fail("该订单还未发货！");
+        if (order.getStatus() == 0) {
+            Asserts.fail("该订单还未付款！");
         }else if (order.getStatus() == 3) {
             Asserts.fail("已确认收货！");
         }