czg_team/wx-cashier-service
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ww' into test

Browse Source 
# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateInRecordMapper.java
#	src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbActivateInRecordServiceImpl.java
#	src/main/resources/mapper/TbActivateInRecordMapper.xml
This commit is contained in:
wangw
2024-08-23 10:06:27 +08:00
parent 7b71eced36 7b09e827fd
commit 37fffa0f98
4 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateInRecordMapper.java
View File

@@ -2,9 +2,7 @@ package com.chaozhanggui.system.cashierservice.dao;
import com.chaozhanggui.system.cashierservice.entity.TbActivateInRecord; import com.chaozhanggui.system.cashierservice.entity.TbActivateInRecord;
import com.chaozhanggui.system.cashierservice.entity.TbProduct; import com.chaozhanggui.system.cashierservice.entity.TbProduct;
import com.chaozhanggui.system.cashierservice.entity.vo.VipProductsLimits;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.data.domain.Pageable;
import java.util.List; import java.util.List;

2
src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
View File

@@ -821,7 +821,7 @@ public class CartService {
} catch (Exception e) { } catch (Exception e) {
log.info("长链接错误 addCart{}", e.getMessage()); log.info("长链接错误 createOrder{}", e.getMessage());
e.printStackTrace(); e.printStackTrace();
} }
} }

5
src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbActivateInRecordServiceImpl.java
View File

@@ -35,11 +35,6 @@ public class TbActivateInRecordServiceImpl implements TbActivateInRecordService
@Override @Override
public List<TbProduct> queryByVipIdAndShopId(Integer vipUserId, Integer shopId) { public List<TbProduct> queryByVipIdAndShopId(Integer vipUserId, Integer shopId) {
// List<TbProduct> tbProducts = tbActivateInRecordMapper.queryByVipIdAndShopId(vipUserId, shopId);
// for (TbProduct tbProduct : tbProducts) {
// tbProduct.setLimitNumber(tbActivateInRecordMapper.queryByVipIdAndShopIdAndProId(vipUserId, shopId,tbProduct.getId()));
// }
// return tbProducts;
return tbActivateInRecordMapper.queryByVipIdAndShopId(vipUserId, shopId); return tbActivateInRecordMapper.queryByVipIdAndShopId(vipUserId, shopId);
} }

4
src/main/resources/mapper/TbActivateInRecordMapper.xml
View File

@@ -53,9 +53,9 @@
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from tb_activate_in_record from tb_activate_in_record
WHERE WHERE
vip_user_id = #{id} vip_user_id = #{vipUserId}
and shop_id = #{shopId} and shop_id = #{shopId}
and pro_id = #{proId} and pro_id = #{productId}
and over_num > 0 and over_num > 0
order by create_time order by create_time
</select> </select>