修改上架逻辑2

src/main/java/com/uas/platform/b2c/common/account/controller/UserController.java

@@ -26,6 +26,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -61,6 +62,9 @@ public class UserController {
 	@Autowired
 	private UserQuestionService uqService;
 
+	@Value("#{sys.profile}")
+	private String profile;
+
 	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
 	/**
@@ -72,6 +76,21 @@ public class UserController {
 		return SystemSession.getUser();
 	}
 
+	/**
+	 * 获取当前环境
+	 * @return
+	 */
+	@RequestMapping(value = "/isDev", method = RequestMethod.GET)
+	public String isDev() {
+		if (StringUtils.isEmpty(profile)) {
+			return "fasle";
+		} else if ("prod".equals(profile)) {
+			return "success";
+		} else {
+			return "false";
+		}
+	}
+
 	/**
 	 * 设置头像路径
 	 * @param imageUrl

src/main/java/com/uas/platform/b2c/prod/commodity/dao/ProductDao.java

@@ -75,7 +75,9 @@ public interface ProductDao extends JpaSpecificationExecutor<Product>, JpaReposi
      * @param b2cEnabled 启用
      * @return
      */
-    List<Product> findByEnUUAndPcmpcodeAndPbrandenAndB2cEnabled(Long enUU, String pcmpcode, String pbranden, Integer b2cEnabled);
+    @Query(nativeQuery = true, value = "select p.* from products p left join product$private pp on pp.pr_id = p.pr_id where " +
+            "p.pr_enuu=:enUU and p.pr_pcmpcode = :pcmpcode and p.pr_pbranden = :pbranden and pp.pr_b2cenabled = :b2cEnabled")
+    List<Product> findByEnUUAndPcmpcodeAndPbrandenAndB2cEnabled(@Param("enUU")Long enUU, @Param("pcmpcode")String pcmpcode, @Param("pbranden")String pbranden, @Param("b2cEnabled")Integer b2cEnabled);
 
 
     /**

src/main/java/com/uas/platform/b2c/prod/commodity/model/Product.java

@@ -37,7 +37,7 @@ public class Product {
 	/**
 	 * 产品规格
 	 */
-	@Column(name = "pr_spec", columnDefinition = "text")
+	@Column(name = "pr_spec", columnDefinition = "TEXT")
 	private String spec;
 
 	/**

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

@@ -1041,7 +1041,7 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 		if (!CollectionUtils.isEmpty(releaseProductByBatchList)) {
 			List<com.uas.ps.entity.Product> products = convertProduct(releaseProductByBatchList);
 			// TODO 什么接口
-			String result = restTemplate.postForEntity("/update", products, String.class).getBody();
+			String result = restTemplate.postForEntity("http://192.168.253.12:24000/product/update", products, String.class).getBody();
 			List<Long> productIds = JSON.parseArray(result, Long.class);
 			// 默认为b2c Enable开启
 			List<ProductPrivate> productPrivates = new ArrayList<>();
@@ -1136,24 +1136,46 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 
 	@Override
 	public String publishByBatchPerson(String batch) {
-		User user = SystemSession.getUser();
-		Enterprise enterprise = SystemSession.getUser().getEnterprise();
-		final Object[] obj = new Object[]{enterprise.getUu(), user.getUserUU(), enterprise.getEnName(), batch};
-		String sql = "/*#mycat:db_type=master*/ set @enuu = %s; set @useruu = %s; set @enName = '%s'; set @batch = '%s'; call RELEASE_TO_PRODUCT_PERSON_V1(@enuu, @useruu, @enName, @batch)";
-		final String updateSql = String.format(sql, obj);
-		jdbcTemplate.execute(new StatementCallback<String>() {
+        List<ReleaseProductByBatch> releaseProductByBatchList =
+                releaseProductByBatchDao.findByRelbatchid(batch);
+        if (!CollectionUtils.isEmpty(releaseProductByBatchList)) {
+            List<com.uas.ps.entity.Product> products = convertProduct(releaseProductByBatchList);
+            // TODO 什么接口
+            String result = restTemplate.postForEntity("/update", products, String.class).getBody();
+            List<Long> productIds = JSON.parseArray(result, Long.class);
+            // 默认为b2c Enable开启
+            List<ProductPrivate> productPrivates = new ArrayList<>();
+            for (Long prId : productIds) {
+                ProductPrivate productPrivate = productPrivateDao.findByPrId(prId);
+                if (null == productPrivate) {
+                    productPrivate = new ProductPrivate();
+                }
+                productPrivate.setB2cEnabled(IntegerConstant.YES_SHORT);
+                // 统计现在有多少在售信息
+                int batchCount = goodsDao.findCountByProductid(prId);
+                productPrivate.setBatchCount(batchCount);
+            }
+            productPrivateDao.save(productPrivates);
+        }
 
-			@Override
-			public String doInStatement(Statement stmt) throws SQLException, DataAccessException {
-				stmt.executeQuery(updateSql);
-				ResultSet rs = stmt.getResultSet();
-				if (null != rs) {
-					rs.next();
-					return rs.getString(1);
-				}
-				return "0";
-			}
-		});
+//		User user = SystemSession.getUser();
+//		Enterprise enterprise = SystemSession.getUser().getEnterprise();
+//		final Object[] obj = new Object[]{enterprise.getUu(), user.getUserUU(), enterprise.getEnName(), batch};
+//		String sql = "/*#mycat:db_type=master*/ set @enuu = %s; set @useruu = %s; set @enName = '%s'; set @batch = '%s'; call RELEASE_TO_PRODUCT_PERSON_V1(@enuu, @useruu, @enName, @batch)";
+//		final String updateSql = String.format(sql, obj);
+//		jdbcTemplate.execute(new StatementCallback<String>() {
+//
+//			@Override
+//			public String doInStatement(Statement stmt) throws SQLException, DataAccessException {
+//				stmt.executeQuery(updateSql);
+//				ResultSet rs = stmt.getResultSet();
+//				if (null != rs) {
+//					rs.next();
+//					return rs.getString(1);
+//				}
+//				return "0";
+//			}
+//		});
 		return null;
 	}
 }

