10 changed files with 51 additions and 112 deletions
--- a/mall-common/src/main/java/com/suisung/mall/common/utils/ProductTitleUtil.java
+++ b/mall-common/src/main/java/com/suisung/mall/common/utils/ProductTitleUtil.java
@ -26,8 +26,7 @@ public class ProductTitleUtil {
            "特价", "折扣", "优惠", "促销", "限时", "秒杀", "抢购", "直降", "满减",
            "赠品", "包邮", "新品", "热卖", "爆款", "推荐", "精选", "特惠", "清仓",
            "正品", "原装", "官方", "正版", "品牌", "优质", "好用", "新款", "老款",
-            "【", "】", "（", "）", "[]", "()", "「", "」", "！", "！！", "??", "?",
-            "袋装","盒装","约","精品","加工","新","鲜"
+            "【", "】", "（", "）", "[]", "()", "「", "」", "！", "！！", "??", "?","袋装","盒装","约"
    )));

    /**
--- a/mall-shop/src/main/java/com/suisung/mall/shop/product/controller/admin/ShopProductItemController.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/product/controller/admin/ShopProductItemController.java
@ -7,9 +7,10 @@ import com.suisung.mall.shop.product.service.ShopProductItemService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;

 /**
 * <p>
@ -86,13 +87,13 @@ public class ShopProductItemController {

    /**
     * 编辑库存和价格
-     * @param shopProductItemList
+     * @param shopProductItem
     * @return
     */
    @ApiOperation(value = "商品表-SKU表   商品名称（产品名称+颜色规格名称） =shop_product_item-编辑", notes = "商品表-SKU表   商品名称（产品名称+颜色规格名称） =shop_product_item-编辑")
    @RequestMapping(value = "/editQuantity", method = RequestMethod.POST)
-    public CommonResult editQuantity(@RequestBody List<ShopProductItem> shopProductItemList) {
-        return shopProductItemService.editQuantity(shopProductItemList);
+    public CommonResult editQuantity(ShopProductItem shopProductItem) {
+        return shopProductItemService.editQuantity(shopProductItem);
    }

 }
--- a/mall-shop/src/main/java/com/suisung/mall/shop/product/mapper/ShopProductItemSeqMapper.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/product/mapper/ShopProductItemSeqMapper.java
@ -15,5 +15,5 @@ import org.springframework.stereotype.Repository;

@Repository
 public interface ShopProductItemSeqMapper extends BaseMapper<ShopProductItemSeq> {
-    int updateSeqIdByItemIdAndProductId(ShopProductItemSeq shopProductItemSeq);
+
 }
--- a/mall-shop/src/main/java/com/suisung/mall/shop/product/service/ShopProductItemSeqService.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/product/service/ShopProductItemSeqService.java
@ -13,5 +13,4 @@ import com.suisung.mall.core.web.service.IBaseService;
 */
 public interface ShopProductItemSeqService extends IBaseService<ShopProductItemSeq> {

-    int updateSeqIdByItemIdAndProductId(ShopProductItemSeq shopProductItemSeq);
 }
--- a/mall-shop/src/main/java/com/suisung/mall/shop/product/service/ShopProductItemService.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/product/service/ShopProductItemService.java
@ -91,5 +91,5 @@ public interface ShopProductItemService extends IBaseService<ShopProductItem> {
     *  修改item的价格和库存
     * @param: ShopProductItem
     */
-    CommonResult editQuantity(List<ShopProductItem> shopProductItemList);
+    CommonResult editQuantity(ShopProductItem shopProductItem);
 }
--- a/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java
@ -1007,19 +1007,6 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl<ShopProductBaseM

            //判断是否存在
            ShopProductItemSeq product_item_seq_row = shopProductItemSeqService.get(product_item_seq_id);
