优化代码

cooleshow-mall/mall-mbg/src/main/java/com/yonge/cooleshow/mbg/model/OmsOrder.java

@@ -55,7 +55,7 @@ public class OmsOrder implements Serializable {
     @ApiModelProperty(value = "订单来源：0->PC订单；1->app订单")
     private Integer sourceType;
 
-    @ApiModelProperty(value = "订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单")
+    @ApiModelProperty(value = "订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单 6 ->未拉起支付")
     private Integer status;
 
     @ApiModelProperty(value = "订单类型：0->正常订单；1->秒杀订单")

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

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