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

修改

Browse Source
This commit is contained in:
牛叉闪闪
2024-08-29 15:10:31 +08:00
parent ad0c743ae4
commit 88526e0dd9
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -304,6 +304,7 @@ public class MemberService {
flow.setAmount(amount); flow.setAmount(amount);
flow.setBalance(shopUser.getAmount()); flow.setBalance(shopUser.getAmount());
flow.setCreateTime(new Date()); flow.setCreateTime(new Date());
flow.setIsReturn("0");
tbShopUserFlowMapper.insert(flow); tbShopUserFlowMapper.insert(flow);
@@ -358,6 +359,7 @@ public class MemberService {
flow.setBalance(shopUser.getAmount()); flow.setBalance(shopUser.getAmount());
flow.setCreateTime(new Date()); flow.setCreateTime(new Date());
flow.setRemark(orderNo); flow.setRemark(orderNo);
flow.setIsReturn("0");
tbShopUserFlowMapper.insert(flow); tbShopUserFlowMapper.insert(flow);
BigDecimal fl=null; BigDecimal fl=null;
@@ -385,6 +387,7 @@ public class MemberService {
flow.setAmount(awardAmount); flow.setAmount(awardAmount);
flow.setBalance(shopUser.getAmount()); flow.setBalance(shopUser.getAmount());
flow.setCreateTime(new Date()); flow.setCreateTime(new Date());
flow.setIsReturn("0");
tbShopUserFlowMapper.insert(flow); tbShopUserFlowMapper.insert(flow);
fl=awardAmount; fl=awardAmount;
} }
@@ -485,6 +488,7 @@ public class MemberService {
flow.setAmount(memberIn.getAmount()); flow.setAmount(memberIn.getAmount());
flow.setBalance(shopUser.getAmount()); flow.setBalance(shopUser.getAmount());
flow.setCreateTime(new Date()); flow.setCreateTime(new Date());
flow.setIsReturn("0");
tbShopUserFlowMapper.insert(flow); tbShopUserFlowMapper.insert(flow);
return Result.success(CodeEnum.SUCCESS, memberIn); return Result.success(CodeEnum.SUCCESS, memberIn);
} }
@@ -512,6 +516,7 @@ public class MemberService {
flow.setBizName("线下充值"); flow.setBizName("线下充值");
flow.setAmount(memberIn.getAmount()); flow.setAmount(memberIn.getAmount());
flow.setBalance(shopUser.getAmount()); flow.setBalance(shopUser.getAmount());
flow.setIsReturn("0");
flow.setCreateTime(new Date()); flow.setCreateTime(new Date());
tbShopUserFlowMapper.insert(flow); tbShopUserFlowMapper.insert(flow);
@@ -539,6 +544,7 @@ public class MemberService {
flow.setBizName("充值活动奖励"); flow.setBizName("充值活动奖励");
flow.setAmount(awardAmount); flow.setAmount(awardAmount);
flow.setBalance(shopUser.getAmount()); flow.setBalance(shopUser.getAmount());
flow.setIsReturn("0");
flow.setCreateTime(new Date()); flow.setCreateTime(new Date());
@@ -659,6 +665,7 @@ public class MemberService {
flow.setAmount(amount); flow.setAmount(amount);
flow.setBalance(shopUser.getAmount()); flow.setBalance(shopUser.getAmount());
flow.setCreateTime(new Date()); flow.setCreateTime(new Date());
flow.setIsReturn("0");
tbShopUserFlowMapper.insert(flow); tbShopUserFlowMapper.insert(flow);
BigDecimal fl=null; BigDecimal fl=null;
@@ -686,6 +693,7 @@ public class MemberService {
flow.setAmount(awardAmount); flow.setAmount(awardAmount);
flow.setBalance(shopUser.getAmount()); flow.setBalance(shopUser.getAmount());
flow.setCreateTime(new Date()); flow.setCreateTime(new Date());
flow.setIsReturn("0");
tbShopUserFlowMapper.insert(flow); tbShopUserFlowMapper.insert(flow);
fl=awardAmount; fl=awardAmount;

5
src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
View File

@@ -588,6 +588,7 @@ public class PayService {
flow.setAmount(payAmount); flow.setAmount(payAmount);
flow.setBalance(user.getAmount()); flow.setBalance(user.getAmount());
flow.setCreateTime(new Date()); flow.setCreateTime(new Date());
flow.setIsReturn("0");
tbShopUserFlowMapper.insert(flow); tbShopUserFlowMapper.insert(flow);
@@ -713,6 +714,7 @@ public class PayService {
flow.setAmount(orderInfo.getOrderAmount()); flow.setAmount(orderInfo.getOrderAmount());
flow.setBalance(user.getAmount()); flow.setBalance(user.getAmount());
flow.setCreateTime(new Date()); flow.setCreateTime(new Date());
flow.setIsReturn("0");
tbShopUserFlowMapper.insert(flow); tbShopUserFlowMapper.insert(flow);
orderInfo.setPayAmount(ObjectUtil.isEmpty(payAmount) ? orderInfo.getOrderAmount() : payAmount); orderInfo.setPayAmount(ObjectUtil.isEmpty(payAmount) ? orderInfo.getOrderAmount() : payAmount);
@@ -811,6 +813,7 @@ public class PayService {
userFlow.setBizName("余额支付"); userFlow.setBizName("余额支付");
userFlow.setCreateTime(DateUtil.date()); userFlow.setCreateTime(DateUtil.date());
userFlow.setType("-"); userFlow.setType("-");
userFlow.setIsReturn("0");
mpShopUserFlowMapper.insert(userFlow); mpShopUserFlowMapper.insert(userFlow);
@@ -1226,6 +1229,7 @@ public class PayService {
flow.setAmount(newOrderInfo.getOrderAmount()); flow.setAmount(newOrderInfo.getOrderAmount());
flow.setBalance(user.getAmount()); flow.setBalance(user.getAmount());
flow.setCreateTime(new Date()); flow.setCreateTime(new Date());
flow.setIsReturn("0");
tbShopUserFlowMapper.insert(flow); tbShopUserFlowMapper.insert(flow);
@@ -1550,6 +1554,7 @@ public class PayService {
flow.setAmount(param.getRefundAmount()); flow.setAmount(param.getRefundAmount());
flow.setBalance(user.getAmount()); flow.setBalance(user.getAmount());
flow.setCreateTime(new Date()); flow.setCreateTime(new Date());
flow.setIsReturn("0");
tbShopUserFlowMapper.insert(flow); tbShopUserFlowMapper.insert(flow);
} else { } else {
TbMerchantThirdApply thirdApply = tbMerchantThirdApplyMapper.selectByPrimaryKey(groupOrderInfo.getMerchantId()); TbMerchantThirdApply thirdApply = tbMerchantThirdApplyMapper.selectByPrimaryKey(groupOrderInfo.getMerchantId());