Merge branch 'test6.9.12' of git.yoho.cn:ufo/yohoufo-fore into test6.9.12

@@ -135,19 +135,6 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService {
         //是否直接鉴定通过
         boolean isDirectPass = false;
 
-        // 极速 不管是寄存还是发货 都需要通知卖家发货
-        if (fastDeliveryProxyService.isFastDeliveryGoods(orderInfo.getSkup())){
-
-            String wayBillCode = fastDeliveryProxyService.getVRWaybillCode(orderInfo.getOrderCode());
-            // 同时生成物流单号，通知第三方发货
-            fastDeliveryProxyService.order(orderInfo.getSkup(), wayBillCode);
-
-            // 卖家自动发货
-            executors.submit(()->{
-                expressInfoService.deliverToDepot(orderInfo.getSellerUid(), 0, orderInfo.getOrderCode(), wayBillCode, DepotType.NJ.getCode());
-            });
-        }
-
         //门店订单支付后直接完成
         if (BuyerOrderUtils.isOffline(orderInfo)) {
             targetOrderStatus = OrderStatus.DONE;
@@ -187,6 +174,19 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService {
             }
         }
         orderInfo.setStatus(orderStatusCode);
+
+        // 极速 不管是寄存还是发货 都需要通知卖家发货
+        if (fastDeliveryProxyService.isFastDeliveryGoods(orderInfo.getSkup())){
+
+            String wayBillCode = fastDeliveryProxyService.getVRWaybillCode(orderInfo.getOrderCode());
+            // 同时生成物流单号，通知第三方发货
+            fastDeliveryProxyService.order(orderInfo.getSkup(), wayBillCode);
+
+            // 卖家自动发货
+            executors.submit(()->{
+                expressInfoService.deliverToDepot(orderInfo.getSellerUid(), 0, orderInfo.getOrderCode(), wayBillCode, DepotType.NJ.getCode());
+            });
+        }
         return result;
     }
 

@@ -33,6 +33,7 @@ import com.yohoufo.order.service.impl.PaymentServiceImpl;
 import com.yohoufo.order.service.seller.setting.SellerService;
 import com.yohoufo.order.service.seller.setting.SellerWrapper;
 import com.yohoufo.order.service.impl.TradeBillsService;
+import com.yohoufo.order.utils.SellerHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -861,7 +862,7 @@ public class MerchantOrderPaymentService extends AbstractOrderPaymentService {
 	private boolean isSuperWithoutLock(int uid){
 		SellerWrapper sellerWrapper = sellerService.getBaseSellerWrapper(uid);
 		SellerBo sellerBo = sellerWrapper.buildSellerBo();
-		return sellerBo.isNormalSuper() || sellerBo.isLargeSettlementSuper();
+		return SellerHelper.isSuper(sellerBo.getEntrySellerType());
 	}
 
 	private static class CalculateNode{

@@ -2017,9 +2017,9 @@ public class ProductServiceImpl implements ProductService {
             Map<String, List<GoodsBO>> tabs = new HashMap<>();
             tabs.put("goods_list", Arrays.asList(goodsBO));
             tabs.put("pre_sale_goods_list", Arrays.asList(preSaleGoodsBO));
-            tabs.put("seconds_goods_list", Arrays.asList(goodsBO));
+            tabs.put("seconds_goods_list", Arrays.asList(secondsGoodsBO));
             product_info.setGoodsListTabs(tabs);
-            product_info.setGoodsList(null);
+            allGoodsBO.setSizeList(allSizeList);
         }
     }
 
@@ -2124,9 +2124,9 @@ public class ProductServiceImpl implements ProductService {
         }
         return sp2;
     }
-    private boolean notAllNull(Object... obj) {
-        for (Object o : obj) {
-            if (o != null) {
+    private boolean notAllNull(Integer... numbers) {
+        for (Integer n : numbers) {
+            if (n != null && n > 0) {
                 return true;
             }
         }