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

# Conflicts:
#	src/main/resources/prod/sys.properties

src/main/java/com/uas/platform/b2b/controller/PurcProductController.java

@@ -319,7 +319,7 @@ public class PurcProductController {
 	 */
 	@RequestMapping(value = "/edit/toggle/{status}", method = RequestMethod.POST)
 	@ResponseBody
-	public void switchPorduct(@PathVariable("status") String status) {
+	public void switchPorduct(@PathVariable("status") String status) throws Exception {
 		purcProductService.switchPorduct(status);
 	}
 

src/main/java/com/uas/platform/b2b/ps/ProductUtils.java

@@ -174,7 +174,7 @@ public class ProductUtils {
      * @param switchType 开关类型 sale or purc
      * @param switchStatus 开关状态 1 or 0
      */
-    public static void switchProductByEnuuAndTypeAndStatus(Long enUU, String switchType, Integer switchStatus) throws Exception {
+    public static void switchProductByEnuuAndTypeAndStatus(Long enUU, String switchType, Short switchStatus) throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         params.put("enUU", enUU);
         params.put("switchType", switchType);
@@ -204,7 +204,7 @@ public class ProductUtils {
      * @param switchType 开关类型
      * @param switchStatus 开关状态
      */
-    public static void switchProduct(Long id, String switchType, Integer switchStatus) throws Exception {
+    public static void switchProduct(Long id, String switchType, Short switchStatus) throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         params.put("id", id);
         params.put("switchType", switchType);

src/main/java/com/uas/platform/b2b/service/PurcProductService.java

@@ -18,5 +18,5 @@ public interface PurcProductService {
 	 * 
 	 * @param status
 	 */
-	public void switchPorduct(String status);
+	public void switchPorduct(String status) throws Exception;
 }

src/main/java/com/uas/platform/b2b/service/impl/BaseInfoServiceImpl.java

@@ -838,9 +838,9 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 	}
 
 	@Override
-	public void switchPorduct(String status) {
+	public void switchPorduct(String status) throws Exception {
 		String switchtype = "sale";
-		Integer switchstatus = 0;
+		Short switchstatus = 0;
 		Enterprise enter = SystemSession.getUser().getEnterprise();
 		enter.setProdsale(Constant.NO);
 		if (status.equals("on")) {
@@ -849,8 +849,10 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 		}
 		enterpriseDao.save(enter);
 		// TODO 这里之后要修改为只调用公共服务方法，B2B数据从公共服务同步
-		productDao.switchProductByEnuuAndTypeAndStatus(SystemSession.getUser().getEnterprise().getUu(), switchtype,
-				switchstatus);
+//		productDao.switchProductByEnuuAndTypeAndStatus(SystemSession.getUser().getEnterprise().getUu(), switchtype,
+//				switchstatus);
+		ProductUtils.switchProductByEnuuAndTypeAndStatus(SystemSession.getUser().getEnterprise().getUu(), switchtype,
+                switchstatus);
 	}
 
 }

src/main/java/com/uas/platform/b2b/service/impl/ProductServiceImpl.java

@@ -112,7 +112,7 @@ public class ProductServiceImpl implements ProductService {
 		try {
             Product prod = productDao.findOne(id);
             prod.setIsSale(Constant.YES);
-            ProductUtils.switchProduct(id, "sale", (int) Constant.YES);
+            ProductUtils.switchProduct(id, "sale", Constant.YES);
 //            productDao.save(prod);
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -126,7 +126,7 @@ public class ProductServiceImpl implements ProductService {
 		try {
             Product prod = productDao.findOne(id);
             prod.setIsSale(Constant.YES);
-            ProductUtils.switchProduct(id, "sale", (int) Constant.NO);
+            ProductUtils.switchProduct(id, "sale", Constant.NO);
 //            productDao.save(prod);
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -139,7 +139,7 @@ public class ProductServiceImpl implements ProductService {
 		try {
 			Product prod = productDao.findOne(id);
 			prod.setIsPurchase(Constant.YES);
-            ProductUtils.switchProduct(id, "purc", (int) Constant.YES);
+            ProductUtils.switchProduct(id, "purc", Constant.YES);
 //            productDao.save(prod);
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -152,7 +152,7 @@ public class ProductServiceImpl implements ProductService {
 		try {
 			Product prod = productDao.findOne(id);
 			prod.setIsPurchase(Constant.NO);
-            ProductUtils.switchProduct(id, "purc", (int) Constant.NO);
+            ProductUtils.switchProduct(id, "purc", Constant.NO);
 //            productDao.save(prod);
 		} catch (Exception e) {
 			e.printStackTrace();

src/main/java/com/uas/platform/b2b/service/impl/PurcProductServiceImpl.java

@@ -328,9 +328,9 @@ public class PurcProductServiceImpl implements PurcProductService {
 //	}
 
 	@Override
-	public void switchPorduct(String status) {
+	public void switchPorduct(String status) throws Exception {
 		String switchtype = "purc";
-		Integer switchstatus = 0;
+		Short switchstatus = 0;
 		Enterprise enter = SystemSession.getUser().getEnterprise();
 		enter.setProdpurc(Constant.NO);
 		if (status.equals("on")) {
@@ -338,7 +338,9 @@ public class PurcProductServiceImpl implements PurcProductService {
 			enter.setProdpurc(Constant.YES);
 		}
 		enterpriseDao.save(enter);
-		productDao.switchProductByEnuuAndTypeAndStatus(SystemSession.getUser().getEnterprise().getUu(), switchtype,
+//		productDao.switchProductByEnuuAndTypeAndStatus(SystemSession.getUser().getEnterprise().getUu(), switchtype,
+//				switchstatus);
+		ProductUtils.switchProductByEnuuAndTypeAndStatus(SystemSession.getUser().getEnterprise().getUu(), switchtype,
 				switchstatus);
 	}
 }

src/main/resources/prod/sys.properties

@@ -11,7 +11,7 @@ reportPrintUrl=http://print.ubtob.com/report/print?userName=B2B%s&profile=${prof
 reportUploadUrl=http://print.ubtob.com/report/fileUpload?userName=B2B%s
 
 #product service url
-productServiceUrl=https://api-product.usoftmall.com/ 
+productServiceUrl=
 
 #inquiry service url
-inquiryServiceUrl=https://api-inquiry.usoftmall.com/
+inquiryServiceUrl=

src/main/resources/test/sys.properties

@@ -11,7 +11,8 @@ reportPrintUrl=http://print.ubtob.com/report/print?userName=B2B%s&profile=${prof
 reportUploadUrl=http://print.ubtob.com/report/fileUpload?userName=B2B%s
 
 #product service url
-productServiceUrl=http://218.17.158.219:24000
+## test http://218.17.158.219:24000
+productServiceUrl=http://192.168.253.102:8080
 
 #inquiry service url
 inquiryServiceUrl=http://218.17.158.219:24000