Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

Helius

2021-09-25 2e10dd5a3cb31a6bcce1da08c69bb927f22d3bac

Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

 src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java

@@ -4,6 +4,8 @@
import cc.mrbird.febs.common.controller.BaseController;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.mall.dto.MoneyChargeListDto;
import cc.mrbird.febs.mall.dto.MoneyFlowListDto;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.entity.MallOrderRefund;
import cc.mrbird.febs.mall.service.IAdminMallMemberService;
@@ -69,11 +71,57 @@
        if(parentId==null){
            ViewMallMemberController.idFromMoneyFlow=0;
        }
        mallMember.setId(ViewMallOrderController.idFromRefund);
        mallMember.setId(ViewMallMemberController.idFromMoneyFlow);
        Map<String, Object> dataTable = getDataTable(mallMemberService.moneyFlow(request, mallMember));
        return new FebsResponse().success().data(dataTable);
    }

    /**
     * 资金流水-列表
     * @param moneyFlowListDto
     * @param request
     * @return
     */
    @GetMapping("getMoneyFlowList")
    public FebsResponse getMoneyFlowList(MoneyFlowListDto moneyFlowListDto, QueryRequest request) {
        Map<String, Object> data = getDataTable(mallMemberService.getMoneyFlowListInPage(moneyFlowListDto, request));
        return new FebsResponse().success().data(data);
    }

    /**
     * 会员提现-列表
     * @param moneyChargeListDto
     * @param request
     * @return
     */
    @GetMapping("getMoneyChargeList")
    public FebsResponse getMoneyChargeList(MoneyChargeListDto moneyChargeListDto, QueryRequest request) {
        Map<String, Object> data = getDataTable(mallMemberService.getMoneyChargeListInPage(moneyChargeListDto, request));
        return new FebsResponse().success().data(data);
    }

    /**
     * 会员提现-同意
     * @param id
     * @return
     */
    @GetMapping("chargeAgree/{id}")
    @ControllerEndpoint(operation = "会员提现-同意", exceptionMessage = "操作失败")
    public FebsResponse chargeAgree(@NotNull(message = "{required}") @PathVariable Long id) {
        return mallMemberService.chargeAgree(id);
    }

    /**
     * 会员提现-拒绝
     * @param id
     * @return
     */
    @GetMapping("chargeDisagree/{id}")
    @ControllerEndpoint(operation = "会员提现-拒绝", exceptionMessage = "操作失败")
    public FebsResponse chargeDisagree(@NotNull(message = "{required}") @PathVariable Long id) {
        return mallMemberService.chargeDisagree(id);
    }



}

 src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java

@@ -171,6 +171,27 @@
        return adminMallOrderService.withAddressUpdate(withAddressUpdateDto);
    }

    /**
     * 商家支付方式-列表
     * @param payMethodDto
     * @param request
     * @return
     */
    @GetMapping("payMethodList")
    public FebsResponse getPayMethodList(PayMethodDto payMethodDto, QueryRequest request) {
        Map<String, Object> data = getDataTable(adminMallOrderService.getPayMethodListInPage(payMethodDto, request));
        return new FebsResponse().success().data(data);
    }

    /**
     * 商家支付方式-更新
     */
    @PostMapping("payMethodEdit")
    @ControllerEndpoint(operation = "商家支付方式-更新", exceptionMessage = "操作失败")
    public FebsResponse payMethodEdit(@Valid PayMethodEditDto payMethodEditDto) {
        return adminMallOrderService.payMethodEdit(payMethodEditDto);
    }





 src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java

@@ -5,6 +5,7 @@
import cc.mrbird.febs.common.utils.FebsUtil;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.service.IAdminMallMemberService;
import cc.mrbird.febs.mall.vo.AdminMallMemberPaymentVo;
import cc.mrbird.febs.mall.vo.MallMemberVo;
import lombok.RequiredArgsConstructor;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -59,6 +60,40 @@
        return FebsUtil.view("modules/mallMember/moneyFlow");
    }

    /**
     * 资金流水列表
     * @return
     */
    @GetMapping("moneyFlowList")
    @RequiresPermissions("moneyFlowList:view")
    public String moneyFlowList() {
        return FebsUtil.view("modules/mallMember/moneyFlowList");
    }

    /**
     * 提现列表
     * @return
     */
    @GetMapping("chargeFlowList")
    @RequiresPermissions("chargeFlowList:view")
    public String chargeFlowList() {
        return FebsUtil.view("modules/mallMember/chargeFlowList");
    }

    /**
     * 提现列表-收款方式
     * @param id
     * @param model
     * @return
     */
    @GetMapping("paymentInfo/{id}")
    @RequiresPermissions("paymentInfo:update")
    public String paymentInfo(@PathVariable long id, Model model) {
        AdminMallMemberPaymentVo data = mallMemberService.getMallMemberPaymentInfoByFlowId(id);
        model.addAttribute("paymentInfo", data);
        return FebsUtil.view("modules/mallMember/paymentInfo");
    }





 src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java

@@ -79,7 +79,8 @@
     * @param model
     * @return
     */
    @GetMapping("seeRefund/{id}")
    @GetMapping("refunding/{id}")
    @RequiresPermissions("refunding:view")
    public String seeReceiveInfo(@PathVariable long id, Model model) {
        idFromRefund = id;
        return FebsUtil.view("modules/order/Refunding");
@@ -134,4 +135,30 @@
        return FebsUtil.view("modules/order/withAddress");
    }

    /**
     * 商家支付方式-列表
     * @return
     */
    @GetMapping("payMethodList")
    @RequiresPermissions("payMethodList:view")
    public String payMethodList() {
        return FebsUtil.view("modules/order/payMethodList");
    }



    /**
     * 商家支付方式-详情
     * @param id
     * @param model
     * @return
     */
    @GetMapping("payMethodEdit/{id}")
    @RequiresPermissions("payMethodEdit:update")
    public String payMethodEdit(@PathVariable long id, Model model) {
        AdminMallPayMethodEditVo data = adminMallOrderService.getMallPayMethodEditInfoById(id);
        model.addAttribute("payMethodEdit", data);
        return FebsUtil.view("modules/order/payMethodEdit");
    }

}

 src/main/java/cc/mrbird/febs/mall/dto/MoneyChargeListDto.java

