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

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
SongZhang
2024-08-30 15:27:42 +08:00
parent 26f6af0256 77f01cabdc
commit d6756ee2e3
3 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/ShopUserMapper.java
View File

@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Select;
public interface ShopUserMapper extends BaseMapper<TbShopUser> { public interface ShopUserMapper extends BaseMapper<TbShopUser> {
@Select("<script>" + @Select("<script>" +
"SELECT su.id as id, su.head_img as headImg, su.name as nickName, su.sex as sex, " + "SELECT su.id as id, su.user_id as user_id, su.head_img as headImg, su.name as nickName, su.sex as sex, " +
"su.amount as amount, 0 as totalScore, su.telephone as telephone, u.last_log_in_at as lastLoginAt, " + "su.amount as amount, 0 as totalScore, su.telephone as telephone, u.last_log_in_at as lastLoginAt, " +
"su.birth_day as birthDay, su.is_vip as isVip, su.created_at as createAt " + "su.birth_day as birthDay, su.is_vip as isVip, su.created_at as createAt " +
"FROM tb_shop_user su " + "FROM tb_shop_user su " +

15
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopUserServiceImpl.java
View File

@@ -73,10 +73,15 @@ public class TbShopUserServiceImpl implements TbShopUserService {
shopUserInfoVo.setTotalScore(0); shopUserInfoVo.setTotalScore(0);
}); });
} }
Integer orderNumber=tbOrderInfoRepository.countByUserIdAndStatusAndShopId(shopUserInfoVo.getId().toString(),criteria.getShopId());
shopUserInfoVo.setOrderNumber(Objects.isNull(orderNumber)?0:orderNumber);
shopUserInfoVo.setInMoney(tbShopUserRepository.sumAmount(shopUserInfoVo.getId()));
if (shopUserInfoVo.getUserId() == null) {
shopUserInfoVo.setUserId(0);
shopUserInfoVo.setOrderNumber(0);
} else {
Integer orderNumber = tbOrderInfoRepository.countByUserIdAndStatusAndShopId(shopUserInfoVo.getUserId().toString(), criteria.getShopId());
shopUserInfoVo.setOrderNumber(Objects.isNull(orderNumber) ? 0 : orderNumber);
}
shopUserInfoVo.setInMoney(tbShopUserRepository.sumAmount(shopUserInfoVo.getId()));
} }
return PageUtil.toPlusPage(iPage.getRecords(), Integer.valueOf(iPage.getTotal() + "")); return PageUtil.toPlusPage(iPage.getRecords(), Integer.valueOf(iPage.getTotal() + ""));
@@ -209,7 +214,6 @@ public class TbShopUserServiceImpl implements TbShopUserService {
} }
TbShopUser tbShopUser = tbShopUserRepository.getById(Integer.valueOf(map.get("id") + "")); TbShopUser tbShopUser = tbShopUserRepository.getById(Integer.valueOf(map.get("id") + ""));
if (ObjectUtil.isNull(tbShopUser)) { if (ObjectUtil.isNull(tbShopUser)) {
throw new BadRequestException("不存在的会员信息"); throw new BadRequestException("不存在的会员信息");
@@ -224,7 +228,6 @@ public class TbShopUserServiceImpl implements TbShopUserService {
} }
String type = map.get("type").toString(); String type = map.get("type").toString();
TbShopUserFlow flow = new TbShopUserFlow(); TbShopUserFlow flow = new TbShopUserFlow();
@@ -254,8 +257,6 @@ public class TbShopUserServiceImpl implements TbShopUserService {
tbShopUserFlowMapper.insert(flow); tbShopUserFlowMapper.insert(flow);
} }
} }

1
eladmin-system/src/main/java/cn/ysk/cashier/vo/ShopUserInfoVo.java
View File

@@ -23,6 +23,7 @@ import java.math.BigDecimal;
@Data @Data
public class ShopUserInfoVo implements Serializable { public class ShopUserInfoVo implements Serializable {
private Integer id; private Integer id;
private Integer userId;
private String headImg; private String headImg;
private String nickName; private String nickName;
private Object sex; private Object sex;