fix: 删除isVip相关代码
This commit is contained in:
@@ -96,10 +96,9 @@ public class ProductController {
|
|||||||
@RequestParam(value = "code", required = false) String code,
|
@RequestParam(value = "code", required = false) String code,
|
||||||
@RequestParam("shopId") String shopId,
|
@RequestParam("shopId") String shopId,
|
||||||
@RequestParam("productId") String productId,
|
@RequestParam("productId") String productId,
|
||||||
@RequestParam("spec_tag") String spec_tag,
|
@RequestParam("spec_tag") String spec_tag
|
||||||
@RequestParam("isVip") String isVip
|
|
||||||
) {
|
) {
|
||||||
return productService.queryProductSku(code,shopId, productId, spec_tag,isVip);
|
return productService.queryProductSku(code,shopId, productId, spec_tag);
|
||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping("addCart")
|
@PostMapping("addCart")
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ public interface TbProductMapper {
|
|||||||
|
|
||||||
List<TbProduct> selectByIds(@Param("list") List<String> ids);
|
List<TbProduct> selectByIds(@Param("list") List<String> ids);
|
||||||
Integer selectByQcode(@Param("code") String code,@Param("productId") Integer productId,@Param("shopId") String shopId);
|
Integer selectByQcode(@Param("code") String code,@Param("productId") Integer productId,@Param("shopId") String shopId);
|
||||||
Integer selectByCodeAndSkuId(@Param("code") String code,@Param("skuId") Integer skuId,@Param("shopId") String shopId,@Param("isVip") String isVip);
|
Integer selectByCodeAndSkuId(@Param("code") String code,@Param("skuId") Integer skuId,@Param("shopId") String shopId);
|
||||||
Integer selectByNewQcode(@Param("code") String code,@Param("productId") Integer productId,@Param("shopId") String shopId,@Param("list") List<String> list);
|
Integer selectByNewQcode(@Param("code") String code,@Param("productId") Integer productId,@Param("shopId") String shopId,@Param("list") List<String> list);
|
||||||
|
|
||||||
List<ShopGroupInfoVo> selGroups(@Param("proName") String proName,@Param("type") String type,
|
List<ShopGroupInfoVo> selGroups(@Param("proName") String proName,@Param("type") String type,
|
||||||
|
|||||||
@@ -574,8 +574,8 @@ public class ProductService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public Result queryProductSku(String code, String shopId, String productId, String spec_tag,String isVip) {
|
public Result queryProductSku(String code, String shopId, String productId, String spec_tag) {
|
||||||
if (ObjectUtil.isEmpty(shopId) || ObjectUtil.isEmpty(productId) || StringUtils.isEmpty(isVip)|| isVip.equals("undefined") ) {
|
if (ObjectUtil.isEmpty(shopId) || ObjectUtil.isEmpty(productId) ) {
|
||||||
return Result.fail("参数错误");
|
return Result.fail("参数错误");
|
||||||
}
|
}
|
||||||
TbProductSkuWithBLOBs tbProductSkuWithBLOBs = tbProductSkuMapper.selectByShopIdAndProductIdAndSpec(shopId, productId, spec_tag);
|
TbProductSkuWithBLOBs tbProductSkuWithBLOBs = tbProductSkuMapper.selectByShopIdAndProductIdAndSpec(shopId, productId, spec_tag);
|
||||||
@@ -588,7 +588,7 @@ public class ProductService {
|
|||||||
tbProductSkuWithBLOBs.setId(null);
|
tbProductSkuWithBLOBs.setId(null);
|
||||||
}else {
|
}else {
|
||||||
if (StringUtils.isNotBlank(code)) {
|
if (StringUtils.isNotBlank(code)) {
|
||||||
Integer sum = tbProductMapper.selectByCodeAndSkuId(code, tbProductSkuWithBLOBs.getId(), shopId,isVip);
|
Integer sum = tbProductMapper.selectByCodeAndSkuId(code, tbProductSkuWithBLOBs.getId(), shopId);
|
||||||
tbProductSkuWithBLOBs.setNumber(sum);
|
tbProductSkuWithBLOBs.setNumber(sum);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -137,7 +137,6 @@
|
|||||||
AND t.sku_id = #{skuId}
|
AND t.sku_id = #{skuId}
|
||||||
AND t.`status` = 'create'
|
AND t.`status` = 'create'
|
||||||
AND t.table_id = #{code}
|
AND t.table_id = #{code}
|
||||||
AND t.is_vip = #{isVip}
|
|
||||||
</select>
|
</select>
|
||||||
<select id="selectByNewQcode" resultType="java.lang.Integer">
|
<select id="selectByNewQcode" resultType="java.lang.Integer">
|
||||||
SELECT
|
SELECT
|
||||||
|
|||||||
Reference in New Issue
Block a user