New file
@@ -0,0 +1,15 @@
package cc.mrbird.febs.mall.dto;

import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "MoneyChargeListDto", description = "地址接收参数类")
public class MoneyChargeListDto {

    private String name;

    private String phone;

    private Integer status;
}

 src/main/java/cc/mrbird/febs/mall/dto/MoneyFlowListDto.java

New file
@@ -0,0 +1,14 @@
package cc.mrbird.febs.mall.dto;

import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "MoneyFlowListDto", description = "接收参数类")
public class MoneyFlowListDto {

    private String name;

    private String phone;

}

 src/main/java/cc/mrbird/febs/mall/dto/PayMethodDto.java

New file
@@ -0,0 +1,10 @@
package cc.mrbird.febs.mall.dto;

import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "PayMethodDto", description = "接收参数类")
public class PayMethodDto {
    private String type;
}

 src/main/java/cc/mrbird/febs/mall/dto/PayMethodEditDto.java

New file
@@ -0,0 +1,20 @@
package cc.mrbird.febs.mall.dto;

import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "PayMethodEditDto", description = "接收参数类")
public class PayMethodEditDto {

    private Long id;

    private String type;

    private String code;

    private String value;

    private String description;

}

 src/main/java/cc/mrbird/febs/mall/mapper/DataDictionaryCustomMapper.java

@@ -1,11 +1,21 @@
package cc.mrbird.febs.mall.mapper;

import cc.mrbird.febs.mall.dto.PayMethodDto;
import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
import cc.mrbird.febs.mall.vo.AdminMallPayMethodEditVo;
import cc.mrbird.febs.mall.vo.AdminPayMethodVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;

import java.util.List;

public interface DataDictionaryCustomMapper extends BaseMapper<DataDictionaryCustom> {

    List<DataDictionaryCustom> selectDicByType(String type);

    IPage<AdminPayMethodVo> getPayMethodListInPage(Page<AdminPayMethodVo> page, @Param("record")PayMethodDto payMethodDto);

    AdminMallPayMethodEditVo getMallPayMethodEditInfoById(@Param("id")long id);
}

 src/main/java/cc/mrbird/febs/mall/mapper/MallMemberPaymentMapper.java

@@ -1,10 +1,13 @@
package cc.mrbird.febs.mall.mapper;

import cc.mrbird.febs.mall.entity.MallMemberPayment;
import cc.mrbird.febs.mall.vo.AdminMallMemberPaymentVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;

public interface MallMemberPaymentMapper extends BaseMapper<MallMemberPayment> {

    MallMemberPayment selectByMemberId(@Param("memberId") Long memberId);

    AdminMallMemberPaymentVo getMallMemberPaymentInfoByMemberId(@Param("memberId")Long memberId);
}

 src/main/java/cc/mrbird/febs/mall/mapper/MallMoneyFlowMapper.java

@@ -1,9 +1,13 @@
package cc.mrbird.febs.mall.mapper;

import cc.mrbird.febs.mall.dto.MoneyChargeListDto;
import cc.mrbird.febs.mall.dto.MoneyFlowDto;
import cc.mrbird.febs.mall.dto.MoneyFlowListDto;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.entity.MallMoneyFlow;
import cc.mrbird.febs.mall.vo.AdminMallMoneyFlowVo;
import cc.mrbird.febs.mall.vo.AdminMoneyChargeListVo;
import cc.mrbird.febs.mall.vo.AdminMoneyFlowListVo;
import cc.mrbird.febs.mall.vo.MoneyFlowVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -15,4 +19,8 @@
    IPage<AdminMallMoneyFlowVo> selectMoneyFlowInPage(Page<AdminMallMoneyFlowVo> page, @Param("record")MallMember mallMember);

    IPage<MoneyFlowVo> selectApiMoneyFlowInPage(IPage<MoneyFlowVo> page, @Param("record") MoneyFlowDto moneyFlowDto);

    IPage<AdminMoneyFlowListVo> getMoneyFlowListInPage(Page<AdminMoneyFlowListVo> page,  @Param("record")MoneyFlowListDto moneyFlowListDto);

    IPage<AdminMoneyChargeListVo> getMoneyChargeListInPage(Page<AdminMoneyChargeListVo> page, @Param("record")MoneyChargeListDto moneyChargeListDto);
}

 src/main/java/cc/mrbird/febs/mall/service/IAdminMallMemberService.java

@@ -2,11 +2,10 @@

import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.mall.dto.RegisterDto;
import cc.mrbird.febs.mall.dto.MoneyChargeListDto;
import cc.mrbird.febs.mall.dto.MoneyFlowListDto;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.entity.MallMoneyFlow;
import cc.mrbird.febs.mall.vo.AdminMallMoneyFlowVo;
import cc.mrbird.febs.mall.vo.MallMemberVo;
import cc.mrbird.febs.mall.vo.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;

@@ -23,4 +22,14 @@
    MallMemberVo getMallMemberInfoById(@NotNull(message = "{required}") long id);

    IPage<AdminMallMoneyFlowVo> moneyFlow(QueryRequest request, MallMember mallMember);

    IPage<AdminMoneyFlowListVo> getMoneyFlowListInPage(MoneyFlowListDto moneyFlowListDto, QueryRequest request);

    IPage<AdminMoneyChargeListVo> getMoneyChargeListInPage(MoneyChargeListDto moneyChargeListDto, QueryRequest request);

    FebsResponse chargeAgree(Long id);

    FebsResponse chargeDisagree(Long id);

    AdminMallMemberPaymentVo getMallMemberPaymentInfoByFlowId(long id);
}

 src/main/java/cc/mrbird/febs/mall/service/IAdminMallOrderService.java

@@ -46,4 +46,10 @@
    FebsResponse withAddressUpdate(WithAddressUpdateDto withAddressUpdateDto);

    AdminMallOrderRefundVo getMallOrderRefundInfoById(long id);

    IPage<AdminPayMethodVo> getPayMethodListInPage(PayMethodDto payMethodDto, QueryRequest request);

    AdminMallPayMethodEditVo getMallPayMethodEditInfoById(long id);

    FebsResponse payMethodEdit(PayMethodEditDto payMethodEditDto);
}

 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java

