增加ERP销售订单传输人员企业信息

src/main/java/com/uas/platform/b2c/common/account/model/Enterprise.java

@@ -18,7 +18,7 @@ import java.util.Date;
 @Entity
 @Table(name = "sec$enterprises")
 @Cacheable
-@Cache(usage = CacheConcurrencyStrategy.READ_WRITE, region = "com.uas.platform.b2c.model.Enterprise")
+@Cache(usage = CacheConcurrencyStrategy.READ_WRITE, region = "com.uas.platform.b2c.model.EnterpriseUas")
 public class Enterprise implements Serializable {
 
 	/**

src/main/java/com/uas/platform/b2c/common/account/model/UserBaseInfo.java

@@ -18,7 +18,7 @@ import java.io.Serializable;
 public class UserBaseInfo implements Serializable {
 
 	/**
-	 * 
+	 *
 	 */
 	private static final long serialVersionUID = 1L;
 

src/main/java/com/uas/platform/b2c/common/account/service/EnterpriseService.java

@@ -14,7 +14,7 @@ public interface EnterpriseService {
 	/**
 	 * 批量获取企业的信息
 	 * @param enuus uu号
-	 * @return List<Enterprise>
+	 * @return List<EnterpriseUas>
 	 */
 	List<Enterprise> getEnterpriseInfos(List<Long> enuus);
 	

src/main/java/com/uas/platform/b2c/common/account/service/impl/EnterpriseServiceImpl.java

@@ -46,7 +46,7 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 	 * 批量获取企业的信息
 	 *
 	 * @param enuus uu号
-	 * @return List<Enterprise>
+	 * @return List<EnterpriseUas>
 	 */
 	@Override
 	public List<Enterprise> getEnterpriseInfos(List<Long> enuus) {

src/main/java/com/uas/platform/b2c/external/erp/common/util/ModelConverter.java

@@ -0,0 +1,51 @@
+package com.uas.platform.b2c.external.erp.common.util;
+
+import com.uas.api.b2c_erp.baisc.model.EnterpriseUas;
+import com.uas.api.b2c_erp.baisc.model.UserBaseInfoUas;
+import com.uas.platform.b2c.common.account.model.Enterprise;
+import com.uas.platform.b2c.common.account.model.UserBaseInfo;
+
+/**
+ * Created by wangyc on 2017/11/23.
+ *
+ * @version 2017/11/23 11:20 wangyc
+ */
+public class ModelConverter {
+
+    /**
+     * 转换用户信息
+     * @param user
+     * @return
+     */
+    public static UserBaseInfoUas convert(UserBaseInfo user) {
+        UserBaseInfoUas userUas = new UserBaseInfoUas();
+        userUas.setUserName(user.getUserName());
+        userUas.setUserEmail(user.getUserEmail());
+        userUas.setUserTel(user.getUserTel());
+
+        return userUas;
+    }
+
+    /**
+     * 转换企业信息
+     * @param enterprise
+     * @return
+     */
+    public static EnterpriseUas convert(Enterprise enterprise) {
+        EnterpriseUas enterpriseUas = new EnterpriseUas();
+        enterpriseUas.setEnAddress(enterprise.getEnAddress());
+        enterpriseUas.setEnArea(enterprise.getEnArea());
+        enterpriseUas.setEnBussinessCode(enterprise.getEnBussinessCode());
+        enterpriseUas.setEnDeliverAddr(enterprise.getEnDeliverAddr());
+        enterpriseUas.setEnEmail(enterprise.getEnEmail());
+        enterpriseUas.setEnFax(enterprise.getEnFax());
+        enterpriseUas.setEnIndustry(enterprise.getEnIndustry());
+        enterpriseUas.setEnName(enterprise.getEnName());
+        enterpriseUas.setEnShortname(enterprise.getEnShortname());
+        enterpriseUas.setEnTel(enterprise.getEnTel());
+        enterpriseUas.setEnType(enterprise.getEnType());
+        enterpriseUas.setUu(enterprise.getUu());
+
+        return enterpriseUas;
+    }
+}

src/main/java/com/uas/platform/b2c/external/erp/order/service/impl/OrderServiceImpl.java

@@ -4,6 +4,10 @@ import com.uas.api.b2c_erp.seller.model.Order;
 import com.uas.api.b2c_erp.seller.model.OrderDetail;
 import com.uas.api.b2c_erp.seller.service.OrderService;
 import com.uas.api.exception.B2CException;
+import com.uas.platform.b2c.common.account.dao.EnterpriseDao;
+import com.uas.platform.b2c.common.account.dao.UserBaseInfoDao;
+import com.uas.platform.b2c.common.account.model.Enterprise;
+import com.uas.platform.b2c.common.account.model.UserBaseInfo;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.support.log.ErpB2cBufferedLogger;
 import com.uas.platform.b2c.external.erp.order.util.ModelConverter;
@@ -48,7 +52,13 @@ public class OrderServiceImpl implements OrderService {
 
 	@Autowired
 	private OrderDao orderDao;
-	
+
+	@Autowired
+	private UserBaseInfoDao userBaseInfoDao;
+
+	@Autowired
+	private EnterpriseDao enterpriseDao;
+
 	private static final ErpB2cBufferedLogger logger = BufferedLoggerManager.getLogger(ErpB2cBufferedLogger.class);
 
 	@Override
@@ -90,10 +100,16 @@ public class OrderServiceImpl implements OrderService {
 		for (Purchase purchase : purcs) {
 			boolean codeExists = false;
 			Order order = ModelConverter.getOrder(purchase);
-//			com.uas.platform.b2c.trade.order.model.Order b2cOrder = orderDao.findOrderByOrderid(purchase.getOrderid());
-//			if (b2cOrder != null) {
-//				b2cOrder.getba
-//			}
+			UserBaseInfo buyer = userBaseInfoDao.findUserByUserUU(purchase.getBuyeruu());
+			if (buyer != null) {// 设置买方用户信息
+				order.setBuyer(com.uas.platform.b2c.external.erp.common.util.ModelConverter.convert(buyer));
+			}
+
+			Enterprise enterprise = enterpriseDao.findByUu(purchase.getBuyerenuu());
+			if (enterprise != null) {// 设置买方企业信息
+				order.setBuyerEn(com.uas.platform.b2c.external.erp.common.util.ModelConverter.convert(enterprise));
+			}
+
 			for (OrderDetail orderDetail : order.getDetails()) {
 				List<GoodsHistory> goodsHistorys = goodsHistoryDao.findByBatchCode(orderDetail.getBatchCode());// 获取上架历史信息
 				if (!CollectionUtils.isEmpty(goodsHistorys)) {

src/main/java/com/uas/platform/b2c/fa/payment/service/impl/BankTransferServiceImpl.java

@@ -356,11 +356,6 @@ public class BankTransferServiceImpl implements BankTransferService {
 
 			saveBankTransfer = bankTransferDao.save(bankTransfer);
 
-		for (String orderId : orderIds) {
-			Order orderN = orderDao.findByOrderid(orderId);
-			if (orderN == null) {
-				throw new IllegalOperatorException("您要操作的订单不存在：" + orderId);
-			}
 			for (String orderId : orderIds) {
 				Order orderN = orderService.findByOrId(orderId);
 				if (orderN == null) {

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

@@ -570,13 +570,18 @@ public class GoodsServiceImpl implements GoodsService {
 	@Override
 	@Transactional
 	public Goods publish(Goods goods, String deviceInfo, Product product) {
-		Goods saveGoods = publish(goods, deviceInfo);
 		ProductDetail productDetail = productDetailDao.findByProductId(product.getId());
 		if (productDetail == null) {
 			productDetail = new ProductDetail();
+		} else if (productDetail.getReserve() != null) {
+			ProductDetail newProductDetail = productService.findByProductId(product.getId());
+			if (productDetail.getReserve() < goods.getReserve() + newProductDetail.getB2cReserve()) {
+				throw new IllegalOperatorException("本次上架数量和已上架数量之和不可超过ERP空闲库存数量");
+			}
 		}
 		productDetail.convertFromGoods(goods, product);
 		productDetailDao.save(productDetail);
+		Goods saveGoods = publish(goods, deviceInfo);
 		return goods;
 	}
 

src/main/java/com/uas/platform/b2c/prod/product/brand/service/impl/BrandSubmitServiceImpl.java

@@ -323,7 +323,7 @@ public class BrandSubmitServiceImpl implements BrandSubmitService {
 			// "user#/home/brandMaintenance", "品牌维护");
 		} else if (brandSubmit.getTel() != null) {
 			// 发送短信
-			// UserBaseInfo userBaseInfo =
+			// UserBaseInfoUas userBaseInfo =
 			// userBaseInfoDao.findOne(brandSubmit.getModifyuu());
 			// sendMessageService.sendMessage("您提交的" + brandSubmit.getNameCn() +
 			// "品牌申请已审核通过。", brandSubmit.getTel(),

src/main/resources/dev/sys.properties

@@ -30,9 +30,9 @@ newsMicroServiceIp=news.usoftchina.com
 newsRedisRefresh=3600
 floorMicroServiceIp=10.10.101.23
 carouselMicroServiceIp=10.10.101.23
-storecmsMicroServiceIp=10.10.101.23
+storecmsMicroServiceIp=192.168.253.12
 endpointUri=10.10.101.23
-recommendPort=20102
+recommendPort=20100
 # upload file
 uploadFileUrl = http://10.10.100.200:9999
 # search file

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

@@ -526,6 +526,12 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 
 			$scope.goods.breakUp = 1 === $scope.goods.breakUp;
 			$scope.isSelfSupport = 1 === $scope.goods.isSelfSupport;
+			if (product.sourceApp == 'ERP') {
+				if ($scope.goods.erpReserve < $scope.goods.b2cReserve + $scope.goods.reserve) {
+					toaster.pop('error', '本次上架数量和已上架数量之和不可超过ERP空闲库存数量');
+					return;
+				}
+			}
 			Material.newStockByStandardProduct({ id: product.id, isSelfSupport: $scope.isSelfSupport}, $scope.goods, function (result) {
 				if (result.success) {
 					toaster.pop('success', '商品上架成功');