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 df4b1d5..dfbf581 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateInRecordMapper.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateInRecordMapper.java @@ -37,6 +37,9 @@ public interface TbActivateInRecordMapper { int queryByVipIdAndShopIdAndProId(@Param("vipUserId") Integer vipUserId, @Param("shopId") Integer shopId,@Param("productId") Integer productId); List queryAllByVipIdAndShopIdAndProId(@Param("vipUserId") Integer vipUserId, @Param("shopId") Integer shopId,@Param("productId") Integer productId); + int countCouponNum(@Param("userId") Integer userId); + + /** * 新增数据 * diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopUserMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopUserMapper.java index a87fe71..78baab9 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopUserMapper.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopUserMapper.java @@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; +import java.math.BigDecimal; import java.util.List; import java.util.Map; @@ -32,6 +33,8 @@ public interface TbShopUserMapper { TbShopUser selectByPhoneAndShopId(@Param("phone") String phone,@Param("shopId") String shopId); TbShopUser selectPCByPhoneAndShopId(@Param("phone") String phone,@Param("shopId") String shopId); List selectAllByUserId(@Param("userId") String userId); + List selectVipByUserId(@Param("userId") Integer userId); + BigDecimal countAmount(@Param("userId") Integer userId); List selectByUserId(@Param("userId") String userId, @Param("shopId") String shopId); diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbUserInfo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbUserInfo.java index e449864..6bb7f5a 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbUserInfo.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbUserInfo.java @@ -101,7 +101,11 @@ public class TbUserInfo implements Serializable { private String pwd; - private String custPhone="400-6666-389"; + private String custPhone = "400-6666-389"; + //优惠卷数量 + private Integer couponAll = 0; + //储值数量 + private BigDecimal balanceAll = BigDecimal.ZERO; public String getAvatar() { @@ -505,4 +509,20 @@ public class TbUserInfo implements Serializable { public void setPwd(String pwd) { this.pwd = pwd; } + + public Integer getCouponAll() { + return couponAll; + } + + public void setCouponAll(Integer couponAll) { + this.couponAll = couponAll; + } + + public BigDecimal getBalanceAll() { + return balanceAll; + } + + public void setBalanceAll(BigDecimal balanceAll) { + this.balanceAll = balanceAll; + } } \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java index 4c1ba0e..5476d93 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java @@ -37,6 +37,9 @@ public class LoginService { @Autowired private TbShopUserMapper tbShopUserMapper; + @Autowired + private TbActivateInRecordMapper inRecordMapper; + @Autowired private TbShopTableMapper tbShopTableMapper; @@ -498,6 +501,9 @@ public class LoginService { if (tbUserInfo == null) { return Result.success(CodeEnum.ENCRYPT, new ArrayList()); } + tbUserInfo.setBalanceAll(tbShopUserMapper.countAmount(userId)); + tbUserInfo.setCouponAll(inRecordMapper.countCouponNum(userId)); + return Result.success(CodeEnum.ENCRYPT, tbUserInfo); } diff --git a/src/main/resources/mapper/TbActivateInRecordMapper.xml b/src/main/resources/mapper/TbActivateInRecordMapper.xml index 6d9ad84..8e47129 100644 --- a/src/main/resources/mapper/TbActivateInRecordMapper.xml +++ b/src/main/resources/mapper/TbActivateInRecordMapper.xml @@ -28,6 +28,15 @@ where id = #{id} + + + + +