Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java

@@ -534,7 +534,13 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService {
 		List<String> merchantIdList = merchantInfoVOList.stream()
 				.map(MerchantInfoVO::getMerchantId).collect(Collectors.toList());
 		List<MerchantVipVO> resultList = memberBasicInfoMapper.queryMerchantVipList(merchantIdList, dto);
-
+		if (CollectionUtils.isNotEmpty(resultList)) {
+			for (MerchantVipVO merchantVipVO : resultList) {
+				BigDecimal principalBalance = merchantVipVO.getPrincipalBalance() == null ? BigDecimal.ZERO : merchantVipVO.getPrincipalBalance();
+				BigDecimal giftBalance = merchantVipVO.getGiftBalance() == null ? BigDecimal.ZERO : merchantVipVO.getGiftBalance();
+				merchantVipVO.setTotalAccountAmount(principalBalance.add(giftBalance));
+			}
+		}
 		return resultList;
 	}
 

jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml

@@ -263,7 +263,8 @@
             t2.nick_name as nickName,
             t2.avatar_url as avatarUrl,
             t1.wallet_code as walletCode,
-            t1.principal_balance as principalBalance
+            t1.principal_balance as principalBalance,
+            t1.gift_balance as giftBalance
         from member_wallet_info t1
         JOIN member_basic_info t2 on t2.member_id = t1.member_id and t2.del_flag = '0'
         JOIN pile_merchant_info t3 ON t1.merchant_id = t3.id and t3.del_flag = '0'

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

@@ -141,7 +141,11 @@
                 </el-form-item>
                 <el-form-item label="金额" prop="balance">
                     <el-input-number v-model="createMerchantVip.updatePrincipalBalance" placeholder="请输入金额" :min="0"
-                        :controls="false" :precision="2"></el-input-number>
+                                    :controls="false" :precision="2"/>
+                </el-form-item>
+                <el-form-item label="赠送金" prop="balance">
+                    <el-input-number v-model="createMerchantVip.updateGiftBalance" placeholder="请输入赠送金" :min="0"
+                                     :controls="false" :precision="2"/>
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -163,8 +167,12 @@
                     <el-radio v-model="type" label="2" border>扣款</el-radio>
                 </el-form-item>
                 <el-form-item label="金额" prop="balance">
-                    <el-input-number v-model="updatePrincipalBalance" placeholder="请输入金额" :min="0" :controls="false"
+                    <el-input-number v-model="updatePrincipalBalance" placeholder="请输入金额" :min="0"
-                        :precision="2"></el-input-number>
+                                     :controls="false" :precision="2"/>
+                </el-form-item>
+                <el-form-item label="赠送金" prop="balance">
+                    <el-input-number v-model="updateGiftBalance" placeholder="请输入赠送金" :min="0"
+                                     :controls="false" :precision="2"/>
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -214,6 +222,7 @@ export default {
             open: false,
             openUpdateBalance: false, // 控制充值扣款对话框
             updatePrincipalBalance: "", // 充值扣款金额
+            updateGiftBalance: "",
             updateBalanceMemberId: "", // 需要充值扣款的会员id
             type: '1', // 操作类型 1-充值；2-扣款
             targetMerchantId: "", // 目标运营商id
@@ -340,6 +349,7 @@ export default {
             // console.log("重置 充值赠送金额相关");
             this.openUpdateBalance = false;
             this.updatePrincipalBalance = "";
+            this.updateGiftBalance = "";
             this.updateBalanceMemberId = "";
             this.type = "1";
         },
@@ -370,6 +380,7 @@ export default {
             const param = {
                 memberId: this.updateBalanceMemberId,
                 updatePrincipalBalance: this.updatePrincipalBalance,
+                updateGiftBalance: this.updateGiftBalance,
                 type: this.type,
                 subType: this.subType,
                 targetMerchantId: this.targetMerchantId