diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java index 7b1497ed0..5abfdf08e 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java @@ -220,9 +220,12 @@ public class MemberController extends BaseController { try { String memberId = getMemberIdByAuthorization(request); dto.setMemberId(memberId); + if (StringUtils.isBlank(dto.getWalletCode())) { + throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR); + } // PageResponse pageResponse = memberService.getMemberBalanceChanges(dto); // PageResponse pageResponse = memberService.getMemberWalletLog(dto); - MemberWalletInfoVO memberWalletInfo = memberService.getMemberWalletInfo (dto); + MemberWalletInfoVO memberWalletInfo = memberService.getMemberWalletInfo(dto); response = new RestApiResponse<>(memberWalletInfo); } catch (Exception e) { logger.error("查询用户账户余额变动信息 error:", e); diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java index 2a9747228..c6c90506d 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -326,7 +326,8 @@ public class MemberService { dto.setEndDate(lastDay); // 查询会员钱包信息表,获取 本金余额 - MemberWalletInfo memberWalletInfo = memberWalletInfoService.selectByMemberId(dto.getMemberId(), null); + // MemberWalletInfo memberWalletInfo = memberWalletInfoService.selectByMemberId(dto.getMemberId(), null); + MemberWalletInfo memberWalletInfo = memberWalletInfoService.selectByWalletCode(dto.getWalletCode()); if (memberWalletInfo == null) { // 用户未注册小程序 throw new BusinessException(ReturnCodeEnum.CODE_AUTHENTICATION_ERROR); diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java index b1e71aa94..dffa772a8 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java @@ -161,8 +161,6 @@ public class MemberBasicInfoController extends BaseController { throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR); } - - int i = memberBasicInfoService.updateMemberBalance(dto); if (i > 0) { ajaxResult = AjaxResult.success(ReturnCodeEnum.CODE_SUCCESS.getLabel()); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/UniAppQueryMemberBalanceDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/UniAppQueryMemberBalanceDTO.java index d84926714..bcf472840 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/UniAppQueryMemberBalanceDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/UniAppQueryMemberBalanceDTO.java @@ -32,6 +32,11 @@ public class UniAppQueryMemberBalanceDTO extends BaseMemberDTO{ */ private String endDate; + /** + * 钱包编号 + */ + private String walletCode; + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.JSON_STYLE) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletInfoMapper.java index 5fd9bef16..8aad1b512 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletInfoMapper.java @@ -67,4 +67,6 @@ public interface MemberWalletInfoMapper { MemberWalletInfo selectByMemberId(@Param("memberId") String memberId, @Param("merchantId") String merchantId); List selectByMemberWalletList(@Param("memberId") String memberId); + + MemberWalletInfo selectByWalletCode(@Param("walletCode") String walletCode); } \ No newline at end of file diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberWalletInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberWalletInfoService.java index f533d660a..7c78cbbf6 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberWalletInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberWalletInfoService.java @@ -16,7 +16,9 @@ public interface MemberWalletInfoService { MemberWalletInfo selectByMemberId(String memberId, String merchantId); - int updateByPrimaryKeySelective(MemberWalletInfo record); + MemberWalletInfo selectByWalletCode(String walletCode); + + int updateByPrimaryKeySelective(MemberWalletInfo record); int updateByPrimaryKey(MemberWalletInfo record); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletInfoServiceImpl.java index 52ee316b2..8227148e2 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletInfoServiceImpl.java @@ -48,6 +48,11 @@ public class MemberWalletInfoServiceImpl implements MemberWalletInfoService { return memberWalletInfoMapper.selectByMemberId(memberId, merchantId); } + @Override + public MemberWalletInfo selectByWalletCode(String walletCode) { + return memberWalletInfoMapper.selectByWalletCode(walletCode); + } + @Override public int updateByPrimaryKeySelective(MemberWalletInfo record) { return memberWalletInfoMapper.updateByPrimaryKeySelective(record); diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml index 2ae4e9d6c..b785d3e1b 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml @@ -193,4 +193,12 @@ and member_id = #{memberId,jdbcType=INTEGER} and merchant_id is not null + + \ No newline at end of file diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberWalletLogMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberWalletLogMapper.xml index 35f0f0fd0..e5f87a72a 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberWalletLogMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberWalletLogMapper.xml @@ -461,6 +461,7 @@ left join order_basic_info t2 on t1.related_order_code = t2.order_code where t1.member_id = #{dto.memberId,jdbcType=VARCHAR} + and t1.wallet_code = #{dto.walletCode,jdbcType=VARCHAR} and t1.create_time = ]]> #{dto.tradeDate,jdbcType=VARCHAR} and t1.create_time #{dto.endDate,jdbcType=VARCHAR} and t1.sub_type != '12'