update 会员钱包

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;
     }
 
     /**

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<MemberWalletVO> memberWalletVOS = memberWalletInfoService.selectByMemberWalletList(memberId);
+        System.out.println(JSON.toJSONString(memberWalletVOS));
+    }
+
     @Test
     public void queryPaymentByOrderNoTest() {
         String orderNo = "C44903356969";

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<MemberWalletInfo> selectByMemberWalletList(@Param("memberId") String memberId);
 }

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<MemberWalletVO> selectByMemberWalletList(String memberId);
 }

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<MemberWalletVO> selectByMemberWalletList(String memberId) {
+        List<MemberWalletVO> resultList = Lists.newArrayList();
+        List<MemberWalletInfo> 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;
+    }
+
 }

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;
+}

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,
+            t1.mobile_number as mobileNumber
-            t2.principal_balance as principalBalance,
+            <!--t2.principal_balance as principalBalance,
-            t2.gift_balance as giftBalance
+            t2.gift_balance as giftBalance-->
         FROM
             member_basic_info t1
-            left JOIN member_wallet_info t2 ON t1.member_id = t2.member_id and t2.del_flag = '0'
+            <!--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}
     </select>
@@ -203,12 +203,12 @@
             t1.STATUS as status,
             t1.nick_name as nickName,
             t1.mobile_number as mobileNumber,
-            t2.principal_balance as principalBalance,
+            <!--t2.principal_balance as principalBalance,-->
             <!--t2.gift_balance as giftBalance,-->
             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 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'
         <if test="dto.vinCode != null">
             join member_plate_number_relation t4 on t4.member_id = t1.member_id and t4.del_flag = '0'

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}
   </select>
+
+  <select id="selectByMemberWalletList" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from member_wallet_info
+    where del_flag = '0'
+    and member_id = #{memberId,jdbcType=INTEGER}
+    and merchant_id is not null
+  </select>
 </mapper>

jsowell-ui/src/views/member/info/index.vue

@@ -137,7 +137,7 @@
                 </template>
             </el-table-column>
             <el-table-column label="手机号" align="center" prop="mobileNumber"/>
-            <el-table-column label="本金余额" align="center" prop="principalBalance"/>
+<!--            <el-table-column label="本金余额" align="center" prop="principalBalance"/>-->
             <!--      <el-table-column label="赠送余额" align="center" prop="giftBalance" />-->
             <el-table-column label="备注" align="center" prop="remark"/>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -150,14 +150,14 @@
                         v-hasPermi="['member:info:edit']"
                     >修改
                     </el-button>-->
-<!--                    <el-button
+                    <el-button
                         size="mini"
                         type="text"
                         icon="el-icon-edit"
                         @click="handleUpdateBalance(scope.row)"
                         v-hasPermi="['member:balance:update']"
                     >充值/扣款
-                    </el-button>-->
+                    </el-button>
                     <el-button
                         size="mini"
                         type="text"