diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbMemberIn.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbMemberIn.java index 476ca5a..1bf44e4 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbMemberIn.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbMemberIn.java @@ -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; } -} \ No newline at end of file +} diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java index daaff29..8719dab 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java @@ -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)); diff --git a/src/main/resources/mapper/TbMemberInMapper.xml b/src/main/resources/mapper/TbMemberInMapper.xml index fa4a76b..377d3af 100644 --- a/src/main/resources/mapper/TbMemberInMapper.xml +++ b/src/main/resources/mapper/TbMemberInMapper.xml @@ -10,15 +10,16 @@ + - id, user_id, merchant_id, code, amount, status, order_no, trade_no, create_time, + id, user_id, merchant_id, code, amount, status, order_no, trade_no, shop_id, create_time, update_time