Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

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/facade/impl/ProductStandardPutOnInfoFacadeImpl.java

@@ -164,7 +164,7 @@ public class ProductStandardPutOnInfoFacadeImpl implements ProductStandardPutOnI
 		}
 
         //保存库存的历史
-        GoodsHistory history = goodsHistoryService.converTGoodsHist(goods, GoodsHistory.OperateType.STANDARD_MODIFY.getPhrase());
+        GoodsHistory history = goodsHistoryService.converTGoodsHist(goods, GoodsHistory.OperateType.STANDARD_MODIFY.getPhrase(),false);
         goodsHistoryService.save(history);
 
 

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

@@ -132,10 +132,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

@@ -491,7 +491,7 @@ public class GoodsServiceImpl implements GoodsService {
 		}
 		goodsDao.modifyReserve(goods.getBatchCode(), goods.getUuid(), goods.getReserve(), goods.getStatus().intValue());
 		// 每次批次保存同时保存一遍历史信息
-		GoodsHistory goodsHistory = goodsHistoryService.converTGoodsHist(goods, GoodsHistory.OperateType.DeductReserve.getPhrase());
+		GoodsHistory goodsHistory = goodsHistoryService.converTGoodsHist(goods, GoodsHistory.OperateType.DeductReserve.getPhrase(),false);
 		goodsHistoryService.save(goodsHistory);
 		// 更新器件属性的库存
 		updateComponentTradeInfos(goods.getUuid());