@@ -2,13 +2,15 @@

import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.mall.dto.MoneyChargeListDto;
import cc.mrbird.febs.mall.dto.MoneyFlowListDto;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.entity.MallMoneyFlow;
import cc.mrbird.febs.mall.mapper.MallMemberMapper;
import cc.mrbird.febs.mall.mapper.MallMemberPaymentMapper;
import cc.mrbird.febs.mall.mapper.MallMoneyFlowMapper;
import cc.mrbird.febs.mall.service.IAdminMallMemberService;
import cc.mrbird.febs.mall.vo.AdminMallMoneyFlowVo;
import cc.mrbird.febs.mall.vo.AdminMallOrderRefundOperationVo;
import cc.mrbird.febs.mall.vo.MallMemberVo;
import cc.mrbird.febs.mall.vo.*;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -16,6 +18,7 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

/**
 * @author wzy
@@ -30,6 +33,8 @@

    private final MallMoneyFlowMapper mallMoneyFlowMapper;

    private final MallMemberPaymentMapper mallMemberPaymentMapper;

    @Override
    public IPage<MallMember> getMallMemberList(MallMember mallMember, QueryRequest request) {
        Page<MallMember> page = new Page<>(request.getPageNum(), request.getPageSize());
@@ -38,6 +43,7 @@
    }

    @Override
    @Transactional
    public FebsResponse closeAccount(Long id) {
        MallMember mallMember = mallMemberMapper.selectById(id);
        if(ObjectUtil.isEmpty(mallMember)) {
@@ -49,6 +55,7 @@
    }

    @Override
    @Transactional
    public FebsResponse openAccount(Long id) {
        MallMember mallMember = mallMemberMapper.selectById(id);
        if(ObjectUtil.isEmpty(mallMember)) {
@@ -72,4 +79,53 @@
        return adminMallMoneyFlowVos;
    }

    @Override
    public IPage<AdminMoneyFlowListVo> getMoneyFlowListInPage(MoneyFlowListDto moneyFlowListDto, QueryRequest request) {
        Page<AdminMoneyFlowListVo> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<AdminMoneyFlowListVo> adminMoneyFlowListVos = mallMoneyFlowMapper.getMoneyFlowListInPage(page, moneyFlowListDto);
        return adminMoneyFlowListVos;
    }

    @Override
    public IPage<AdminMoneyChargeListVo> getMoneyChargeListInPage(MoneyChargeListDto moneyChargeListDto, QueryRequest request) {
        Page<AdminMoneyChargeListVo> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<AdminMoneyChargeListVo> adminMoneyChargeListVos = mallMoneyFlowMapper.getMoneyChargeListInPage(page, moneyChargeListDto);
        return adminMoneyChargeListVos;
    }

    @Override
    @Transactional
    public FebsResponse chargeAgree(Long id) {
        MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectById(id);
        if(ObjectUtil.isEmpty(mallMoneyFlow)){
            return new FebsResponse().fail().message("系统繁忙，请刷新后重试");
        }
        mallMoneyFlow.setStatus(2);
        mallMoneyFlowMapper.insert(mallMoneyFlow);
        return new FebsResponse().success();
    }

    @Override
    @Transactional
    public FebsResponse chargeDisagree(Long id) {
        MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectById(id);
        if(ObjectUtil.isEmpty(mallMoneyFlow)){
            return new FebsResponse().fail().message("系统繁忙，请刷新后重试");
        }
        mallMoneyFlow.setStatus(3);
        mallMoneyFlowMapper.insert(mallMoneyFlow);
        return new FebsResponse().success();
    }

    @Override
    public AdminMallMemberPaymentVo getMallMemberPaymentInfoByFlowId(long id) {
        AdminMallMemberPaymentVo adminMallMemberPaymentVo = new AdminMallMemberPaymentVo();
        MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectById(id);
        AdminMallMemberPaymentVo adminMallMemberPaymentVoa = mallMemberPaymentMapper.getMallMemberPaymentInfoByMemberId(mallMoneyFlow.getMemberId());
        if(ObjectUtil.isNotEmpty(adminMallMemberPaymentVoa)){
            adminMallMemberPaymentVo = adminMallMemberPaymentVoa;
        }
        return adminMallMemberPaymentVo;
    }

}

 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java

@@ -41,6 +41,8 @@

    private final IApiMallMemberWalletService iApiMallMemberWalletService;

    private final DataDictionaryCustomMapper dataDictionaryCustomMapper;

    @Override
    public IPage<AdminMallOrderInfoVo> getOrderListInPage(MallOrderInfoDto mallOrderInfo, QueryRequest request) {
        Page<AdminMallOrderInfoVo> page = new Page<>(request.getPageNum(), request.getPageSize());
@@ -266,5 +268,30 @@
        return mallOrderRefundMapper.getMallOrderRefundInfoById(id);
    }

    @Override
    public IPage<AdminPayMethodVo> getPayMethodListInPage(PayMethodDto payMethodDto, QueryRequest request) {
        payMethodDto.setType("PAYMENT_METHOD");
        Page<AdminPayMethodVo> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<AdminPayMethodVo> adminPayMethodVos = dataDictionaryCustomMapper.getPayMethodListInPage(page, payMethodDto);
        return adminPayMethodVos;
    }

    @Override
    public AdminMallPayMethodEditVo getMallPayMethodEditInfoById(long id) {
        AdminMallPayMethodEditVo adminMallPayMethodEditVo = dataDictionaryCustomMapper.getMallPayMethodEditInfoById(id);
        return adminMallPayMethodEditVo;
    }

    @Override
    public FebsResponse payMethodEdit(PayMethodEditDto payMethodEditDto) {
        DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectById(payMethodEditDto.getId());
        if(ObjectUtil.isEmpty(dataDictionaryCustom)){
            return new FebsResponse().fail().message("系统繁忙，请刷新重试");
        }
        dataDictionaryCustom.setValue(payMethodEditDto.getValue());
        dataDictionaryCustomMapper.updateById(dataDictionaryCustom);
        return new FebsResponse().success();
    }


}

 src/main/java/cc/mrbird/febs/mall/vo/AdminMallMemberPaymentVo.java

New file
@@ -0,0 +1,40 @@
package cc.mrbird.febs.mall.vo;

import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "AdminMallMemberPaymentVo", description = "商城商品列表")
public class AdminMallMemberPaymentVo {

    private Long id;

    private Long memberId;

    private String wxQrcode;

    private String wxName;

    private String wxAccount;

    private String aliQrcode;

    private String aliName;

    private String aliAccount;

    /**
     * 持卡人姓名
     */
    private String bankName;

    /**
     * 银行卡号
     */
    private String bankNo;

    /**
     * 开户行
     */
    private String bank;
}

 src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java

