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 7be1b8e8f..989a62992 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 @@ -153,8 +153,21 @@ public class MemberBasicInfoController extends BaseController { @PutMapping("/updateMemberBalance") public AjaxResult updateMemberBalance(@RequestBody UpdateMemberBalanceDTO dto) { logger.info("后管充值/扣款余额 param:{}", dto.toString()); + AjaxResult ajaxResult; // 判断入参 - return toAjax(memberBasicInfoService.updateMemberBalance(dto)); + try { + int i = memberBasicInfoService.updateMemberBalance(dto); + if (i > 0) { + ajaxResult = AjaxResult.success(ReturnCodeEnum.CODE_SUCCESS.getLabel()); + } else { + ajaxResult = AjaxResult.error(); + } + } catch (BusinessException e) { + ajaxResult = AjaxResult.error(e.getMessage()); + } catch (Exception e) { + ajaxResult = AjaxResult.error(); + } + return ajaxResult; } /** diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index 6cdfb7084..c277bb2a6 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -62,6 +62,7 @@ import com.jsowell.pile.service.orderlogic.OrderLogicFactory; import com.jsowell.pile.transaction.dto.OrderTransactionDTO; import com.jsowell.pile.transaction.service.TransactionService; import com.jsowell.pile.util.SnUtils; +import com.jsowell.pile.vo.base.MemberWalletVO; import com.jsowell.pile.vo.base.PileInfoVO; import com.jsowell.pile.vo.uniapp.MemberVO; import com.jsowell.pile.vo.uniapp.PileConnectorDetailVO; @@ -239,6 +240,16 @@ public class SpringBootTestController { @Autowired private TempService tempService; + @Autowired + private MemberWalletInfoService memberWalletInfoService; + + @Test + public void selectByMemberWalletListTest() { + String memberId = "12345678"; + List memberWalletVOS = memberWalletInfoService.selectByMemberWalletList(memberId); + System.out.println(JSON.toJSONString(memberWalletVOS)); + } + @Test public void queryPaymentByOrderNoTest() { String orderNo = "C44903356969"; 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 abf6f0154..5fd9bef16 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 @@ -4,6 +4,8 @@ import com.jsowell.pile.domain.MemberWalletInfo; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository public interface MemberWalletInfoMapper { /** @@ -63,4 +65,6 @@ public interface MemberWalletInfoMapper { * @return */ MemberWalletInfo selectByMemberId(@Param("memberId") String memberId, @Param("merchantId") String merchantId); + + List selectByMemberWalletList(@Param("memberId") String memberId); } \ 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 473ffa0f5..f533d660a 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 @@ -1,6 +1,9 @@ package com.jsowell.pile.service; import com.jsowell.pile.domain.MemberWalletInfo; +import com.jsowell.pile.vo.base.MemberWalletVO; + +import java.util.List; public interface MemberWalletInfoService { int deleteByPrimaryKey(Integer id); @@ -16,4 +19,6 @@ public interface MemberWalletInfoService { int updateByPrimaryKeySelective(MemberWalletInfo record); int updateByPrimaryKey(MemberWalletInfo record); + + List selectByMemberWalletList(String memberId); } 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 82aa7ca27..7858b1f26 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 @@ -1,11 +1,15 @@ package com.jsowell.pile.service.impl; +import com.google.common.collect.Lists; import com.jsowell.pile.domain.MemberWalletInfo; import com.jsowell.pile.mapper.MemberWalletInfoMapper; import com.jsowell.pile.service.MemberWalletInfoService; +import com.jsowell.pile.vo.base.MemberWalletVO; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; @Service public class MemberWalletInfoServiceImpl implements MemberWalletInfoService { @@ -48,4 +52,23 @@ public class MemberWalletInfoServiceImpl implements MemberWalletInfoService { return memberWalletInfoMapper.updateByPrimaryKey(record); } + @Override + public List selectByMemberWalletList(String memberId) { + List resultList = Lists.newArrayList(); + List list = memberWalletInfoMapper.selectByMemberWalletList(memberId); + if (CollectionUtils.isNotEmpty(list)) { + for (MemberWalletInfo memberWalletInfo : list) { + resultList.add( + MemberWalletVO.builder() + .memberId(memberWalletInfo.getMemberId()) + .merchantId(memberWalletInfo.getMerchantId()) + .walletCode(memberWalletInfo.getWalletCode()) + .principalBalance(memberWalletInfo.getPrincipalBalance()) + .build() + ); + } + } + return resultList; + } + } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/MemberWalletVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/MemberWalletVO.java new file mode 100644 index 000000000..00033f62f --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/MemberWalletVO.java @@ -0,0 +1,35 @@ +package com.jsowell.pile.vo.base; + +import lombok.*; + +import java.math.BigDecimal; + +/** + * 会员钱包VO + */ +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class MemberWalletVO { + /** + * 会员id + */ + private String memberId; + + /** + * 钱包编号 + */ + private String walletCode; + + /** + * 所属运营商id + */ + private String merchantId; + + /** + * 本金金额 + */ + private BigDecimal principalBalance; +} diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml index fabff609e..df5101d75 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml @@ -185,12 +185,12 @@ t1.STATUS as status, t1.nick_name as nickName, t1.avatar_url as avatarUrl, - t1.mobile_number as mobileNumber, - t2.principal_balance as principalBalance, - t2.gift_balance as giftBalance + t1.mobile_number as mobileNumber + FROM member_basic_info t1 - left JOIN member_wallet_info t2 ON t1.member_id = t2.member_id and t2.del_flag = '0' + where t1.del_flag = '0' and t1.member_id = #{memberId,jdbcType=VARCHAR} @@ -203,12 +203,12 @@ t1.STATUS as status, t1.nick_name as nickName, t1.mobile_number as mobileNumber, - t2.principal_balance as principalBalance, + t1.avatar_url as avatarUrl FROM member_basic_info t1 - JOIN member_wallet_info t2 ON t1.member_id = t2.member_id and t2.del_flag = '0' + JOIN pile_merchant_info t3 ON t1.merchant_id = t3.id and t3.del_flag = '0' join member_plate_number_relation t4 on t4.member_id = t1.member_id and t4.del_flag = '0' diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml index a4f2ef22c..2ae4e9d6c 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml @@ -184,4 +184,13 @@ and member_id = #{memberId,jdbcType=INTEGER} and merchant_id = #{merchantId,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/jsowell-ui/src/views/member/info/index.vue b/jsowell-ui/src/views/member/info/index.vue index a91f8c3e3..3c9bea3c1 100644 --- a/jsowell-ui/src/views/member/info/index.vue +++ b/jsowell-ui/src/views/member/info/index.vue @@ -137,7 +137,7 @@ - + @@ -150,14 +150,14 @@ v-hasPermi="['member:info:edit']" >修改 --> - +