@@ -529,7 +529,7 @@ public class GoodsServiceImpl implements GoodsService {
 
             goodsDao.modifyReserve(goods.getBatchCode(), goods.getUuid(), goods.getReserve(), goods.getStatus().intValue());
             // 每次批次保存同时保存一遍历史信息
-            GoodsHistory goodsHistory = goodsHistoryService.converTGoodsHist(goods, GoodsHistory.OperateType.ReleaseReserve.getPhrase());
+            GoodsHistory goodsHistory = goodsHistoryService.converTGoodsHist(goods, GoodsHistory.OperateType.ReleaseReserve.getPhrase(),false);
             goodsHistoryService.save(goodsHistory);
             // 更新器件属性的库存
             updateComponentTradeInfos(goods.getUuid());
@@ -715,7 +715,7 @@ public class GoodsServiceImpl implements GoodsService {
             return null;
         }
 //		updateGoodTransactional(goods);
-        GoodsHistory goodsHistory = goodsHistoryService.converTGoodsHist(goods, GoodsHistory.OperateType.Publish.getPhrase());
+        GoodsHistory goodsHistory = goodsHistoryService.converTGoodsHist(goods, GoodsHistory.OperateType.Publish.getPhrase(),false);
         //仅保存商品信息，不上架
         if (goods.getId() == null || goods.getSold() == null) {
             goods.setSold(IntegerConstant.NO_INT);
@@ -779,7 +779,7 @@ public class GoodsServiceImpl implements GoodsService {
             if (resultMap.getCode() != CodeType.OK.code()) {
                 continue;
             }
-            GoodsHistory g = goodsHistoryService.converTGoodsHist(goods, GoodsHistory.OperateType.Publish.getPhrase());
+            GoodsHistory g = goodsHistoryService.converTGoodsHist(goods, GoodsHistory.OperateType.Publish.getPhrase(),false);
             goodsHistorys.add(g);
             list.add(goods);
             if (goods.getUuid() != null) {
@@ -812,7 +812,7 @@ public class GoodsServiceImpl implements GoodsService {
             if (resultMap.getCode() != CodeType.OK.code()) {
                 continue;
             }
-            GoodsHistory g = goodsHistoryService.converTGoodsHist(goods, GoodsHistory.OperateType.Publish.getPhrase());
+            GoodsHistory g = goodsHistoryService.converTGoodsHist(goods, GoodsHistory.OperateType.Publish.getPhrase(),false);
             goodsHistorys.add(g);
             list.add(goods);
             if (goods.getUuid() != null) {
@@ -1379,7 +1379,7 @@ public class GoodsServiceImpl implements GoodsService {
                 return resultMap;
             }
             //	updateGoodTransactional(goods);
-            GoodsHistory goodsHistory = goodsHistoryService.converTGoodsHist(goods, OperateType.Publish.getPhrase());
+            GoodsHistory goodsHistory = goodsHistoryService.converTGoodsHist(goods, OperateType.Publish.getPhrase(),false);
             Goods persistGoods = goodsDao.save(goods);
             goodsHistoryDao.save(goodsHistory);
             // TODO huxz 添加或修改商品价格信息
@@ -1440,7 +1440,7 @@ public class GoodsServiceImpl implements GoodsService {
         }
         goods.setStatus(Status.NO_SHELVE.value());
         //	updateGoodTransactional(goods);
-        GoodsHistory goodsHistory = goodsHistoryService.converTGoodsHist(goods, OperateType.ADD_GOODS.getPhrase());
+        GoodsHistory goodsHistory = goodsHistoryService.converTGoodsHist(goods, OperateType.ADD_GOODS.getPhrase(),false);
         Goods persistGoods = goodsDao.save(goods);
         if(product != null) {
             ProductPrivate productPrivate = releaseProductByBatchService.findByPrId(product.getId());
@@ -1554,7 +1554,7 @@ public class GoodsServiceImpl implements GoodsService {
                 goodsHistoryService
                         .converTGoodsHist
                                 (nowGoods,
-                                        OperateType.Update.getPhrase());
+                                        OperateType.Update.getPhrase(),false);
         List<Order> orders = detailService.updateOrderDetailsByGoods(nowGoods);
         //更新购物车信息
         List<Cart> cartList = cartService.updateCartByGoods(nowGoods);
@@ -1660,7 +1660,7 @@ public class GoodsServiceImpl implements GoodsService {
                 goodsHistoryService
                         .converTGoodsHist
                                 (nowGoods,
-                                        OperateType.Update.getPhrase());
+                                        OperateType.Update.getPhrase(),true);
         List<Order> orders = detailService.updateOrderDetailsByGoods(nowGoods);
         //更新购物车信息
         List<Cart> cartList = cartService.updateCartByGoods(nowGoods);
@@ -1752,7 +1752,7 @@ public class GoodsServiceImpl implements GoodsService {
                     goodsDao.deleteByBatchCode(batchCode);
 
                     GoodsHistory goodsHist = goodsHistoryService.converTGoodsHist(goods,
-                            GoodsHistory.OperateType.Down.getPhrase());
+                            GoodsHistory.OperateType.Down.getPhrase(),false);
                     goodsHist.setMessage(goodsHist.getMessage() + "该批次下架");
                     goodsHistoryService.save(goodsHist);
                     uuids.add(goods.getUuid());
@@ -1938,7 +1938,7 @@ public class GoodsServiceImpl implements GoodsService {
         } else {
             goods.setStatus(Status.UNAVAILABLE.value());
         }
-        GoodsHistory converTGoodsHist = goodsHistoryService.converTGoodsHist(goods, OperateType.Update.getPhrase());
+        GoodsHistory converTGoodsHist = goodsHistoryService.converTGoodsHist(goods, OperateType.Update.getPhrase(),true);
         goodsHistoryService.save(converTGoodsHist);
         Goods good = goodsDao.save(goods);
         if (good == null) {
@@ -1961,7 +1961,7 @@ public class GoodsServiceImpl implements GoodsService {
                 goods.setStatus(Status.UNAVAILABLE.value());
             }
             // 每次批次保存同时保存一遍历史信息
-            GoodsHistory goodsHist = goodsHistoryService.converTGoodsHist(goods, OperateType.OrderPaied.getPhrase());
+            GoodsHistory goodsHist = goodsHistoryService.converTGoodsHist(goods, OperateType.OrderPaied.getPhrase(),true);
             goodsHist.setMessage(goodsHist.getMessage() + "接口变更库存之后，扣除意向采购单 和正式采购单的购买数量");
             goodsHistoryService.save(goodsHist);
             good = goodsDao.save(goods);
@@ -2127,7 +2127,7 @@ public class GoodsServiceImpl implements GoodsService {
 
                 } else {
                     goods.setStatus(Status.REMOVED.value());
-                    GoodsHistory goodsHist = goodsHistoryService.converTGoodsHist(goods, OperateType.Down.getPhrase());
+                    GoodsHistory goodsHist = goodsHistoryService.converTGoodsHist(goods, OperateType.Down.getPhrase(),false);
                     goodsHist.setMessage(goodsHist.getMessage() + "该批次产品下架(UAS接口)");
                     goodsHistoryService.save(goodsHist);
                     goodsDao.delete(goods);
@@ -2380,7 +2380,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 +2397,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 +2436,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 +2465,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);
@@ -2856,7 +2856,7 @@ public class GoodsServiceImpl implements GoodsService {
         for (Goods goods : goodsList) {
             goods.setStatus(Status.REMOVED.value());
 
-            GoodsHistory goodsHistory = goodsHistoryService.converTGoodsHist(goods, "批量下架公司产品");
+            GoodsHistory goodsHistory = goodsHistoryService.converTGoodsHist(goods, "批量下架公司产品",false);
             goodsHistory.setMessage(goodsHistory.getMessage() + "该批次下架");
             goodsHistoryService.save(goodsHistory);
             histories.add(goodsHistory);
@@ -2899,13 +2899,13 @@ public class GoodsServiceImpl implements GoodsService {
             if (goods.getStatus().equals(Status.AVAILABLE.value()) || goods.getStatus().equals(Status.UNAVAILABLE.value())) {
                 //先做下架记录
                 goods.setStatus(Status.REMOVED.value());
-                GoodsHistory goodsHistoryRemoved = goodsHistoryService.converTGoodsHist(goods, OperateType.Down.getPhrase());
+                GoodsHistory goodsHistoryRemoved = goodsHistoryService.converTGoodsHist(goods, OperateType.Down.getPhrase(),false);
                 histories.add(goodsHistoryRemoved);
             }
 
             goods.setStatus(Status.GOODS_DELETE.value());
             //删除库存信息
-            GoodsHistory goodsHistoryDelete = goodsHistoryService.converTGoodsHist(goods, OperateType.DELETE.getPhrase());
+            GoodsHistory goodsHistoryDelete = goodsHistoryService.converTGoodsHist(goods, OperateType.DELETE.getPhrase(),false);
             histories.add(goodsHistoryDelete);
             goodsHistoryService.save(histories);
 
@@ -2984,7 +2984,7 @@ public class GoodsServiceImpl implements GoodsService {
             }
             goods.setStatus(Status.REMOVED.value());
 
-            GoodsHistory goodsHistory = goodsHistoryService.converTGoodsHist(goods, "批量下架公司产品");
+            GoodsHistory goodsHistory = goodsHistoryService.converTGoodsHist(goods, "批量下架公司产品",false);
             goodsHistory.setMessage(goodsHistory.getMessage() + "该批次下架");
             goodsHistoryService.save(goodsHistory);
             histories.add(goodsHistory);
@@ -3102,7 +3102,7 @@ public class GoodsServiceImpl implements GoodsService {
             goods.setStatus(Status.AVAILABLE.value());
         }
         GoodsHistory goodsHist = goodsHistoryService.converTGoodsHist(goods,
-                GoodsHistory.OperateType.Publish.getPhrase());
+                GoodsHistory.OperateType.Publish.getPhrase(),false);
         goodsHist.setMessage(goodsHist.getMessage() + "该批次上架");
         goodsHistoryService.save(goodsHist);
         Product product = productDao.findOne(id);
@@ -3191,13 +3191,13 @@ public class GoodsServiceImpl implements GoodsService {
         if (goods.getStatus().equals(Status.AVAILABLE.value()) || goods.getStatus().equals(Status.UNAVAILABLE.value())) {
             //先做下架记录
             goods.setStatus(Status.REMOVED.value());
-            GoodsHistory goodsHistoryRemoved = goodsHistoryService.converTGoodsHist(goods, OperateType.Down.getPhrase());
+            GoodsHistory goodsHistoryRemoved = goodsHistoryService.converTGoodsHist(goods, OperateType.Down.getPhrase(),false);
             histories.add(goodsHistoryRemoved);
         }
 
         goods.setStatus(Status.GOODS_DELETE.value());
         //删除库存信息
-        GoodsHistory goodsHistoryDelete = goodsHistoryService.converTGoodsHist(goods, OperateType.DELETE.getPhrase());
+        GoodsHistory goodsHistoryDelete = goodsHistoryService.converTGoodsHist(goods, OperateType.DELETE.getPhrase(),false);
         histories.add(goodsHistoryDelete);
         goodsHistoryService.save(histories);
 
@@ -3272,12 +3272,12 @@ public class GoodsServiceImpl implements GoodsService {
 
             if (goods.getStatus().equals(Status.AVAILABLE.value()) || goods.getStatus().equals(Status.UNAVAILABLE.value())) {
                 goods.setStatus(Status.REMOVED.value());
-                GoodsHistory goodsHistoryRemoved = goodsHistoryService.converTGoodsHist(goods, OperateType.Down.getPhrase());
+                GoodsHistory goodsHistoryRemoved = goodsHistoryService.converTGoodsHist(goods, OperateType.Down.getPhrase(),false);
                 histories.add(goodsHistoryRemoved);
             }
             //删除库存信息
             goods.setStatus(Status.GOODS_DELETE.value());
-            GoodsHistory goodsHistoryDelete = goodsHistoryService.converTGoodsHist(goods, OperateType.DELETE.getPhrase());
+            GoodsHistory goodsHistoryDelete = goodsHistoryService.converTGoodsHist(goods, OperateType.DELETE.getPhrase(),false);
             histories.add(goodsHistoryDelete);
             goodses1.add(goods);
             gids.add(goods.getId());
@@ -3515,7 +3515,7 @@ public class GoodsServiceImpl implements GoodsService {
                 }
                 if (isModify) {
                     goods.setQtyPrice(FastjsonUtils.toJson(list));
-                    GoodsHistory goodsHistory = goodsHistoryService.converTGoodsHist(goods, OperateType.MODIFY_PRICE.getPhrase());
+                    GoodsHistory goodsHistory = goodsHistoryService.converTGoodsHist(goods, OperateType.MODIFY_PRICE.getPhrase(),false);
                     histories.add(goodsHistory);
                     goodses.add(goods);
                 }

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

@@ -778,7 +778,7 @@ public class ProductServiceImpl implements ProductService {
                 }else {
                     goods.setStatus(Status.AVAILABLE.value());
                 }
-                GoodsHistory goodsHistory = goodsHistoryService.converTGoodsHist(goods, GoodsHistory.OperateType.Modifying.getPhrase());
+                GoodsHistory goodsHistory = goodsHistoryService.converTGoodsHist(goods, GoodsHistory.OperateType.Modifying.getPhrase(),false);
                 goodsHistoryDao.save(goodsHistory);
                 goodsDao.save(goods);
 
@@ -1069,7 +1069,7 @@ public class ProductServiceImpl implements ProductService {
         for (Long id : idArray) {
             Goods goods = goodsDao.findOne(id);
             goodsHist = goodsHistoryService.converTGoodsHist(goods,
-                    GoodsHistory.OperateType.DELETE_FOR_REPEAT.getPhrase());
+                    GoodsHistory.OperateType.DELETE_FOR_REPEAT.getPhrase(),false);
             goodsHist.setMessage(goodsHist.getMessage() + "匹配后因为重复删除");
             goodsHistoryList.add(goodsHist);
             goodsDao.delete(id);
@@ -1135,7 +1135,7 @@ public class ProductServiceImpl implements ProductService {
             for (Goods goods : goodsList) {
                 updateGoodsInfo(goods, product);
                 GoodsHistory goodsHist = goodsHistoryService.converTGoodsHist(goods,
-                        GoodsHistory.OperateType.Modifying.getPhrase());
+                        GoodsHistory.OperateType.Modifying.getPhrase(),false);
                 //更新购物车信息
                 List<Cart> cartList = cartDao.findCartByBatch(goods.getBatchCode());
                 updateCartsInfo(goods, cartList);

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

@@ -128,7 +128,7 @@ public class ProductStandardPutOnInfoServiceImpl implements ProductStandardPutOn
                         goodsPrices.get(goodsPrices.size() - 1).setEnd(goods.getReserve());
                         goods.setQtyPrice(FastjsonUtils.toJson(goodsPrices));
                     }
-                    GoodsHistory history = goodsHistoryService.converTGoodsHist(goods, GoodsHistory.OperateType.AddReserve.getPhrase());
+                    GoodsHistory history = goodsHistoryService.converTGoodsHist(goods, GoodsHistory.OperateType.AddReserve.getPhrase(),false);
                     listHist.add(history);
                     list.add(goods);
                     uuids.add(goods.getUuid());

src/main/java/com/uas/platform/b2c/trade/seek/controller/SeekPurchaseBomController.java

@@ -49,6 +49,9 @@ public class SeekPurchaseBomController {
     @Value("#{sys.inquiryServiceUrl}")
     private String inquiryServiceUrl;
 
+    @Value("#{sys.inquiryServiceInnerUrl}")
+    private String inquiryServiceInnerUrl;
+
     /**
      * 日志
      */
@@ -110,7 +113,7 @@ public class SeekPurchaseBomController {
     public ResultMap confirmBom(Long bomId) {
         logger.log("求购", "确认发布bom求购，bomId:" + bomId);
         User user = SystemSession.getUser();
-        return seekPurchaseBomService.confirmBom(bomId, user, inquiryServiceUrl);
+        return seekPurchaseBomService.confirmBom(bomId, user, inquiryServiceInnerUrl);
     }
 
     /**

src/main/java/com/uas/platform/b2c/trade/seek/service/impl/SeekPurchaseBomServiceImpl.java

@@ -2,6 +2,7 @@ package com.uas.platform.b2c.trade.seek.service.impl;
 
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.search.service.SearcherService;
+import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.utils.StringUtilB2C;
 import com.uas.platform.b2c.prod.commodity.dao.GoodsDao;
 import com.uas.platform.b2c.prod.commodity.model.Goods;
@@ -24,6 +25,7 @@ import com.uas.platform.b2c.trade.seek.utils.DateUtils;
 import com.uas.platform.b2c.trade.support.CodeType;
 import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.exception.IllegalOperatorException;
+import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.platform.core.util.HttpUtil;
@@ -107,6 +109,8 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
     @Autowired
     private SearcherService searcherService;
 
+    private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+
     private int mallColNum = 8;
     private int mallRowNum = 500;
 
@@ -510,7 +514,10 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
         String res = "";
         try {
             res = HttpUtil.doPost(url + "/inquiry/buyer/save",  FlexJsonUtils.toJsonDeep(inquiry));
+            logger.log("bom求购确认发布成功",user.getUserUU() + ",参数:" + FlexJsonUtils.toJsonDeep(inquiry));
         } catch (Exception e) {
+            logger.log("bom求购确认发布报错",user.getUserUU() + ",错误:" + e.getMessage() + "参数:" + FlexJsonUtils.toJsonDeep(inquiry));
+            e.printStackTrace();
             throw new IllegalOperatorException("发布失败");
         }
         // 删除bom的临时数据

src/main/resources/dev/sys.properties

@@ -46,4 +46,5 @@ productServiceIp=http://192.168.253.12:24000
 kafka-bootstrap-servers=10.10.100.11:9292,10.10.100.12:9292,10.10.100.13:9292,10.10.100.14:9292,10.10.100.15:9292,10.10.100.16:9292
 
 #inquiry service url
-inquiryServiceUrl=http://218.17.158.219:24000
+inquiryServiceUrl=http://218.17.158.219:24000
+inquiryServiceInnerUrl=http://218.17.158.219:24000

src/main/resources/prod/sys.properties

@@ -48,4 +48,5 @@ productServiceIp=http://10.10.0.197:8080
 kafka-bootstrap-servers=10.10.100.11:9292,10.10.100.12:9292,10.10.100.13:9292,10.10.100.14:9292,10.10.100.15:9292,10.10.100.16:9292
 
 #inquiry service url
-inquiryServiceUrl=https://api-inquiry.usoftmall.com
+inquiryServiceUrl=https://api-inquiry.usoftmall.com
+inquiryServiceInnerUrl=http://10.10.0.254:8080

src/main/resources/test/sys.properties

@@ -47,4 +47,5 @@ productServiceIp=http://192.168.253.12:24000
 kafka-bootstrap-servers=10.10.100.11:9292,10.10.100.12:9292,10.10.100.13:9292,10.10.100.14:9292,10.10.100.15:9292,10.10.100.16:9292
 
 #inquiry service url
-inquiryServiceUrl=http://218.17.158.219:24000
+inquiryServiceUrl=http://218.17.158.219:24000
+inquiryServiceInnerUrl=http://218.17.158.219:24000

src/main/webapp/resources/js/usercenter/controllers/forstore/query_logistics_ctrl.js

@@ -8,6 +8,13 @@ define(['app/app', 'calendar'], function(app) {
         // 加密过滤器
         var enIdFilter = $filter('EncryptionFilter');
 
+        //配送方式列表
+        $scope.deliveryMethod = {
+            1301 : '第三方配送',
+            1302 : '卖家配送',
+            1303 : '上门自提'
+        };
+
         /**
          *  查询物流信息(接口需要真实运单号)
          *
@@ -27,7 +34,11 @@ define(['app/app', 'calendar'], function(app) {
                 }
                 $scope.order = data[0];
                 $scope.address = JSON.parse($scope.order.jsonAddress);
-                console.log("$scope.order", $scope.order);
+                if (!data[0].lgtId) {
+                    getOrderStatus($scope.order.status);
+                    $scope.logisticsInfo = [];
+                    return;
+                }
                 Logistics.findLogisticsById({lgtid: data[0].lgtId}, function(data){
                     $scope.logistics = data;
                     var params = {};
@@ -52,6 +63,15 @@ define(['app/app', 'calendar'], function(app) {
         }
 
         $scope.status = "tobereceiving";
+
+        var getOrderStatus = function (status) {
+            // 520-405,成功的订单
+            var success = '520-405';
+            if (success.indexOf(status) != -1) {
+                $scope.status = "signin";
+            }
+        };
+
         // 判断物流信息状态
         var statusOfLogistics = function(str) {
             if(str.indexOf("揽件")!=-1 || str.indexOf("收件")!=-1 || str.indexOf("转运")!=-1||str.indexOf("运输")!=-1||str.indexOf("发往")!=-1||

src/main/webapp/resources/js/vendor/controllers/forstore/query_logistics_ctrl.js

@@ -8,6 +8,13 @@ define(['app/app', 'calendar'], function(app) {
         // 加密过滤器
         var enIdFilter = $filter('EncryptionFilter');
 
+        //配送方式列表
+        $scope.deliveryMethod = {
+            1301 : '第三方配送',
+            1302 : '卖家配送',
+            1303 : '上门自提'
+        };
+
         /**
          *  查询物流信息(由于接口需要真实运单号)
          *
@@ -26,6 +33,11 @@ define(['app/app', 'calendar'], function(app) {
                 }else {
                     $scope.purchase = data.data;
                     $scope.address = JSON.parse($scope.purchase.jsonAddress);
+                    if (!data.data.lgtId) {
+                        getPurchaseStatus($scope.purchase.status);
+                        $scope.logisticsInfo = [];
+                        return;
+                    }
                     Logistics.findLogisticsById({lgtid: data.data.lgtId}, function(data){
                         $scope.logistics = data;
                         var params = {};
@@ -52,6 +64,14 @@ define(['app/app', 'calendar'], function(app) {
         }
 
         $scope.status = "tobereceiving";
+
+        var getPurchaseStatus = function (status) {
+            // 405-503-514-506-511-520,成功的订单
+            var success = '405-503-514-506-511-520';
+            if (success.indexOf(status) != -1) {
+                $scope.status = "signin";
+            }
+        };
         // 判断物流信息状态
         var statusOfLogistics = function(str) {
             if(str.indexOf("揽件")!=-1 || str.indexOf("收件")!=-1 || str.indexOf("转运")!=-1||str.indexOf("运输")!=-1||str.indexOf("发往")!=-1||

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_account_management_ctrl.js

@@ -242,7 +242,7 @@ define(['app/app'], function(app) {
            * 验证企业信息
            */
           function validateEnterpriseInfo() {
-            var props = ['enName', 'enShortname', 'enAddress', 'enUrl'];
+            var props = ['enName', 'enAddress', 'enUrl'];
 
             var flag = true;
             angular.forEach(props, function (prop) {

src/main/webapp/resources/view/common/modal/delivery_rule_modal.html

@@ -97,11 +97,11 @@
     <!--卖家首页-->
     <div class="content" ng-if="type=='center'">
         <p><i class="fa fa-exclamation-circle"></i><span>您的店铺尚未设置配送规则，无法计算运费，建议尽快设置！</span></p>
-        <div><a name="rule_cancel" ng-click="cancelDelete()">以后再说</a><a name="rule_href" ng-click="hrefToRule()">立即设置</a></div>
+        <div><a name="rule_cancel" ng-click="cancelDelete()">以后再说</a><a name="rule_href" ng-click="hrefToNext('vendor#vendor_deliveryRule')">立即设置</a></div>
     </div>
     <!--其他页面-->
     <div class="content" ng-if="type=='product'">
         <p><i class="fa fa-exclamation-circle"></i><span>您当前尚未设置配送规则，买家将无法下单，建议尽快设置！</span></p>
-        <div><a name="rule_href" ng-click="hrefToRule()">立即设置</a></div>
+        <div><a name="rule_href" ng-click="hrefToNext('vendor#vendor_deliveryRule')">立即设置</a></div>
     </div>
 </div>

src/main/webapp/resources/view/usercenter/forstore/account_manager.html

@@ -176,19 +176,19 @@
 		<div class="count-content" ng-if="enterpriseInfo">
 			<ul>
 				<li>
-					<div class="fl" >企业全称</div>
+					<div class="fl" >企业名称</div>
 					<div class="fr"><span ng-bind="enterpriseInfo.enName"></span></div>
 				</li>
-				<li>
+				<!--<li>
 					<div class="fl">企业简称</div>
 					<div class="fr"><span ng-bind="enterpriseInfo.enShortname"></span></div>
-				</li>
+				</li>-->
 				<li>
 					<div class="fl">营业执照号</div>
 					<div class="fr"><span ng-bind="enterpriseInfo.enBussinessCode"></span></div>
 				</li>
 				<li>
-					<div class="fl">企业地址</div>
+					<div class="fl">注册地址</div>
 					<div class="fr"><span ng-bind="enterpriseInfo.enAddress"></span></div>
 				</li>
 				<li>

src/main/webapp/resources/view/usercenter/forstore/query_logistics.html

@@ -245,9 +245,9 @@
                         </ul>
                     </div>
                     <div class="logistics-style">
-                        <span>配送方式：<em ng-bind="purchase.deliveryType=1301? '第三方物流': 'UU配送'">第三方配送</em></span>
-                        <span>物流公司：<em ng-bind="logistics.companyName"></em></span>
-                        <span>物流单号：<em ng-bind="logistics.number"></em></span>
+                        <span>配送方式：<em ng-bind="deliveryMethod[order.deliverytype]">第三方配送</em></span>
+                        <span>物流公司：<em ng-bind="logistics.companyName || '-'"></em></span>
+                        <span>物流单号：<em ng-bind="logistics.number || '-'"></em></span>
                     </div>
                     <div class="logistics_list01" style="margin-top: 0px;">
                         <!--<div class="log_menu"><span>您的买家已提货</span></div>-->
@@ -261,7 +261,7 @@
                             <dl ng-if="logisticsInfo.length != 0">
                                 <dd ng-if="logisticsInfo.length != 0" ng-repeat="info in logisticsInfo"><em ng-class="{ active : $index ==logisticsInfo.length - 1}"></em><span ng-bind="info.AcceptTime"></span><span ng-bind="info.AcceptStation"></span></dd>
                             </dl>
-                            <div class="empty">
+                            <div class="empty" ng-if="logisticsInfo.length == 0">
                                 <p class="empty-img">
                                     <img src="static/img/all/empty-cart.png">
                                 </p>

src/main/webapp/resources/view/vendor/forstore/query_logistics.html

@@ -244,9 +244,9 @@
                         </ul>
                     </div>
                     <div class="logistics-style">
-                        <span>配送方式：<em ng-bind="purchase.deliveryType='logistics'? '第三方物流': 'UU配送'">第三方配送</em></span>
-                        <span>物流公司：<em ng-bind="logistics.companyName"></em></span>
-                        <span>物流单号：<em ng-bind="logistics.number"></em></span>
+                        <span>配送方式：<em ng-bind="deliveryMethod[purchase.sendType]">第三方配送</em></span>
+                        <span>物流公司：<em ng-bind="logistics.companyName || '-'"></em></span>
+                        <span>物流单号：<em ng-bind="logistics.number || '-'"></em></span>
                     </div>
                     <div class="logistics_list01" style="margin-top: 0px;">
                         <!--<div class="log_menu"><span>您的买家已提货</span></div>-->

src/main/webapp/resources/view/vendor/forstore/vendor_account_management.html

@@ -389,7 +389,7 @@
             </p>
             <ul>
               <li>
-                <div class="fl">企业全称</div>
+                <div class="fl">企业名称</div>
                 <div class="col-sm-10" ng-if="updateState"><input type="text" class="form-control"
                                                                   title="企业全称"
                                                                   ng-disabled=" !updateState"
@@ -399,7 +399,7 @@
                     ng-bind="enterpriseInfo.enName || '暂无信息'"></ span>
                 </div>
               </li>
-              <li>
+              <!--<li>
                 <div class="fl">企业简称</div>
                 <div class="col-sm-10" ng-if="updateState"><input type="text" class="form-control"
                                                                   title="企业简称"
@@ -408,7 +408,7 @@
                 </div>
                 <div class="fr" ng-if="!updateState"><span
                     ng-bind="enterpriseInfo.enShortname || '暂无信息'"></span></div>
-              </li>
+              </li>-->
               <!--<li>
                   <div class="fl">营业执照</div>
                   <div class="fr"><img src="static/img/vendor/images/company_zz.jpg" alt=""></div>
@@ -423,7 +423,7 @@
                     ng-bind="enterpriseInfo.enBussinessCode || '暂无信息'"></span></div>
               </li>
               <li>
-                <div class="fl">企业地址</div>
+                <div class="fl">注册地址</div>
                 <div class="col-sm-10" ng-if="updateState"><input type="text" class="form-control"
                                                                   title="企业地址"
                                                                   ng-disabled=" !updateState"

src/main/webapp/resources/view/vendor/forstore/vendor_material.html

@@ -1943,7 +1943,7 @@
 													<div class="content margin10">
 														<!--<p class="title">包装/生产日期</p>-->
 														<div class="input-list">
-															<span class="tit">包装:</span><!--<input type="text" class="select" name="packaging" ng-maxlength="10" title="包装" maxlength="10" placeholder="包装方式" style="width: 96px;" ng-model="goods.editPackaging"
+															<span class="tit">包装：</span><!--<input type="text" class="select" name="packaging" ng-maxlength="10" title="包装" maxlength="10" placeholder="包装方式" style="width: 96px;" ng-model="goods.editPackaging"
 																							   ng-class="{'error' : goods.editPackagingInvalid}"
 																							   ng-blur="editPackaging(goods, true)" ng-change="changePackaging(goods)"/>-->
 															<select ng-model="goods.editPackaging" ng-init="goods.editPackaging='请选择'" class="select-adder select-package" title="包装">

src/main/webapp/resources/view/vendor/forstore/vendor_order.html

@@ -1141,8 +1141,8 @@
 			<ul>
 				<li ng-class="{'active': status=='all'}" ng-click="setActive('all')"><a> 所有订单(<em ng-class="{'color-black': !counts['all']}" ng-bind="counts['all'] || 0"></em>)</a></li>
 				<li ng-class="{'active': status=='tobeconfirmed'}" ng-click="setActive('tobeconfirmed')"><a>待买家付款（<em ng-class="{'color-black': !counts['tobeconfirmed']}" ng-bind="counts['tobeconfirmed'] || 0"></em>）</a></li>
-				<li ng-class="{'active': status=='comfirmed'}" ng-click="setActive('comfirmed')"><a>待买家收货（<em ng-class="{'color-black': !counts['comfirmed']}" ng-bind="counts['comfirmed'] || 0"></em>）</a></li>
-				<li ng-class="{'active': status=='inbound'}" ng-click="setActive('inbound')"><a>待收货（<em ng-class="{'color-black': !counts['inbound']}" ng-bind="counts['inbound'] || 0"></em>）</a></li>
+				<li ng-class="{'active': status=='comfirmed'}" ng-click="setActive('comfirmed')"><a>待发货（<em ng-class="{'color-black': !counts['comfirmed']}" ng-bind="counts['comfirmed'] || 0"></em>）</a></li>
+				<li ng-class="{'active': status=='inbound'}" ng-click="setActive('inbound')"><a>待买家收货（<em ng-class="{'color-black': !counts['inbound']}" ng-bind="counts['inbound'] || 0"></em>）</a></li>
 				<li ng-class="{'active': status=='tobepaid'}" ng-click="setActive('tobepaid')"><a>待收款（<em ng-class="{'color-black': !counts['tobepaid']}" ng-bind="counts['tobepaid'] || 0"></em>）</a></li>
 				<li ng-class="{'active': status=='completed'}" ng-click="setActive('completed')"><a>成功的订单（<em ng-class="{'color-black': !counts['completed']}" ng-bind="counts['completed'] || 0"></em>）</a></li>
 				<li ng-class="{'active': status=='unavailable'}" ng-click="setActive('unavailable')"><a>取消的订单（<em ng-class="{'color-black': !counts['unavailable']}" ng-bind="counts['unavailable'] || 0"></em>）</a></li>

src/main/webapp/resources/view/vendor/forstore/vendor_store_maintain.html

@@ -617,12 +617,20 @@
 			</div>
 			<div class="row com_row" ng-if="enterprise.enBusinessCode.length > 0">
 				<div class="col-md-2 custom_col">
-					<span>注册号</span>
+					<span>营业执照号</span>
 				</div>
 				<div class="col-md-10 custom_col">
 					<span ng-if="enterprise">{{enterprise.enBusinessCode || '暂无信息'}}</span>
 				</div>
 			</div>
+			<div class="row com_row" ng-if="enterprise.enBusinessCode.length > 0">
+				<div class="col-md-2 custom_col">
+					<span>官网地址</span>
+				</div>
+				<div class="col-md-10 custom_col">
+					<span ng-if="enterprise">{{sampleStore.enterprise.enUrl || '暂无信息'}}</span>
+				</div>
+			</div>
 			<div class="row com_row" ng-if="enterprise.enType.length > 0">
 				<div class="col-md-2 custom_col">
 					<span>企业类型</span>
@@ -681,14 +689,14 @@
 					<input type="text" class="form-control" style="border-radius: inherit;" title="storeShortName" ng-model="sampleStore.storeShortName" maxlength="100"/>
 				</div>
 			</div>
-			<div class="row com_row" >
+			<!--<div class="row com_row" >
 				<div class="col-md-2 custom_col">
 					<span>店铺名称</span>
 				</div>
 				<div class="col-md-10 custom_col">
 					<input type="text" class="form-control" style="border-radius: inherit;" title="storeName" ng-model="sampleStore.storeName" maxlength="100"/>
 				</div>
-			</div>
+			</div>-->
 			<div class="row com_row">
 				<div class="col-md-2 custom_col">
 					<span>简&nbsp;&nbsp;&nbsp;&nbsp;介<strong class="text-inverse">*</strong></span>
@@ -697,17 +705,17 @@
 					<textarea class="form-control" style="border-radius: inherit;resize: none;height: 200px;" title="description" ng-model="sampleStore.description" maxlength="500" required></textarea>
 				</div>
 			</div>
-			<div class="row com_row" style="margin-top: 10px;">
+			<!--<div class="row com_row" style="margin-top: 10px;">
 				<div class="col-md-2 custom_col">
 					<span>官网地址<strong class="text-inverse">*</strong></span>
 				</div>
 				<div class="col-md-10 custom_col">
 					<input type="text" class="form-control" style="border-radius: inherit;" title="enUrl" ng-model="sampleStore.enterprise.enUrl" maxlength="50"/>
 				</div>
-			</div>
+			</div>-->
 			<div class="row com_row" style="margin-top: 10px;">
 				<div class="col-md-2 custom_col">
-					<span>地&nbsp;&nbsp;&nbsp;&nbsp;址<strong class="text-inverse">*</strong></span>
+					<span>企业地址<strong class="text-inverse">*</strong></span>
 				</div>
 				<div class="col-md-10 custom_col">
 					<input type="text" class="form-control" style="border-radius: inherit;" title="address" ng-model="sampleStore.enterprise.address" maxlength="50"/>
@@ -742,7 +750,7 @@
 					</a>
 				</div>
 			</div>
-			<div class="row com_row">
+			<!--<div class="row com_row">
 				<div class="col-md-2 custom_col">
 					<span>店铺简称</span>
 				</div>
@@ -751,7 +759,7 @@
 						{{sampleStore.storeShortName || '暂无信息'}}
 					</div>
 				</div>
-			</div>
+			</div>-->
 			<div class="row com_row">
 				<div class="col-md-2 custom_col">
 					<span>店铺名称</span>
@@ -772,7 +780,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="row com_row" style="margin-top: 10px;">
+			<!--<div class="row com_row" style="margin-top: 10px;">
 				<div class="col-md-2 custom_col">
 					<span>官网地址</span>
 				</div>
@@ -781,7 +789,7 @@
 						{{sampleStore.enterprise.enUrl || '暂无信息'}}
 					</div>
 				</div>
-			</div>
+			</div>-->
 			<div class="row com_row" style="margin-top: 10px;">
 				<div class="col-md-2 custom_col">
 					<span>地&nbsp;&nbsp;&nbsp;&nbsp;址</span>