Merge branch 'feature_release-tomysql' into dev-mysql

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

@@ -215,7 +215,10 @@ public class EnterpriseController {
 				List<ApplyUserSpace> applyUserSpaceList = applyUserSpacePage.getContent();
 				for (ApplyUserSpace applyUserSpace : applyUserSpaceList) {
 					Enterprise e = enterpriseService.findByEnBussinessCode(applyUserSpace.getBusinessCode());
-					User admin = userService.findUserByUserUU(e.getEnAdminuu());
+					User admin = null;
+					if (null != e && null != e.getEnAdminuu()) {
+						admin = userService.findUserByUserUU(e.getEnAdminuu());
+					}
 					Map<String,Object> map = new HashMap<>();
 					map.put("enName", e.getEnName());
 					map.put("date",applyUserSpace.getSubmitDate());

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

@@ -296,7 +296,7 @@ public class ReleaseProductByBatchController {
         ModelAndView modelAndView = new ModelAndView();
         logger.log("商品批次", "下载批量上架商品的Excel模板");
         if (null != isPerson && isPerson.intValue() == IntegerConstant.YES_SHORT.intValue()) {
-            modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/trade/releasebyBatch-person", "个人产品导入模板-优软商城"));
+            modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/trade/releaseByBatch-person", "个人产品导入模板-优软商城"));
             return modelAndView;
         }
         if (Currency.USD.equals(currency)) {

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

@@ -366,12 +366,12 @@ public class ProductServiceImpl implements ProductService {
             if (null != isPerson && isPerson.intValue() == IntegerConstant.YES_SHORT.intValue()) {
                 List<ProductPerson> productPersonList = productPersonDao.findByProductIdAndUserUU(id,SystemSession.getUser().getUserUU());
                 if (!CollectionUtils.isEmpty(productPersonList)) {
-                    Map<String,Object> requestMap = new HashMap<>();
-                    requestMap.put("userUU",productPersonList.get(0).getUserUU());
-                    requestMap.put("productId",productPersonList.get(0).getProductId());
-                    String res  = restTemplate.postForEntity( productServiceIp+"/product/assign/delete", null, String.class, requestMap).getBody();
-//                    Long ppid = productPersonList.get(0).getId();
-//                    productPersonDao.delete(ppid);
+//                    Map<String,Object> requestMap = new HashMap<>();
+//                    requestMap.put("userUU",productPersonList.get(0).getUserUU());
+//                    requestMap.put("productId",productPersonList.get(0).getProductId());
+//                    String res  = restTemplate.postForEntity( productServiceIp+"/product/assign/delete", null, String.class, requestMap).getBody();
+                    Long ppid = productPersonList.get(0).getId();
+                    productPersonDao.delete(ppid);
                 }
                 continue;
             }
@@ -1495,7 +1495,6 @@ public class ProductServiceImpl implements ProductService {
         g.setBreakUp(Boolean.FALSE);
         g.setReserve(product.getErpReserve());
         String packaging = (detail == null || detail.getPackaging() == null) ? product.getPackaging(): detail.getPackaging();
-        packaging =  (packaging == null) ? StringConstant.DEFAULTPACKAGING  : packaging;
         g.setPackaging(packaging);
 
         String produceDate = (detail == null || detail.getProduceDate() == null) ? product.getProduceDate() : detail.getProduceDate();

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

@@ -1124,29 +1124,32 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 		}
 		List<com.uas.ps.entity.Product> products = new ArrayList<>();
 		for (ReleaseProductByBatch releaseProductByBatch : releaseProductByBatchList) {
-			com.uas.ps.entity.Product product = new com.uas.ps.entity.Product();
-			// releaseProductByBatch.getCode(); 在公有库生成
-			product.setMinPack(releaseProductByBatch.getMinPackage());
-			product.setCmpImg(releaseProductByBatch.getImg());
-			product.setEnUU(SystemSession.getUser().getEnterprise().getUu());
-			product.setBrand(releaseProductByBatch.getBrandNameEn());
-			product.setCmpCode(releaseProductByBatch.getCode());
-			product.setCmpUuid(releaseProductByBatch.getComponentUuId());
-			product.setKind(releaseProductByBatch.getKindName());
-			product.setKindId(releaseProductByBatch.getKindUuid());
-			product.setpCmpCode(releaseProductByBatch.getB2cCode());
-			product.setpBrand(releaseProductByBatch.getB2cBrandcn());
-			product.setpBrandEn(releaseProductByBatch.getB2cBranden());
-			product.setpBrandId(releaseProductByBatch.getBrandId());
-			product.setpBrandUuid(releaseProductByBatch.getBranduuid());
-			product.setStandard(releaseProductByBatch.getComponentUuId() == null ? (short)0 : (short)1);
-			product.setCmpUuid(releaseProductByBatch.getComponentUuId());
-			if (isAPerson) {
-				product.setSpec(releaseProductByBatch.getPackaging());
-			}
-			String batchCode = "PNUM" + createNumberService.getTimeNumber("trade$product_import_num", 8);
-			product.setCode(batchCode);
-			products.add(product);
+		    if (releaseProductByBatch.getReleaseCode().equals(ReleaseStatus.failure) ||
+                    releaseProductByBatch.getReleaseCode().equals(ReleaseStatus.success)) {
+                com.uas.ps.entity.Product product = new com.uas.ps.entity.Product();
+                // releaseProductByBatch.getCode(); 在公有库生成
+                product.setMinPack(releaseProductByBatch.getMinPackage());
+                product.setCmpImg(releaseProductByBatch.getImg());
+                product.setEnUU(SystemSession.getUser().getEnterprise().getUu());
+                product.setBrand(releaseProductByBatch.getBrandNameEn());
+                product.setCmpCode(releaseProductByBatch.getCode());
+                product.setCmpUuid(releaseProductByBatch.getComponentUuId());
+                product.setKind(releaseProductByBatch.getKindName());
+                product.setKindId(releaseProductByBatch.getKindUuid());
+                product.setpCmpCode(releaseProductByBatch.getB2cCode());
+                product.setpBrand(releaseProductByBatch.getB2cBrandcn());
+                product.setpBrandEn(releaseProductByBatch.getB2cBranden());
+                product.setpBrandId(releaseProductByBatch.getBrandId());
+                product.setpBrandUuid(releaseProductByBatch.getBranduuid());
+                product.setStandard(releaseProductByBatch.getComponentUuId() == null ? (short)0 : (short)1);
+                product.setCmpUuid(releaseProductByBatch.getComponentUuId());
+                if (isAPerson) {
+                    product.setSpec(releaseProductByBatch.getPackaging());
+                }
+                String batchCode = "PNUM" + createNumberService.getTimeNumber("trade$product_import_num", 8);
+                product.setCode(batchCode);
+                products.add(product);
+            }
 		}
 		return products;
 	}