@@ -29,6 +29,8 @@

    private String payOrderNo;

    private String payImage;

    private String payResult;

    /**

 src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderRefundVo.java

@@ -1,7 +1,10 @@
package cc.mrbird.febs.mall.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.util.Date;

@Data
@ApiModel(value = "AdminMallOrderRefundVo", description = "信息返回类")
@@ -38,4 +41,7 @@
    private Integer type;

    private String expressCom;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createdTime;
}

 src/main/java/cc/mrbird/febs/mall/vo/AdminMallPayMethodEditVo.java

New file
@@ -0,0 +1,19 @@
package cc.mrbird.febs.mall.vo;

import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "AdminMallPayMethodEditVo", description = "信息返回类")
public class AdminMallPayMethodEditVo {

    private Long id;

    private String type;

    private String code;

    private String value;

    private String description;
}

 src/main/java/cc/mrbird/febs/mall/vo/AdminMoneyChargeListVo.java

New file
@@ -0,0 +1,34 @@
package cc.mrbird.febs.mall.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;

@Data
@ApiModel(value = "AdminMoneyChargeListVo", description = "信息返回类")
public class AdminMoneyChargeListVo {

    private Long id;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createdTime;

    private BigDecimal amount;

    private Integer type;

    private String orderNo;

    private String description;

    private String remark;

    private String name;

    private String phone;

    private Integer status;
}

 src/main/java/cc/mrbird/febs/mall/vo/AdminMoneyFlowListVo.java

New file
@@ -0,0 +1,35 @@
package cc.mrbird.febs.mall.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;

@Data
@ApiModel(value = "AdminMoneyFlowListVo", description = "信息返回类")
public class AdminMoneyFlowListVo {

    private Long id;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createdTime;

    private BigDecimal amount;

    private Integer type;

    private String orderNo;

    private String description;

    private String remark;

    private String name;

    private String phone;

    private Integer status;

}

 src/main/java/cc/mrbird/febs/mall/vo/AdminOrderDetailVo.java

@@ -20,8 +20,6 @@

    private String payMethod;

    private String payOrderNo;

    private String payResult;

    /**
@@ -64,4 +62,8 @@

    private String orderItems;

    private String payImage;

    private String payOrderNo;

}

 src/main/java/cc/mrbird/febs/mall/vo/AdminPayMethodVo.java

New file
@@ -0,0 +1,19 @@
package cc.mrbird.febs.mall.vo;

import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "AdminPayMethodVo", description = "信息返回类")
public class AdminPayMethodVo {

    private Long id;

    private String type;

    private String code;

    private String value;

    private String description;
}

 src/main/resources/mapper/modules/DataDictionaryCustomMapper.xml

@@ -5,4 +5,13 @@
    <select id="selectDicByType" resultType="cc.mrbird.febs.mall.entity.DataDictionaryCustom">
        select * from data_dictionary_custom where type=#{type}
    </select>

    <select id="getPayMethodListInPage" resultType="cc.mrbird.febs.mall.vo.AdminPayMethodVo">
        select * from data_dictionary_custom where type = #{record.type}
    </select>

    <select id="getMallPayMethodEditInfoById" resultType="cc.mrbird.febs.mall.vo.AdminMallPayMethodEditVo">
        select * from data_dictionary_custom where id = #{id}
    </select>

</mapper>

 src/main/resources/mapper/modules/MallMemberPaymentMapper.xml

@@ -5,4 +5,8 @@
    <select id="selectByMemberId" resultType="cc.mrbird.febs.mall.entity.MallMemberPayment">
        select * from mall_member_payment where member_id=#{memberId}
    </select>

    <select id="getMallMemberPaymentInfoByMemberId" resultType="cc.mrbird.febs.mall.vo.AdminMallMemberPaymentVo">
        select * from mall_member_payment where member_id = #{memberId}
    </select>
</mapper>

 src/main/resources/mapper/modules/MallMoneyFlowMapper.xml

@@ -26,4 +26,49 @@
        </where>
        order by a.created_time desc
    </select>

    <select id="getMoneyFlowListInPage" resultType="cc.mrbird.febs.mall.vo.AdminMoneyFlowListVo">
        select
        a.*,
        b.name,
        b.phone
        from mall_money_flow a
        inner join mall_member b on a.member_id=b.id
        <where>
            a.type != 6
            <if test="record != null" >
                <if test="record.name!=null and record.name!=''">
                    and b.name like concat('%',  #{record.name},'%')
                </if>
                <if test="record.phone!=null and record.phone!=''">
                    and b.phone like concat('%',  #{record.phone},'%')
                </if>
            </if>
        </where>
        order by a.created_time desc
    </select>

    <select id="getMoneyChargeListInPage" resultType="cc.mrbird.febs.mall.vo.AdminMoneyChargeListVo">
        select
        a.*,
        b.name,
        b.phone
        from mall_money_flow a
        inner join mall_member b on a.member_id=b.id
        <where>
            a.type = 6
            <if test="record != null" >
                <if test="record.name!=null and record.name!=''">
                    and b.name like concat('%',  #{record.name},'%')
                </if>
                <if test="record.phone!=null and record.phone!=''">
                    and b.phone like concat('%',  #{record.phone},'%')
                </if>
                <if test="record.status!=null and record.status!=''">
                    and a.status = #{record.status}
                </if>
            </if>
        </where>
        order by a.created_time desc
    </select>
</mapper>

 src/main/resources/templates/febs/views/modules/goods/detailGoods.html

@@ -38,7 +38,8 @@
                    <input type="text" name="goodsNo" class="layui-input" readonly>
                </div>
            </div>
        </div><div class="layui-row layui-col-space10 layui-form-item">
        </div>
        <div class="layui-row layui-col-space10 layui-form-item">
        <div class="layui-col-lg6">
            <label class="layui-form-label febs-form-item-require">所属分类：</label>
            <div class="layui-input-block">

 src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html

New file
@@ -0,0 +1,162 @@
<div class="layui-fluid layui-anim febs-anim" id="febs-money-flow-charge" lay-title="提现管理">
    <div class="layui-row febs-container">
        <div class="layui-col-md12">
            <div class="layui-card">
                <div class="layui-card-body febs-table-full">
                    <form class="layui-form layui-table-form" lay-filter="user-table-form">
                        <div class="layui-row">
                            <div class="layui-col-md10">
                                <div class="layui-form-item">
                                    <div class="layui-inline">
                                        <div class="layui-input-inline">
                                            <input type="text" placeholder="用户名" name="name" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <div class="layui-input-inline">
                                            <input type="text" placeholder="手机号" name="phone" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label layui-form-label-sm">状态</label>
                                        <div class="layui-input-inline">
                                            <select name="status">
                                                <option value="">请选择</option>
                                                <option value="1">提现中</option>
                                                <option value="2">成功</option>
                                                <option value="3">拒绝</option>
                                            </select>
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
                                <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain table-action" id="query">
                                    <i class="layui-icon">&#xe848;</i>
                                </div>
                                <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset">
                                    <i class="layui-icon">&#xe79b;</i>
                                </div>
                            </div>
                        </div>
                    </form>
                    <table lay-filter="moneyFlowChargeTable" lay-data="{id: 'moneyFlowChargeTable'}"></table>
                </div>
            </div>
        </div>
    </div>
</div>
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
    // 引入组件并初始化
    layui.use([ 'jquery', 'form', 'table', 'febs'], function () {
        var $ = layui.jquery,
            febs = layui.febs,
            form = layui.form,
            table = layui.table,
            $view = $('#febs-money-flow-charge'),
            $query = $view.find('#query'),
            $reset = $view.find('#reset'),
            $searchForm = $view.find('form'),
            sortObject = {field: 'phone', type: null},
            tableIns;

        form.render();

        // 表格初始化
        initTable();

        // 初始化表格操作栏各个按钮功能
        table.on('tool(moneyFlowChargeTable)', function (obj) {
            var data = obj.data,
                layEvent = obj.event;
            if (layEvent === 'chargeAgree') {
                febs.modal.confirm('同意', '同意提现？', function () {
                    chargeAgree(data.id);
                });
            }
            if (layEvent === 'chargeDisagree') {
                febs.modal.confirm('拒绝', '拒绝提现？', function () {
                    chargeDisagree(data.id);
                });
            }
            if (layEvent === 'paymentInfo') {
                febs.modal.open( '收款信息', 'modules/mallMember/paymentInfo/' + data.id, {
                    maxmin: true,
                });
            }
        });
        function chargeAgree(id) {
            febs.get(ctx + 'admin/mallMember/chargeAgree/' + id, null, function () {
                febs.alert.success('操作成功');
                $query.click();
            });
        }
        function chargeDisagree(id) {
            febs.get(ctx + 'admin/mallMember/chargeDisagree/' + id, null, function () {
                febs.alert.success('操作成功');
                $query.click();
            });
        }


        // 查询按钮
        $query.on('click', function () {
            var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
            tableIns.reload({where: params, page: {curr: 1}});
        });

        // 刷新按钮
        $reset.on('click', function () {
            $searchForm[0].reset();
            sortObject.type = 'null';
            tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
        });

        function initTable() {
            tableIns = febs.table.init({
                elem: $view.find('table'),
                id: 'moneyFlowChargeTable',
                url: ctx + 'admin/mallMember/getMoneyChargeList',
                cols: [[
                    {field: 'name', title: '名称', minWidth: 100,align:'left'},
                    {field: 'phone', title: '手机号', minWidth: 150,align:'left'},
                    {field: 'amount', title: '金额', minWidth: 150,align:'left'},
                    {field: 'status', title: '状态',
                        templet: function (d) {
                            if (d.status === 1) {
                                return '<span style="color:green;">提现中</span>'
                            } else if (d.status === 2) {
                                return '<span style="color:red;">成功</span>'
                            } else if (d.status === 3) {
                                return '<span style="color:red;">拒绝</span>'
                            } else{
                                return ''
                            }
                        }, minWidth: 80,align:'center'},
                    {field: 'createdTime', title: '创建时间', minWidth: 180,align:'center'},
                    {title: '操作',
                        templet: function (d) {
                            if (d.status === 1) {
                                return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="chargeAgree" shiro:hasPermission="user:update">同意</button>'
                                    +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="chargeDisagree" shiro:hasPermission="user:update">拒绝</button>'
                                    +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">查看收款方式</button>'
                            }else{
                                return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">查看收款方式</button>'
                            }
                        },minWidth: 300,align:'center'}
                ]]
            });
        }

        // 获取查询参数
        function getQueryParams() {
            return {
                name: $searchForm.find('input[name="name"]').val().trim(),
                phone: $searchForm.find('input[name="phone"]').val().trim(),
                status: $searchForm.find("select[name='status']").val(),
            };
        }

    })
</script>

 src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html

@@ -54,6 +54,10 @@
                                return '<span>订单支付</span>'
                            } else if (d.type === 4) {
                                return '<span>退款</span>'
                            }else if (d.type === 5) {
                                return '<span>转账</span>'
                            }else if (d.type === 6) {
                                return '<span>提现</span>'
                            }else{
                                return ''
                            }

 src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html

New file
@@ -0,0 +1,116 @@
<div class="layui-fluid layui-anim febs-anim" id="febs-money-flow" lay-title="资金流水">
    <div class="layui-row febs-container">
        <div class="layui-col-md12">
            <div class="layui-card">
                <div class="layui-card-body febs-table-full">
                    <form class="layui-form layui-table-form" lay-filter="user-table-form">
                        <div class="layui-row">
                            <div class="layui-col-md10">
                                <div class="layui-form-item">
                                    <div class="layui-inline">
                                        <div class="layui-input-inline">
                                            <input type="text" placeholder="用户名" name="name" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <div class="layui-input-inline">
                                            <input type="text" placeholder="手机号" name="phone" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
                                <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain table-action" id="query">
                                    <i class="layui-icon">&#xe848;</i>
                                </div>
                                <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset">
                                    <i class="layui-icon">&#xe79b;</i>
                                </div>
                            </div>
                        </div>
                    </form>
                    <table lay-filter="moneyFlowTable" lay-data="{id: 'moneyFlowTable'}"></table>
                </div>
            </div>
        </div>
    </div>
</div>
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
    // 引入组件并初始化
    layui.use([ 'jquery', 'form', 'table', 'febs'], function () {
        var $ = layui.jquery,
            febs = layui.febs,
            form = layui.form,
            table = layui.table,
            $view = $('#febs-money-flow'),
            $query = $view.find('#query'),
            $reset = $view.find('#reset'),
            $searchForm = $view.find('form'),
            sortObject = {field: 'phone', type: null},
            tableIns;

        form.render();

        // 表格初始化
        initTable();

        // 初始化表格操作栏各个按钮功能
        table.on('tool(moneyFlowTable)', function (obj) {
            var data = obj.data,
                layEvent = obj.event;
        });

        // 查询按钮
        $query.on('click', function () {
            var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
            tableIns.reload({where: params, page: {curr: 1}});
        });

        // 刷新按钮
        $reset.on('click', function () {
            $searchForm[0].reset();
            sortObject.type = 'null';
            tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
        });

        function initTable() {
            tableIns = febs.table.init({
                elem: $view.find('table'),
                id: 'moneyFlowTable',
                url: ctx + 'admin/mallMember/getMoneyFlowList',
                cols: [[
                    {field: 'name', title: '名称', minWidth: 100,align:'left'},
                    {field: 'phone', title: '手机号', minWidth: 150,align:'left'},
                    {field: 'amount', title: '金额', minWidth: 150,align:'left'},
                    {field: 'type', title: '流水类型',
                        templet: function (d) {
                            if (d.type === 1) {
                                return '<span>分红收入</span>'
                            } else if (d.type === 2) {
                                return '<span>业绩奖励</span>'
                            } else if (d.type === 3) {
                                return '<span>订单支付</span>'
                            } else if (d.type === 4) {
                                return '<span>退款</span>'
                            } else if (d.type === 5) {
                                return '<span>转账</span>'
                            } else{
                                return ''
                            }
                        }, minWidth: 80,align:'center'},
                    {field: 'createdTime', title: '创建时间', minWidth: 180,align:'center'}
                ]]
            });
        }

        // 获取查询参数
        function getQueryParams() {
            return {
                name: $searchForm.find('input[name="name"]').val().trim(),
                phone: $searchForm.find('input[name="phone"]').val().trim(),
            };
        }

    })
</script>

 src/main/resources/templates/febs/views/modules/mallMember/paymentInfo.html

New file
@@ -0,0 +1,117 @@
<style>
    #user-payment-info {
        padding: 20px 25px 25px 0;
    }

    #user-payment-info .layui-treeSelect .ztree li a, .ztree li span {
        margin: 0 0 2px 3px !important;
    }
    #user-payment-info #data-permission-tree-block {
        border: 1px solid #eee;
        border-radius: 2px;
        padding: 3px 0;
    }
    #user-payment-info .layui-treeSelect .ztree li span.button.switch {
        top: 1px;
        left: 3px;
    }

</style>
<div class="layui-fluid" id="user-payment-info">
    <form class="layui-form" action="" lay-filter="user-payment-info-form">
        <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="wxName" 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="wxAccount" class="layui-input" readonly>
                </div>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">微信收款码：</label>
            <div class="layui-input-block">
                <img alt="微信收款码" data-th-src="${paymentInfo.wxQrcode}"  style="width: 200px">
            </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="aliName" 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="aliAccount" class="layui-input" readonly>
                </div>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">支付宝收款码：</label>
            <div class="layui-input-block">
                <img alt="支付宝收款码" data-th-src="${paymentInfo.aliQrcode}"  style="width: 200px">
            </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>
        </div>
    </form>
</div>

<script data-th-inline="javascript">
    layui.use(['febs', 'form', 'formSelects', 'validate', 'treeSelect', 'eleTree'], function () {
        var $ = layui.$,
            febs = layui.febs,
            layer = layui.layer,
            formSelects = layui.formSelects,
            treeSelect = layui.treeSelect,
            form = layui.form,
            eleTree = layui.eleTree,
            paymentInfo = [[${paymentInfo}]],
            $view = $('#user-payment-info'),
            validate = layui.validate,
            _deptTree;

        form.render();

        initUserValue();

        function initUserValue() {
            form.val("user-payment-info-form", {
                "wxName": paymentInfo.wxName,
                "wxAccount": paymentInfo.wxAccount,
                "wxQrcode": paymentInfo.wxQrcode,
                "aliName": paymentInfo.aliName,
                "aliAccount": paymentInfo.aliAccount,
                "aliQrcode": paymentInfo.aliQrcode,
                "bankName": paymentInfo.bankName,
                "bankNo": paymentInfo.bankNo,
                "bank": paymentInfo.bank
            });
        }
    });
</script>

 src/main/resources/templates/febs/views/modules/order/orderDetail.html

@@ -46,6 +46,19 @@
                       autocomplete="off" class="layui-input" readonly>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">支付订单号：</label>
            <div class="layui-input-block">
                <input type="text" name="payOrderNo"
                       autocomplete="off" class="layui-input" readonly>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">支付凭证：</label>
            <div class="layui-input-block">
                <img alt="支付凭证" data-th-src="${orderDetail.payImage}"  style="width: 200px">
            </div>
        </div>

        <div class="layui-row layui-col-space10 layui-form-item">
            <div class="layui-col-lg6">
@@ -105,6 +118,8 @@
                "orderItems": orderDetail.orderItems,
                "expressNo": orderDetail.expressNo,
                "expressCom": orderDetail.expressCom,
                "payImage": orderDetail.payImage,
                "payOrderNo": orderDetail.payOrderNo,
                "address": orderDetail.address
            });
        }

 src/main/resources/templates/febs/views/modules/order/orderList.html

@@ -54,6 +54,18 @@
                        </div>
                    </form>
                    <table lay-filter="orderTable" lay-data="{id: 'orderTable'}"></table>
                    <style type="text/css">
                        .layui-table-cell{
                            text-align:center;
                            height: auto;
                            white-space: nowrap; /*文本不会换行，在同一行显示*/
                            overflow: hidden; /*超出隐藏*/
                            text-overflow: ellipsis; /*省略号显示*/
                        }
                        .layui-table img{
                            max-width:200px
                        }
                    </style>
                </div>
            </div>
        </div>
