diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateInRecordMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateInRecordMapper.java index 3a0ba10..7a5a8f8 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateInRecordMapper.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateInRecordMapper.java @@ -2,9 +2,7 @@ package com.chaozhanggui.system.cashierservice.dao; import com.chaozhanggui.system.cashierservice.entity.TbActivateInRecord; import com.chaozhanggui.system.cashierservice.entity.TbProduct; -import com.chaozhanggui.system.cashierservice.entity.vo.VipProductsLimits; import org.apache.ibatis.annotations.Param; -import org.springframework.data.domain.Pageable; import java.util.List; diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java index 44cfe6f..cb5e0c6 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java @@ -821,7 +821,7 @@ public class CartService { } catch (Exception e) { - log.info("长链接错误 addCart{}", e.getMessage()); + log.info("长链接错误 createOrder{}", e.getMessage()); e.printStackTrace(); } } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbActivateInRecordServiceImpl.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbActivateInRecordServiceImpl.java index efcba84..a3cb707 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbActivateInRecordServiceImpl.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbActivateInRecordServiceImpl.java @@ -35,11 +35,6 @@ public class TbActivateInRecordServiceImpl implements TbActivateInRecordService @Override public List queryByVipIdAndShopId(Integer vipUserId, Integer shopId) { -// List tbProducts = tbActivateInRecordMapper.queryByVipIdAndShopId(vipUserId, shopId); -// for (TbProduct tbProduct : tbProducts) { -// tbProduct.setLimitNumber(tbActivateInRecordMapper.queryByVipIdAndShopIdAndProId(vipUserId, shopId,tbProduct.getId())); -// } -// return tbProducts; return tbActivateInRecordMapper.queryByVipIdAndShopId(vipUserId, shopId); } diff --git a/src/main/resources/mapper/TbActivateInRecordMapper.xml b/src/main/resources/mapper/TbActivateInRecordMapper.xml index 27c4cb5..aa51b93 100644 --- a/src/main/resources/mapper/TbActivateInRecordMapper.xml +++ b/src/main/resources/mapper/TbActivateInRecordMapper.xml @@ -53,9 +53,9 @@ from tb_activate_in_record WHERE - vip_user_id = #{id} + vip_user_id = #{vipUserId} and shop_id = #{shopId} - and pro_id = #{proId} + and pro_id = #{productId} and over_num > 0 order by create_time