memberIn 增加shopId merchantId
This commit is contained in:
@@ -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));
|
||||
|
||||
Reference in New Issue
Block a user