@@ -108,6 +120,22 @@
                    maxmin: true,
                });
            }

            if (layEvent === 'seePayImage') {
                var t = $view.find('#seePayImage'+data.id+'');
                //页面层
                layer.open({
                    type: 1,
                    title: "支付凭证",
                    skin: 'layui-layer-rim', //加上边框
                    area: ['80%', '80%'], //宽高
                    shadeClose: true, //开启遮罩关闭
                    end: function (index, layero) {
                        return false;
                    },
                    content: '<div style="text-align:center"><img src="' + $(t).attr('src') + '" /></div>'
                });
            }
        });

        // 查询按钮
@@ -133,12 +161,17 @@
                id: 'orderTable',
                url: ctx + 'admin/order/orderList',
                cols: [[
                        {field: 'orderNo', title: '订单编号', minWidth: 150,align:'left'},
                        {field: 'memberName', title: '购买人', minWidth: 150,align:'left'},
                        {field: 'memberPhone', title: '联系方式', minWidth: 150,align:'left'},
                        {field: 'amount', title: '订单金额', minWidth: 150,align:'left'},
                        {field: 'orderTime', title: '下单时间', minWidth: 150,align:'left'},
                        {field: 'payTime', title: '支付时间', minWidth: 150,align:'left'},
                        {field: 'orderNo', title: '订单编号', minWidth: 120,align:'left'},
                        {field: 'memberName', title: '购买人', minWidth: 120,align:'left'},
                        {field: 'memberPhone', title: '联系方式', minWidth: 120,align:'left'},
                        {field: 'amount', title: '订单金额', minWidth: 120,align:'left'},
                        {field: 'orderTime', title: '下单时间', minWidth: 120,align:'left'},
                        {field: 'payTime', title: '支付时间', minWidth: 120,align:'left'},
                        {field: 'payOrderNo', title: '支付订单号', minWidth: 120,align:'left'},
                        {field: 'payImage', title: '支付凭证',
                            templet: function (d) {
                                return '<a lay-event="seePayImage"><img id="seePayImage'+d.id+'" src="'+d.payImage+'" alt=""></a>';
                            }, minWidth: 200,align:'center'},
                        {field: 'status', title: '状态',
                            templet: function (d) {
                                if (d.status === 1) {
@@ -159,17 +192,6 @@
                                    return ''
                                }
                            }, minWidth: 80,align:'center'},
                    //     {field: 'accountStatus', title: '账号状态',
                    //         templet: function (d) {
                    //             if (d.accountStatus === 1) {
                    //                 return '<span style="color:green;">正常</span>'
                    //             } else if (d.accountStatus === 2) {
                    //                 return '<span style="color:red;">禁用</span>'
                    //             }else{
                    //                 return ''
                    //             }
                    //         }, minWidth: 80,align:'center'},
                    //     {field: 'createdTime', title: '注册时间', minWidth: 180,align:'center'},
                    {title: '操作',
                        templet: function (d) {
                             if (d.status === 2) {

 src/main/resources/templates/febs/views/modules/order/payMethodEdit.html

New file
@@ -0,0 +1,122 @@
<style>
    #user-payment-edit {
        padding: 20px 25px 25px 0;
    }

    #user-payment-edit .layui-treeSelect .ztree li a, .ztree li span {
        margin: 0 0 2px 3px !important;
    }
    #user-payment-edit #data-permission-tree-block {
        border: 1px solid #eee;
        border-radius: 2px;
        padding: 3px 0;
    }
    #user-payment-edit .layui-treeSelect .ztree li span.button.switch {
        top: 1px;
        left: 3px;
    }
    #user-payment-edit img{
        max-width:200px
    }

