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

memberIn 增加shopId merchantId

Browse Source
This commit is contained in:
GYJ
2024-06-20 15:19:03 +08:00
parent f4d177609c
commit c1790a3198
3 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/chaozhanggui/system/cashierservice/entity/TbMemberIn.java
View File

@@ -21,6 +21,8 @@ public class TbMemberIn implements Serializable {
private String tradeNo;
private String shopId;
private Date createTime;
private Date updateTime;
@@ -91,6 +93,14 @@ public class TbMemberIn implements Serializable {
this.tradeNo = tradeNo == null ? null : tradeNo.trim();
}
public String getShopId() {
return shopId;
}
public void setShopId(String shopId) {
this.shopId = shopId;
}
public Date getCreateTime() {
return createTime;
}
@@ -106,4 +116,4 @@ public class TbMemberIn implements Serializable {
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
}
}

4
src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java
View File

@@ -213,12 +213,14 @@ public class MemberService {
BigDecimal amount = new BigDecimal(String.valueOf(map.get("amount"))).setScale(2, RoundingMode.DOWN);
TbMemberIn memberIn = new TbMemberIn();
memberIn.setMerchantId(Integer.valueOf(shopInfo.getMerchantId()));
memberIn.setAmount(amount);
memberIn.setUserId(shopUser.getId());
memberIn.setCode(shopUser.getCode());
memberIn.setStatus("7");
memberIn.setMerchantId(Integer.valueOf(shopInfo.getMerchantId()));
memberIn.setCreateTime(new Date());
memberIn.setShopId(shopId);
tbMemberInMapper.insert(memberIn);
TbMerchantThirdApply thirdApply = tbMerchantThirdApplyMapper.selectByPrimaryKey(Integer.valueOf(shopInfo.getMerchantId()));
@@ -540,12 +542,14 @@ public class MemberService {
BigDecimal amount = new BigDecimal(String.valueOf(map.get("amount"))).setScale(2, RoundingMode.DOWN);
TbMemberIn memberIn = new TbMemberIn();
memberIn.setMerchantId(Integer.valueOf(shopInfo.getMerchantId()));
memberIn.setAmount(amount);
memberIn.setUserId(shopUser.getId());
memberIn.setCode(shopUser.getCode());
memberIn.setStatus("0");
memberIn.setCreateTime(new Date());
memberIn.setTradeNo("cash".concat(SnowFlakeUtil.generateOrderNo()));
memberIn.setShopId(shopId);
tbMemberInMapper.insert(memberIn);
shopUser.setAmount(shopUser.getAmount().add(amount));