src/main/webapp/resources/js/common/query/user.js

@@ -64,6 +64,10 @@ define([ 'angular', 'ui-bootstrap', 'ngResource' ], function(angular) {
 			getUser: {
 				method : 'GET'
 			},
+			isDevOrProd: {
+				url: 'basic/user/isDev',
+				method : 'GET'
+			},
 			getUserByUU: {
 				url: 'basic/user/getUserByUU',
 				method : 'GET'

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

@@ -4,29 +4,38 @@
  */
 define(['app/app', 'calendar'], function(app) {
     'use strict';
-    app.register.controller('vendorIndexCtrl', ['$scope', 'toaster', 'VendorService', '$rootScope', 'News', '$filter', '$modal', 'DistributionRule', '$q', function($scope, toaster, VendorService, $rootScope, News, $filter, $modal, DistributionRule, $q) {
+    app.register.controller('vendorIndexCtrl', ['$scope', 'toaster', 'VendorService', '$rootScope', 'News', '$filter', '$modal', 'DistributionRule', '$q', 'User', function($scope, toaster, VendorService, $rootScope, News, $filter, $modal, DistributionRule, $q, User) {
         $rootScope.active = 'index';
         $scope.count = 0;
         $scope.userInfo = $rootScope.userInfo;
 
         $scope.toAccount = function(){
-            var url = 'http://113.105.74.135:8001/sso/change/userspace?businessCode='+$scope.userInfo.enterprise.enBussinessCode;
-            $.ajax({
-                url:url,
-                dataType:'jsonp',
-                processData: false,
-                type:'get',
-                crossDomain: true,
-                jsonp:'callback',
-                jsonpCallback:"successCallback",
-                success:function(data){
-                    console.log(data);
-                },
-                error:function(data) {
-                    console.log(data);
+            User.isDevOrProd(null, function(data){
+                $scope.isProd = data.data;
+                if ($scope.isProd == 'success') {
+                    var urlPrex = 'https://account.ubtob.com';
+                } else {
+                    var urlPrex = 'http://113.105.74.135:8001';
                 }
+                var url = urlPrex + '/sso/change/userspace?businessCode='+$scope.userInfo.enterprise.enBussinessCode;
+                $.ajax({
+                    url:url,
+                    dataType:'jsonp',
+                    processData: false,
+                    type:'get',
+                    crossDomain: true,
+                    jsonp:'callback',
+                    jsonpCallback:"successCallback",
+                    success:function(data){
+                        console.log(data);
+                        window.location.href = urlPrex + '/sso/center?type=apply';
+                    },
+                    error:function(data) {
+                        console.log(data);
+                    }
+                });
+            }, function(response) {
             });
-            window.location.href = 'http://113.105.74.135:8001/sso/center?type=apply';
         };
 
         //个人账户