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 17:31:20 +08:00
parent 84e4a21064
commit 203332e232
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -742,7 +742,6 @@ public class MemberService {
} }
TbShopUser user = tbShopUserMapper.selectByPrimaryKey(flow.getShopUserId()); TbShopUser user = tbShopUserMapper.selectByPrimaryKey(flow.getShopUserId());
if (ObjectUtil.isEmpty(user) || ObjectUtil.isNull(user)) { if (ObjectUtil.isEmpty(user) || ObjectUtil.isNull(user)) {
@@ -754,18 +753,12 @@ public class MemberService {
} }
TbShopInfo shopInfo = tbShopInfoMapper.selectByPrimaryKey(Integer.valueOf(user.getShopId())); TbShopInfo shopInfo = tbShopInfoMapper.selectByPrimaryKey(Integer.valueOf(user.getShopId()));
if (ObjectUtil.isEmpty(shopInfo) || ObjectUtil.isNull(shopInfo)) { if (ObjectUtil.isEmpty(shopInfo) || ObjectUtil.isNull(shopInfo)) {
return Result.fail(CodeEnum.MERCHANTEIXST); return Result.fail(CodeEnum.MERCHANTEIXST);
} }
if ("scanMemberIn".equals(flow.getBizCode())) { if ("scanMemberIn".equals(flow.getBizCode())) {
TbMerchantThirdApply thirdApply = tbMerchantThirdApplyMapper.selectByPrimaryKey(Integer.valueOf(shopInfo.getMerchantId())); TbMerchantThirdApply thirdApply = tbMerchantThirdApplyMapper.selectByPrimaryKey(Integer.valueOf(shopInfo.getMerchantId()));
if (ObjectUtil.isEmpty(thirdApply) || ObjectUtil.isNull(thirdApply)) { if (ObjectUtil.isEmpty(thirdApply) || ObjectUtil.isNull(thirdApply)) {
@@ -800,6 +793,19 @@ public class MemberService {
tbShopUserFlowMapper.updateByPrimaryKey(flow); tbShopUserFlowMapper.updateByPrimaryKey(flow);
TbShopUserFlow userFlow = new TbShopUserFlow();
userFlow.setShopUserId(user.getId());
userFlow.setBizCode("memberReturn");
userFlow.setBizName("会员退款");
userFlow.setType("-");
userFlow.setAmount(new BigDecimal(amount));
userFlow.setBalance(user.getAmount());
userFlow.setCreateTime(new Date());
userFlow.setIsReturn("1");
userFlow.setRemark(flowId);
tbShopUserFlowMapper.insert(userFlow);
JSONObject baObj = new JSONObject(); JSONObject baObj = new JSONObject();
baObj.put("userId", user.getUserId()); baObj.put("userId", user.getUserId());
baObj.put("shopId", user.getId()); baObj.put("shopId", user.getId());