Merge remote-tracking branch 'origin/release-201831-wangcz' into release-201831-wangcz

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

@@ -603,34 +603,39 @@ public class ProductServiceImpl implements ProductService {
                 }
                 StringUtilB2C.removeFromList(ids, productPerson.getProductId());
             }
-            //删除匹配结果信息
-            productMatchResultDao.deleteByProductids(ids);
-
-            //更新在售产品信息
-            List<Goods> goodses = goodsService.findByProductids(ids);
-            goodsService.deleteGoods(goodses);
-
-            //调整物料为禁用状态。
-            List<ProductPrivate> productPrivates = productPrivateService.findByPrIds(ids);
-            for (ProductPrivate productPrivate : productPrivates) {
-                productPrivate.setB2cEnabled(IntegerConstant.NO_SHORT);
-                StringUtilB2C.removeFromList(ids, productPrivate.getPrId());
-            }
-            ProductPrivate pPrivate = null;
-            for (Long id : ids) {
-                pPrivate = new ProductPrivate(id);
-                if (CollectionUtils.isEmpty(productPrivates)) {
-                    productPrivates = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(ids)) {
+                //删除匹配结果信息
+                productMatchResultDao.deleteByProductids(ids);
+
+                //更新在售产品信息
+                List<Goods> goodses = goodsService.findByProductids(ids);
+                goodsService.deleteGoods(goodses);
+
+                //调整物料为禁用状态。
+                List<ProductPrivate> productPrivates = productPrivateService.findByPrIds(ids);
+                for (ProductPrivate productPrivate : productPrivates) {
+                    productPrivate.setB2cEnabled(IntegerConstant.NO_SHORT);
+                    StringUtilB2C.removeFromList(ids, productPrivate.getPrId());
+                }
+                ProductPrivate pPrivate = null;
+                for (Long id : ids) {
+                    pPrivate = new ProductPrivate(id);
+                    if (CollectionUtils.isEmpty(productPrivates)) {
+                        productPrivates = new ArrayList<>();
+                    }
+                    productPrivates.add(pPrivate);
+                }
+                if (CollectionUtils.isNotEmpty(productPrivates)) {
+                    productPrivateDao.save(productPrivates);
                 }
-                productPrivates.add(pPrivate);
-            }
-            if (CollectionUtils.isNotEmpty(productPrivates)) {
-                productPrivateDao.save(productPrivates);
             }
+            int code = 1;
             if (StringUtils.isEmpty(message)) {
                 message = "删除成功";
+            } else {
+                code = CodeType.NOT_PERMIT.code();
             }
-            return ResultMap.success(message);
+            return new ResultMap(code, message);
         }
     }
 
@@ -2442,7 +2447,7 @@ public class ProductServiceImpl implements ProductService {
             productInfo = productInfo.setByPrivate(existProducts.get(0));
             // 用户填写库存量是需要做对应的出入库。如果新填写的库存数大于原库存数，做入库。否则做出库。
             inOutbound = recordInventory(product, existProducts.get(0));
-            BeanUtils.copyProperties(product, productInfo, Product.class);
+            BeanUtils.copyProperties(product, productInfo, "id");
         } else {
             // 物料不存在，新增操作
             productInfo = product;
@@ -2698,7 +2703,8 @@ public class ProductServiceImpl implements ProductService {
         }
         final Double minBuyQty = goods.getMinBuyQty();
         // 判断前端传入的分段价格是默认的值还是填写错误
-        int size = goods.getOriginalPrices().size();
+        List<GoodsQtyPrice> qtyPrices = goods.getOriginalPrices();
+        int size = qtyPrices.size();
         if (size == 1) {
             GoodsQtyPrice qtyPrice = goods.getOriginalPrices().get(0);
             // 前端设置的默认值，不用保存
@@ -2708,7 +2714,7 @@ public class ProductServiceImpl implements ProductService {
         } else if (size > 1) {
             StringBuffer errMsg = new StringBuffer();
             for (int i = 0; i < size; i++) {
-                if (null == goods.getOriginalPrices().get(i).getPrice()) {
+                if (null == qtyPrices.get(i).getRMBPrice() && null == qtyPrices.get(i).getUSDPrice()) {
                     jointErrMsg(errMsg, String.valueOf(i + 1));
                 }
             }

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

@@ -4435,7 +4435,11 @@ define(['app/app', 'jquery-uploadify'], function(app) {
           var idStr = $scope.ids.join(',');
           if (chooseTypePeople === 'all') {
             Material.deleteBatch({ids: idStr}, function (data) {
-              toaster.pop('success', '删除成功');
+                if(data.code === 1) {
+                    toaster.pop('success', '删除成功');
+                } else {
+                    toaster.pop('info', '提示', data.message);
+                }
               $scope.deleteModal = false;
               $modalInstance.close(data);
             }, function (response) {

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

@@ -4243,7 +4243,11 @@ define(['app/app', 'jquery-uploadify'], function(app) {
           var idStr = $scope.ids.join(',');
           if (chooseTypePeople === 'all') {
             Material.deleteBatch({ids: idStr}, function (data) {
-              toaster.pop('success', '删除成功');
+              if(data.code === 1) {
+                  toaster.pop('success', '删除成功');
+              } else {
+                  toaster.pop('info', '提示', data.message);
+              }
               $scope.deleteModal = false;
               $modalInstance.close(data);
             }, function (response) {