-            //新增反向校验
-            if(null == product_item_seq_row){
-                QueryWrapper<ShopProductItemSeq> itemSeqQueryWrapper = new QueryWrapper<>();
-                itemSeqQueryWrapper.eq("item_id",item_row.getItem_id());
-                itemSeqQueryWrapper.eq("product_id",item_row.getProduct_id());
-                product_item_seq_row= shopProductItemSeqService.findOne(itemSeqQueryWrapper);
-                if(null!=product_item_seq_row){
-                    product_item_seq_row.setProduct_item_seq_id(product_item_seq_id);
-                    product_item_seq_row.setProduct_item_seq_val(product_item_seq_val);
-                    shopProductItemSeqService.updateSeqIdByItemIdAndProductId(product_item_seq_row);
-                }
-            }
-
            if (null != product_item_seq_row) {
                item_id = product_item_seq_row.getItem_id();
            } else {
--- a/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductItemSeqServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductItemSeqServiceImpl.java
@ -4,7 +4,6 @@ import com.suisung.mall.common.modules.product.ShopProductItemSeq;
 import com.suisung.mall.core.web.service.impl.BaseServiceImpl;
 import com.suisung.mall.shop.product.mapper.ShopProductItemSeqMapper;
 import com.suisung.mall.shop.product.service.ShopProductItemSeqService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;


@ -18,11 +17,4 @@ import org.springframework.stereotype.Service;
 */
@Service
 public class ShopProductItemSeqServiceImpl extends BaseServiceImpl<ShopProductItemSeqMapper, ShopProductItemSeq> implements ShopProductItemSeqService {
-
-    @Autowired
-    private ShopProductItemSeqMapper shopProductItemSeqMapper;
-    @Override
-    public int updateSeqIdByItemIdAndProductId(ShopProductItemSeq shopProductItemSeq) {
-        return shopProductItemSeqMapper.updateSeqIdByItemIdAndProductId(shopProductItemSeq);
-    }
 }
--- a/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductItemServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductItemServiceImpl.java
@ -2294,18 +2294,8 @@ public class ShopProductItemServiceImpl extends BaseServiceImpl<ShopProductItemM

    @Override
    @Transactional(rollbackFor = Exception.class)
-    public CommonResult editQuantity(List<ShopProductItem> shopProductItemList) {
-        if(shopProductItemList.isEmpty()){
-            return CommonResult.failed("修改数据不能为空");
-        }
-        if(shopProductItemList.size()>10){
-            return CommonResult.failed("修改数据不能超过10条");
-        }
+    public CommonResult editQuantity(ShopProductItem shopProductItem) {
        QueryWrapper<ShopProductItem> queryWrapper = new QueryWrapper<>();
-        List<ShopProductItem> updateShopProductItem=new ArrayList<>();
-        List<ShopProductBase> updateShopProductBase=new ArrayList<>();
-        List<ShopProductIndex> updateShopProductIndex=new ArrayList<>();
-        for (ShopProductItem shopProductItem : shopProductItemList) {
        queryWrapper.eq("product_id",shopProductItem.getProduct_id());
        List<ShopProductItem> oldShopProductItems= shopProductItemService.list(queryWrapper);
        List<ShopProductItem> oldShopProductItemList= oldShopProductItems.stream().filter(s -> s.getItem_id().equals(shopProductItem.getItem_id())).collect(Collectors.toList());
@ -2331,8 +2321,7 @@ public class ShopProductItemServiceImpl extends BaseServiceImpl<ShopProductItemM
            shopProductBase.setProduct_unit_price(item_unit_price);
            shopProductIndex.setProduct_unit_price(item_unit_price);
            shopProductIndex.setProduct_id(shopProductItem.getProduct_id());
-                updateShopProductBase.add(shopProductBase);
-               // shopProductBaseService.updateById(shopProductBase);
+            shopProductBaseService.updateById(shopProductBase);
        }
        BigDecimal item_unit_price_max_old=oldShopProductItems.stream().map(ShopProductItem::getItem_unit_price).max(BigDecimal::compareTo).get();
        if(item_unit_price_max.compareTo(item_unit_price_max_old)>0){
@ -2340,21 +2329,11 @@ public class ShopProductItemServiceImpl extends BaseServiceImpl<ShopProductItemM
            shopProductIndex.setProduct_unit_price_max(item_unit_price_max);
        }
        if(ObjectUtil.isNotEmpty(shopProductIndex.getProduct_id())){
-                updateShopProductIndex.add(shopProductIndex);
-                //shopProductIndexService.updateById(shopProductIndex);
+            shopProductIndexService.updateById(shopProductIndex);
        }
        oldShopProductItem.setItem_quantity(shopProductItem.getItem_quantity());
        oldShopProductItem.setItem_unit_price(shopProductItem.getItem_unit_price());
-            updateShopProductItem.add(oldShopProductItem);
-           // shopProductItemService.updateById(oldShopProductItem);
-        }
-        if(!updateShopProductBase.isEmpty()){
-            shopProductBaseService.updateBatchById(updateShopProductBase);
-        }
-        if(!updateShopProductIndex.isEmpty()){
-            shopProductIndexService.updateBatchById(updateShopProductIndex);
-        }
-        shopProductItemService.updateBatchById(updateShopProductItem);
+        shopProductItemService.updateById(oldShopProductItem);
        return CommonResult.success();
    }
 }
