xiaoyong931011
2023-04-24 d7f57903262d8a0db7239fde71a8b7abc48df852
资金流水
9 files modified
74 ■■■■ changed files
src/main/java/cc/mrbird/febs/mall/dto/AddMemberBankDto.java 6 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/dto/UpdateMemberBankDto.java 6 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/entity/MallMemberBank.java 3 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java 4 ●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/vo/AdminMallMemberPaymentVo.java 4 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/vo/MemberBankListVo.java 4 ●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/mallMember/paymentInfo.html 33 ●●●●● patch | view | raw | blame | history
src/test/java/cc/mrbird/febs/ProfitTest.java 12 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/dto/AddMemberBankDto.java
@@ -20,6 +20,12 @@
    // 银行卡号
    @ApiModelProperty(value = "银行卡号")
    private String bankNo;
    // 银行卡号
    @ApiModelProperty(value = "开户行")
    private String bankName;
    // 银行卡号
    @ApiModelProperty(value = "支行")
    private String bankNameS;
    // 手机号
    @ApiModelProperty(value = "手机号")
    private String phone;
src/main/java/cc/mrbird/febs/mall/dto/UpdateMemberBankDto.java
@@ -22,7 +22,13 @@
    // 银行卡号
    @ApiModelProperty(value = "银行卡号")
    private String bankNo;
    @ApiModelProperty(value = "开户行")
    private String bankName;
    // 手机号
    @ApiModelProperty(value = "手机号")
    private String phone;
    @ApiModelProperty(value = "支行")
    private String bankNameS;
}
src/main/java/cc/mrbird/febs/mall/entity/MallMemberBank.java
@@ -16,6 +16,9 @@
    private String idCardNum;
    // 银行卡号
    private String bankNo;
    private String bankName;
    private String bankNameS;
    // 手机号
    private String phone;
}
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
@@ -638,7 +638,9 @@
        AdminMallMemberPaymentVo adminMallMemberPaymentVo = new AdminMallMemberPaymentVo();
        if(ObjectUtil.isNotEmpty(mallMemberBank)){
            adminMallMemberPaymentVo.setBankNo(mallMemberBank.getBankNo());
            adminMallMemberPaymentVo.setBankName(mallMemberBank.getName());
            adminMallMemberPaymentVo.setName(mallMemberBank.getName());
            adminMallMemberPaymentVo.setBankName(mallMemberBank.getBankName());
            adminMallMemberPaymentVo.setBankNameS(mallMemberBank.getBankNameS());
        }
        return adminMallMemberPaymentVo;
    }
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -618,6 +618,8 @@
        mallMemberBank.setIdCardNum(updateMemberBankDto.getIdCardNum());
        mallMemberBank.setBankNo(updateMemberBankDto.getBankNo());
        mallMemberBank.setPhone(updateMemberBankDto.getPhone());
        mallMemberBank.setBankName(updateMemberBankDto.getBankName());
        mallMemberBank.setBankNameS(updateMemberBankDto.getBankNameS());
        mallMemberBankMapper.updateById(mallMemberBank);
        return new FebsResponse().success();
    }
src/main/java/cc/mrbird/febs/mall/vo/AdminMallMemberPaymentVo.java
@@ -28,6 +28,8 @@
     */
    private String bankName;
    private String bankNameS;
    /**
     * 银行卡号
     */
@@ -37,4 +39,6 @@
     * 开户行
     */
    private String bank;
    private String name;
}
src/main/java/cc/mrbird/febs/mall/vo/MemberBankListVo.java
@@ -20,6 +20,10 @@
    // 银行卡号
    @ApiModelProperty(value = "银行卡号")
    private String bankNo;
    @ApiModelProperty(value = "开户行")
    private String bankName;
    @ApiModelProperty(value = "支行")
    private String bankNameS;
    // 手机号
    @ApiModelProperty(value = "手机号")
    private String phone;
src/main/resources/templates/febs/views/modules/mallMember/paymentInfo.html
@@ -63,20 +63,28 @@
            <div class="layui-col-lg6">
                <label class="layui-form-label">持卡人姓名:</label>
                <div class="layui-input-block">
                    <input type="text" name="name" class="layui-input" readonly>
                </div>
            </div>
            <div class="layui-col-lg6">
                <label class="layui-form-label">银行卡号:</label>
                <div class="layui-input-block">
                    <input type="text" name="bankNo" class="layui-input" readonly>
                </div>
            </div>
        </div>
        <div class="layui-row layui-col-space10 layui-form-item">
            <div class="layui-col-lg6">
                <label class="layui-form-label">开户行:</label>
                <div class="layui-input-block">
                    <input type="text" name="bankName" class="layui-input" readonly>
                </div>
            </div>
<!--            <div class="layui-col-lg6">-->
<!--                <label class="layui-form-label">开户行:</label>-->
<!--                <div class="layui-input-block">-->
<!--                    <input type="text" name="bank" class="layui-input" readonly>-->
<!--                </div>-->
<!--            </div>-->
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">银行卡号:</label>
            <div class="layui-input-block">
                <input type="text" name="bankNo" class="layui-input" readonly>
            <div class="layui-col-lg6">
                <label class="layui-form-label">支行:</label>
                <div class="layui-input-block">
                    <input type="text" name="bankNameS" class="layui-input" readonly>
                </div>
            </div>
        </div>
    </form>
@@ -109,8 +117,9 @@
                // "aliAccount": paymentInfo.aliAccount,
                // "aliQrcode": paymentInfo.aliQrcode,
                "bankName": paymentInfo.bankName,
                "bankNameS": paymentInfo.bankNameS,
                "bankNo": paymentInfo.bankNo,
                // "bank": paymentInfo.bank
                "name": paymentInfo.name
            });
        }
    });
src/test/java/cc/mrbird/febs/ProfitTest.java
@@ -34,17 +34,17 @@
//    @Autowired
//    private AgentConsumer agentConsumer;
//
//    @Autowired
//    private IAgentService agentService;
    @Autowired
    private IAgentService agentService;
//
//    @Autowired
//    private IMemberProfitService memberProfitService;
//
//    @Test
//    public void dynamicProfit() {
////        agentService.returnMoneyToAgent(578L);
    @Test
    public void dynamicProfit() {
        agentService.returnMoneyToAgent(3323L);
//        agentService.autoUpAgentLevel(640L);
//    }
    }
//    @Test
//    public void agentProfit() {
//        memberProfitService.agentProfit(null);