</style>
<div class="layui-fluid" id="user-payment-edit">
    <form class="layui-form" action="" lay-filter="user-payment-edit-form">
        <div class="layui-form-item febs-hide">
            <label class="layui-form-label">id：</label>
            <div class="layui-input-block">
                <input type="text" name="id">
            </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="code" 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="description" class="layui-input" readonly>
                </div>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">收款码：</label>
            <div class="layui-upload">
                <button type="button" class="layui-btn" id="test1">上传图片</button>
                <div class="layui-input-block">
                    <div class="layui-upload-list">
                        <img class="layui-upload-img" id="imageUrls" width="100%" >
                    </div>
                </div>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">图片链接：</label>
            <div class="layui-input-block">
                <input type="text" id="imageUrl" name="value" class="layui-input" readonly>
            </div>
        </div>
        <div class="layui-form-item febs-hide">
            <button class="layui-btn" lay-submit="" lay-filter="user-payment-edit-submit" id="submit"></button>
        </div>
    </form>
</div>

<script data-th-inline="javascript">
    layui.use(['febs', 'form', 'formSelects', 'validate', 'treeSelect', 'eleTree','upload'], function () {
        var $ = layui.$,
            febs = layui.febs,
            layer = layui.layer,
            formSelects = layui.formSelects,
            treeSelect = layui.treeSelect,
            form = layui.form,
            eleTree = layui.eleTree,
            payMethodEdit = [[${payMethodEdit}]],
            $view = $('#user-payment-edit'),
            validate = layui.validate,
            upload = layui.upload,
            _deptTree;

        //普通图片上传
        var uploadInst = upload.render({
            elem: '#test1'
            ,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
            ,before: function(obj){
                //预读本地文件示例，不支持ie8
                obj.preview(function(index, file, result){
                    $('#imageUrls').attr('src', result); //图片链接（base64）
                });
            }
            ,done: function(res){
                febs.alert.success(res.data.src);
                $("#imageUrl").val(res.data.src);
            }
        });

        form.render();

        initUserValue();

        function initUserValue() {
            $('#imageUrls').attr('src', payMethodEdit.value);
            form.val("user-payment-edit-form", {
                "id": payMethodEdit.id,
                "code": payMethodEdit.code,
                "description": payMethodEdit.description,
                "value": payMethodEdit.value
            });
        }

        form.on('submit(user-payment-edit-submit)', function (data) {
            febs.post(ctx + 'admin/order/payMethodEdit', data.field, function () {
                layer.closeAll();
                febs.alert.success('操作成功');
                $('#febs-order-paymethod').find('#reset').click();
            });
            return false;
        });
    });