--- a/mall-shop/src/main/java/com/suisung/mall/shop/user/service/impl/ShopUserCartServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/user/service/impl/ShopUserCartServiceImpl.java
@ -36,7 +36,6 @@ import com.suisung.mall.common.pojo.dto.SameCityDeliveryFeeRespDTO;
 import com.suisung.mall.common.service.MessageService;
 import com.suisung.mall.common.utils.CheckUtil;
 import com.suisung.mall.common.utils.I18nUtil;
-import com.suisung.mall.common.utils.StringUtils;
 import com.suisung.mall.core.web.service.impl.BaseServiceImpl;
 import com.suisung.mall.shop.base.service.AccountBaseConfigService;
 import com.suisung.mall.shop.base.service.ShopBaseStateCodeService;
@ -414,7 +413,6 @@ public class ShopUserCartServiceImpl extends BaseServiceImpl<ShopUserCartMapper,
                // 采购判断 先放入此处
                String from = getParameter("from");
                Integer item_quantity = Convert.toInt(item_row.get("item_quantity"));
-                if(StringUtils.isNotEmpty(from)){
                if ("manage".equals(from) && item_quantity < cart_quantity) {
                    throw new ApiException(I18nUtil._("当前商品只可购买") + item_quantity + I18nUtil._("件，请确认！"));
                } else if ("manage".equals(from) && cart_quantity <= 0) {
@ -424,17 +422,6 @@ public class ShopUserCartServiceImpl extends BaseServiceImpl<ShopUserCartMapper,
                        throw new ApiException(ResultCode.FAILED);
                    }
                }
-                }else {
-                    if (item_quantity < cart_quantity) {
-                        throw new ApiException(I18nUtil._("当前商品只可购买") + item_quantity + I18nUtil._("件，请确认！"));
-                    } else if (cart_quantity <= 0) {
-                        throw new ApiException(I18nUtil._("最低备货数量 1 件，请确认！"));
-                    } else {
-                        if (!addCart(data)) {
-                            throw new ApiException(ResultCode.FAILED);
-                        }
-                    }
-                }
                data.putAll(item_row);
            }
        }
--- a/mall-shop/src/main/resources/mapper/product/ShopProductItemSeqMapper.xml
+++ b/mall-shop/src/main/resources/mapper/product/ShopProductItemSeqMapper.xml
@ -7,9 +7,4 @@
        product_item_seq_id, product_item_seq_val, item_id, product_id
    </sql>

-    <update id="updateSeqIdByItemIdAndProductId" parameterType="com.suisung.mall.common.modules.product.ShopProductItemSeq">
-        update shop_product_item_seq set product_item_seq_val=#{product_item_seq_val},
-                                             product_item_seq_id=#{product_item_seq_id}
-        where item_id=#{item_id} and product_id=#{product_id}
-    </update>
 </mapper>