自动发货

mec-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/impl/OmsOrderServiceImpl.java

@@ -331,6 +331,7 @@ public class OmsOrderServiceImpl implements OmsOrderService {
             return stockModel;
         }).collect(Collectors.toList());
         try {
+            log.info("同步商品库存:{}",modelList);
             HttpResponseResult<Boolean> booleanHttpResponseResult = webFeignService.goodsStockCountSynchronize(modelList);
             if (booleanHttpResponseResult.getCode() != 200 && !booleanHttpResponseResult.getStatus()) {
                 throw new BizException("库存同步失败");

mec-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/impl/PmsProductServiceImpl.java

@@ -20,6 +20,7 @@ import com.yonge.cooleshow.admin.service.PmsProductService;
 import com.yonge.cooleshow.mbg.dto.PmsSkuStockDto;
 import com.yonge.cooleshow.mbg.mapper.*;
 import com.yonge.cooleshow.mbg.model.*;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +40,7 @@ import java.util.stream.Collectors;
  * Created by macro on 2018/4/26.
  */
 @Service
+@Slf4j
 public class PmsProductServiceImpl implements PmsProductService {
     private static final Logger LOGGER = LoggerFactory.getLogger(PmsProductServiceImpl.class);
     @Autowired
@@ -383,6 +385,7 @@ public class PmsProductServiceImpl implements PmsProductService {
             goodsSubModel.setGoodsStatus(publishStatus == 1);
             return goodsSubModel;
         }).collect(Collectors.toList());
+        log.info("同步商品状态:{}",collect);
         HttpResponseResult<Boolean> booleanHttpResponseResult = webFeignService.goodsStatusSynchronize(collect);
         if (booleanHttpResponseResult.getCode() != 200) {
             throw new BizException("商品状态同步失败");
@@ -423,6 +426,8 @@ public class PmsProductServiceImpl implements PmsProductService {
                     stockModel.setStock(0);
                     return stockModel;
                 }).collect(Collectors.toList());
+
+                log.info("同步商品库存:{}",stockModels);
                 webFeignService.goodsStockCountSynchronize(stockModels);
             }
         }

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

@@ -693,7 +693,10 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
     // 管乐迷状态同步更新为手、自动确认收货
     private void mecReceive(String orderSn, boolean auto) {
         UserOrderPayment userOrderPayment = userOrderPaymentService.getByOrderNoAndStatusSuccess(orderSn);
-        HttpResponseResult receive = webFeignService.receive(userOrderPayment.getAdapayNo(), auto);
+        if (userOrderPayment != null ) {
+            orderSn= userOrderPayment.getAdapayNo();
+        }
+        HttpResponseResult receive = webFeignService.receive(orderSn, auto);
         if (!receive.getStatus()) {
             LOG.error("管乐迷状态同步更新为手、自动确认收货失败：{}",receive.getMsg());
         }