</script>

 src/main/resources/templates/febs/views/modules/order/payMethodList.html

New file
@@ -0,0 +1,134 @@
<div class="layui-fluid layui-anim febs-anim" id="febs-order-paymethod" lay-title="商家收款">

    <div class="layui-row febs-container">
        <div class="layui-col-md12">
            <div class="layui-card">
                <div class="layui-card-body febs-table-full">
                    <form class="layui-form layui-table-form" lay-filter="user-table-form">
                        <div class="layui-form-item">
                            <div class="layui-col-md10">
                            </div>
                            <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
                                <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain table-action" id="query">
                                    <i class="layui-icon">&#xe848;</i>
                                </div>
                                <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset">
                                    <i class="layui-icon">&#xe79b;</i>
                                </div>
                            </div>
                        </div>
                    </form>
                    <table lay-filter="orderPaymethodTable" lay-data="{id: 'orderPaymethodTable'}"></table>
                    <style type="text/css">
                        .layui-table-cell{
                            text-align:center;
                            height: auto;
                            white-space: normal;
                        }
                        .layui-table img{
                            max-width:200px
                        }
                    </style>
                </div>
            </div>
        </div>
    </div>
</div>
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
    // 引入组件并初始化
    layui.use([ 'jquery', 'form', 'table', 'febs'], function () {
        var $ = layui.jquery,
            febs = layui.febs,
            form = layui.form,
            table = layui.table,
            $view = $('#febs-order-paymethod'),
            $query = $view.find('#query'),
            $reset = $view.find('#reset'),
            $searchForm = $view.find('form'),
            $add = $view.find('#add'),
            sortObject = {field: 'phone', type: null},
            tableIns;

        form.render();

        // 表格初始化
        initTable();

        // 初始化表格操作栏各个按钮功能
        table.on('tool(orderPaymethodTable)', function (obj) {
            var data = obj.data,
                layEvent = obj.event;
            if (layEvent === 'payMethodedit') {
                febs.modal.open('选择退货地址', 'modules/order/payMethodEdit/' + data.id, {
                    btn: ['确认', '取消'],
                    yes: function (index, layero) {
                        $('#user-payment-edit').find('#submit').trigger('click');
                    },
                    btn2: function () {
                        layer.closeAll();
                    }
                });
            }
            if (layEvent === 'seeImg') {
                    var t = $view.find('#seeImg'+data.id+'');
                    //页面层
                    layer.open({
                        type: 1,
                        title: "图片",
                        skin: 'layui-layer-rim', //加上边框
                        area: ['80%', '80%'], //宽高
                        shadeClose: true, //开启遮罩关闭
                        end: function (index, layero) {
                            return false;
                        },
                        content: '<div style="text-align:center"><img src="' + $(t).attr('src') + '" /></div>'
                    });
            }
        });

        // 查询按钮
        $query.on('click', function () {
            var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
            tableIns.reload({where: params, page: {curr: 1}});
        });

        // 刷新按钮
        $reset.on('click', function () {
            $searchForm[0].reset();
            sortObject.type = 'null';
            tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
        });

        function initTable() {
            tableIns = febs.table.init({
                elem: $view.find('table'),
                id: 'orderPaymethodTable',
                url: ctx + 'admin/order/payMethodList',
                cols: [[
                    {field: 'code', title: '编码', minWidth: 150,align:'left'},
                    {field: 'description', title: '描述', minWidth: 150,align:'left'},
                    {field: 'value', title: '收款码',
                        templet: function (d) {
                            return '<a lay-event="seeImg"><img id="seeImg'+d.id+'" src="'+d.value+'" alt=""></a>';
                        }, minWidth: 200,align:'center'},
                    {title: '操作',
                        templet: function (d) {
                            return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="payMethodedit" shiro:hasPermission="user:update">编辑</button>'
                        },minWidth: 300,align:'center'}
                ]]
            });
        }

        // 获取查询参数
        function getQueryParams() {
            return {
                name: $searchForm.find('input[name="name"]').val().trim(),
                phone: $searchForm.find('input[name="phone"]').val().trim(),
                orderNo: $searchForm.find('input[name="orderNo"]').val().trim(),
                status: $searchForm.find("select[name='status']").val(),
            };
        }

    })
