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

shopUser增加 店铺名称字段

Browse Source
This commit is contained in:
wangw
2024-07-03 16:29:11 +08:00
parent 09bfa5bdec
commit 376134fc19
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/chaozhanggui/system/cashierservice/controller/UserContoller.java
View File

@@ -7,9 +7,11 @@ import cn.hutool.core.util.RandomUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.chaozhanggui.system.cashierservice.dao.TbMerchantAccountMapper; import com.chaozhanggui.system.cashierservice.dao.TbMerchantAccountMapper;
import com.chaozhanggui.system.cashierservice.dao.TbShopInfoMapper;
import com.chaozhanggui.system.cashierservice.dao.TbShopUserMapper; import com.chaozhanggui.system.cashierservice.dao.TbShopUserMapper;
import com.chaozhanggui.system.cashierservice.dao.TbUserInfoMapper; import com.chaozhanggui.system.cashierservice.dao.TbUserInfoMapper;
import com.chaozhanggui.system.cashierservice.entity.TbMerchantAccount; import com.chaozhanggui.system.cashierservice.entity.TbMerchantAccount;
import com.chaozhanggui.system.cashierservice.entity.TbShopInfo;
import com.chaozhanggui.system.cashierservice.entity.TbShopUser; import com.chaozhanggui.system.cashierservice.entity.TbShopUser;
import com.chaozhanggui.system.cashierservice.entity.TbUserInfo; import com.chaozhanggui.system.cashierservice.entity.TbUserInfo;
import com.chaozhanggui.system.cashierservice.entity.dto.AuthUserDto; import com.chaozhanggui.system.cashierservice.entity.dto.AuthUserDto;
@@ -55,6 +57,8 @@ public class UserContoller {
@Autowired @Autowired
private TbShopUserMapper shopUserMapper; private TbShopUserMapper shopUserMapper;
@Autowired @Autowired
private TbShopInfoMapper shopInfoMapper;
@Autowired
private TbUserInfoMapper userInfoMapper; private TbUserInfoMapper userInfoMapper;
// @GetMapping("/userInfo") // @GetMapping("/userInfo")
@@ -80,6 +84,7 @@ public class UserContoller {
@GetMapping("/shopUserInfo") @GetMapping("/shopUserInfo")
public Result shopUserInfo(@RequestParam("userId") String userId ,@RequestHeader("openId") String openId,@RequestParam("shopId") String shopId ) throws Exception { public Result shopUserInfo(@RequestParam("userId") String userId ,@RequestHeader("openId") String openId,@RequestParam("shopId") String shopId ) throws Exception {
TbShopUser shopUser=new TbShopUser(); TbShopUser shopUser=new TbShopUser();
TbShopInfo tbShopInfo = shopInfoMapper.selectByPrimaryKey(Integer.valueOf(shopId));
if (StringUtils.isNotBlank(shopId) && !shopId.equals("null")) { if (StringUtils.isNotBlank(shopId) && !shopId.equals("null")) {
shopUser = shopUserMapper.selectByUserIdAndShopId(userId, shopId); shopUser = shopUserMapper.selectByUserIdAndShopId(userId, shopId);
if (ObjectUtil.isEmpty(shopUser)) { if (ObjectUtil.isEmpty(shopUser)) {
@@ -116,6 +121,7 @@ public class UserContoller {
}else { }else {
shopUser.setAmount(BigDecimal.ZERO); shopUser.setAmount(BigDecimal.ZERO);
} }
shopUser.setShopName(tbShopInfo.getShopName());
return Result.success(CodeEnum.SUCCESS,shopUser); return Result.success(CodeEnum.SUCCESS,shopUser);
} }

9
src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopUser.java
View File

@@ -63,6 +63,7 @@ public class TbShopUser implements Serializable {
private Long updatedAt; private Long updatedAt;
private String miniOpenId; private String miniOpenId;
private String shopName;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@@ -295,6 +296,14 @@ public class TbShopUser implements Serializable {
return miniOpenId; return miniOpenId;
} }
public String getShopName() {
return shopName;
}
public void setShopName(String shopName) {
this.shopName = shopName;
}
public void setMiniOpenId(String miniOpenId) { public void setMiniOpenId(String miniOpenId) {
this.miniOpenId = miniOpenId == null ? null : miniOpenId.trim(); this.miniOpenId = miniOpenId == null ? null : miniOpenId.trim();
} }