erp下架 逻辑

src/main/java/com/uas/platform/b2c/external/erp/commodity/service/impl/ProductDetailERPServiceImpl.java

@@ -117,7 +117,7 @@ public class ProductDetailERPServiceImpl implements ProductDetailERPService {
                             if (!CollectionUtils.isEmpty(goods)) {
                                 for (Goods good : goods) {
                                     if (Double.compare(subtractDecimal.doubleValue(), good.getReserve()) == 0) {// 差值等于此批次数量，直接下架此批次
-                                        goodsService.offShelfGoodsByProvider(good.getBatchCode());
+                                        goodsService.offShelfGoodsByProvider(good.getBatchCode(),true);
                                         break;
                                     }
 
@@ -128,7 +128,7 @@ public class ProductDetailERPServiceImpl implements ProductDetailERPService {
                                         loggerInfo.info(SystemSession.getUser().getEnterprise().getEnName() + "更新库存: " + products.get(0).getProdNum() + ",self is" + good.getSelfSale());
                                         // 如果调整后的库存小于最小起订量直接下架
                                         if (good.getReserve() < good.getMinBuyQty()) {
-                                            goodsService.offShelfGoodsByProvider(good.getBatchCode());
+                                            goodsService.offShelfGoodsByProvider(good.getBatchCode(),true);
                                         } else {
                                             goodsService.updateGoodsByERP(nowGood, good);
                                             goodsService.updateComponentTradeInfos(nowGood.getUuid());
@@ -137,7 +137,7 @@ public class ProductDetailERPServiceImpl implements ProductDetailERPService {
                                     }
 
                                     if (Double.compare(subtractDecimal.doubleValue(), good.getReserve()) > 0) {// 差值大于此批次数量，下架次批次，并继续下一批次调整
-                                        goodsService.offShelfGoodsByProvider(good.getBatchCode());
+                                        goodsService.offShelfGoodsByProvider(good.getBatchCode(),true);
                                         subtractDecimal = subtractDecimal.subtract(BigDecimal.valueOf(good.getReserve()));
                                     }
                                 }

src/main/java/com/uas/platform/b2c/prod/commodity/controller/GoodsController.java

@@ -477,7 +477,7 @@ public class GoodsController {
 	public ResultMap offShelfGoodsByProvider(String batchCodes) {
 		assert logger != null;
 		logger.log("货品管理", "下架上架商品");
-		return goodsService.offShelfGoodsByProvider(batchCodes);
+		return goodsService.offShelfGoodsByProvider(batchCodes,false);
 	}
 
     /**

src/main/java/com/uas/platform/b2c/prod/commodity/service/GoodsHistoryService.java

@@ -58,7 +58,7 @@ public interface GoodsHistoryService {
      * @param type  操作类型
      * @return goods history
      */
-    GoodsHistory converTGoodsHist(Goods goods, String type);
+    GoodsHistory converTGoodsHist(Goods goods, String type, Boolean isERP);
 
     /**
      * 获取买家需要的Goods相关信息

src/main/java/com/uas/platform/b2c/prod/commodity/service/GoodsService.java

@@ -420,7 +420,7 @@ public interface GoodsService {
      * @param batchCodes 待下架商品批次号
      * @return the result map
      */
-    ResultMap offShelfGoodsByProvider(String batchCodes);
+    ResultMap offShelfGoodsByProvider(String batchCodes,Boolean isERP);
 
     /**
      * 分页获取批次信息

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/GoodsHistoryServiceImpl.java

@@ -1,6 +1,7 @@
 package com.uas.platform.b2c.prod.commodity.service.impl;
 
 
+import com.sun.org.apache.xpath.internal.operations.Bool;
 import com.uas.platform.b2c.common.account.dao.EnterpriseDao;
 import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.core.support.SystemSession;
@@ -132,10 +133,14 @@ public class GoodsHistoryServiceImpl implements GoodsHistoryService {
 	}
 
 	@Override
-	public GoodsHistory converTGoodsHist(Goods goods, String type) {
+	public GoodsHistory converTGoodsHist(Goods goods, String type, Boolean isERP) {
 		GoodsHistory goodsHistory = new GoodsHistory(goods);
 		goodsHistory.setOperateDate(new Date());
-		goodsHistory.setOperateUU(SystemSession.getUser().getUserUU());
+		if (null != isERP && isERP == true) {
+			goodsHistory.setOperateUU(88888888L);
+		} else {
+			goodsHistory.setOperateUU(SystemSession.getUser().getUserUU());
+		}
 		goodsHistory.setOperateType(type);
 		if(GoodsHistory.OperateType.Update.getPhrase().equals(type)) {
 			goodsHistory.setMessage(compareGoodsHistory(goodsHistory));

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/GoodsServiceImpl.java

@@ -1,6 +1,7 @@
 package com.uas.platform.b2c.prod.commodity.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.sun.org.apache.xpath.internal.operations.Bool;
 import com.uas.api.b2c_erp.core.model.OperateErrorStatus;
 import com.uas.api.b2c_erp.seller.model.GoodsFUas;
 import com.uas.api.b2c_erp.seller.model.GoodsSimpleUas;
@@ -2380,7 +2381,7 @@ public class GoodsServiceImpl implements GoodsService {
     }
 
 	@Override
-	public ResultMap offShelfGoodsByProvider(String batchCodes) {
+	public ResultMap offShelfGoodsByProvider(String batchCodes, Boolean isERP) {
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		logger.info(String.format("%s 商城测试下架时间记录1", dateFormat.format(new Date())));
 		if (StringUtils.isEmpty(batchCodes)) {
@@ -2397,7 +2398,7 @@ public class GoodsServiceImpl implements GoodsService {
         logger.info(String.format("%s 商城测试下架时间记录2", dateFormat.format(new Date())));
         for (String batchCode : batchCodeArr) {
             logger.info(String.format("%s 商城测试下架时间记录 调用下架方法开始", dateFormat.format(new Date())));
-            ResultMap resultMap = offShelfOneGoodsByProvider(batchCode);
+            ResultMap resultMap = offShelfOneGoodsByProvider(batchCode,isERP);
             logger.info(String.format("%s 商城测试下架时间记录  调用下架方法结束", dateFormat.format(new Date())));
             if (resultMap.isSuccess()) {
                 Goods goods = (Goods) resultMap.getData();
@@ -2436,7 +2437,7 @@ public class GoodsServiceImpl implements GoodsService {
      * @param batchCode 商品批次号
      */
     @Transactional
-    public ResultMap offShelfOneGoodsByProvider(String batchCode) {
+    public ResultMap offShelfOneGoodsByProvider(String batchCode, Boolean isERP) {
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         logger.info(String.format("%s 商城测试下架时间记录 进入下架方法", dateFormat.format(new Date())));
         if (StringUtils.isEmpty(batchCode)) {
@@ -2465,7 +2466,7 @@ public class GoodsServiceImpl implements GoodsService {
 
         logger.info(String.format("%s 商城测试下架时间记录 转历史库存 开始", dateFormat.format(new Date())));
         GoodsHistory goodsHist = goodsHistoryService.converTGoodsHist(goods,
-                GoodsHistory.OperateType.Down.getPhrase());
+                GoodsHistory.OperateType.Down.getPhrase(), isERP);
         logger.info(String.format("%s 商城测试下架时间记录 转历史库存 结束", dateFormat.format(new Date())));
         goodsHist.setMessage(goodsHist.getMessage() + "该批次下架");
         goodsHistoryService.save(goodsHist);