</script>

 src/main/resources/templates/febs/views/modules/order/refundList.html

@@ -86,7 +86,7 @@
            var data = obj.data,
                layEvent = obj.event;
            if (layEvent === 'refunding') {
                febs.modal.open( '退款进度', 'modules/order/seeRefund/' + data.id, {
                febs.modal.open( '退款进度', 'modules/order/refunding/' + data.id, {
                    maxmin: true,
                });
            }
@@ -189,6 +189,7 @@
                            }
                        }, minWidth: 80,align:'center'},
                    {field: 'addressDetail', title: '收货信息', minWidth: 150,align:'left'},
                    {field: 'createdTime', title: '创建时间', minWidth: 150,align:'left'},
                    {title: '操作',
                        templet: function (d) {
                        if(d.status === 1){

 src/main/resources/templates/febs/views/modules/order/refunding.html

@@ -1,4 +1,3 @@

<div class="layui-fluid layui-anim febs-anim" id="febs-refunding-child" lay-title="退款进度">
    <div class="layui-row febs-container">
        <div class="layui-col-md12">

 src/main/resources/templates/febs/views/modules/order/withAddress.html

@@ -65,7 +65,7 @@
            });
        }

        //付款方式(下拉框)
        //(下拉框)
        $.get(ctx + 'admin/order/addAddress/tree', function (data) {
            for (var k in data)
            {