付款模块-账户管理服务商账户明细接口开发

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgaccount/entity/HlgAccountDetail.java

@@ -1,179 +1,185 @@
-package org.jeecg.modules.hlgaccount.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
-
-/**
- * @Description: 账户明细表
- * @Author: jeecg-boot
- * @Date: 2020-02-21
- * @Version: V1.0
- */
-@Data
-@TableName("hlg_account_detail")
-public class HlgAccountDetail implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(type = IdType.AUTO)
-    private java.lang.Integer id;
-    /**
-     * 平台企业账户
-     */
-    @Excel(name = "平台企业账户", width = 15)
-    private java.lang.Integer accountId;
-    /**
-     * 支付（仅付款才有值）
-     */
-    @Excel(name = "支付（仅付款才有值）", width = 15)
-    private java.lang.Integer paymentId;
-    /**
-     * 类型（0：充值 1：支付）
-     */
-    @Excel(name = "类型（0：充值 1：支付 2：打回）", width = 15)
-    @Dict(dicCode = "account_type")
-    private java.lang.Integer type;
-    /**
-     * 充值总金额（total_amount=amount+service_fee）
-     */
-    @Excel(name = "充值总金额（total_amount=amount+service_fee）", width = 15)
-    private java.lang.Double totalAmount;
-    /**
-     * 项目金额
-     */
-    @Excel(name = "项目金额", width = 15)
-    private java.lang.Double amount;
-    /**
-     * 服务费率
-     */
-    @Excel(name = "服务费率", width = 15)
-    private java.lang.Double serviceRate;
-    /**
-     * 服务费
-     */
-    @Excel(name = "服务费", width = 15)
-    private java.lang.Double serviceFee;
-    /**
-     * 数据权限
-     */
-    @Excel(name = "数据权限", width = 15)
-    private java.lang.String sysOrgCode;
-    /**
-     * 是否在税务统计展示（0：否 1：是）
-     */
-    @Excel(name = "是否在税务统计展示（0：否 1：是）", width = 15)
-    private java.lang.Integer isDisplay;
-    /**
-     * 生成时间
-     */
-    @Excel(name = "生成时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private java.util.Date generateTime;
-    /**
-     * 生成者
-     */
-    @Excel(name = "生成者", width = 15)
-    private java.lang.String generateBy;
-
-    /**
-     * 是否通过平台支付（0：否 1：是）
-     */
-    private Integer isThroughPlatform;
-
-    /**
-     * 是否退款（0：否 1：是）
-     */
-    private Integer isDrawback;
-
-    /**
-     * 付款单号(仅类型为支付时才有)
-     */
-    @TableField(exist = false)
-    private String paymentCode;
-
-    /**
-     * 企业名称
-     */
-    @TableField(exist = false)
-    private java.lang.String companyName;
-
-    /**
-     * 服务商
-     */
-    @TableField(exist = false)
-    private java.lang.String subcontractorName;
-
-    /**
-     * 平台名称
-     */
-    @TableField(exist = false)
-    private java.lang.String platformName;
-
-    /**
-     * 是否修改服务费（1:修改过）
-     */
-    @TableField(exist = false)
-    private Integer isEditServiceFee;
-
-    /**
-     * 备注
-     */
-    @TableField(exist = false)
-    private String remark;
-
-    /**
-     * 充值合计
-     */
-    @TableField(exist = false)
-    private Double rechargeMoney;
-
-    /**
-     * 服务费合计
-     */
-    @TableField(exist = false)
-    private Double serviceMoney;
-
-    /**
-     * 付款合计
-     */
-    @TableField(exist = false)
-    private Double paymentMoney;
-
-    @TableField(exist = false)
-    private String createTime_begin;
-
-    @TableField(exist = false)
-    private String createTime_end;
-
-    /**
-     * 企业id(判断企业是否是开心 0：不是；)
-     */
-    @TableField(exist = false)
-    private Integer companyId;
-
-    /**
-     * 服务商id
-     */
-    @TableField(exist = false)
-    private Integer subcontractorId;
-
-    /**
-     * 账目余额
-     */
-    @TableField(exist = false)
-    private Double balanceMoney;
-}
+package org.jeecg.modules.hlgaccount.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+
+/**
+ * @Description: 账户明细表
+ * @Author: jeecg-boot
+ * @Date: 2020-02-21
+ * @Version: V1.0
+ */
+@Data
+@TableName("hlg_account_detail")
+public class HlgAccountDetail implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.AUTO)
+    private java.lang.Integer id;
+    /**
+     * 平台企业账户
+     */
+    @Excel(name = "平台企业账户", width = 15)
+    private java.lang.Integer accountId;
+    /**
+     * 支付（仅付款才有值）
+     */
+    @Excel(name = "支付（仅付款才有值）", width = 15)
+    private java.lang.Integer paymentId;
+    /**
+     * 类型（0：充值 1：支付）
+     */
+    @Excel(name = "类型（0：充值 1：支付 2：打回）", width = 15)
+    @Dict(dicCode = "account_type")
+    private java.lang.Integer type;
+    /**
+     * 充值总金额（total_amount=amount+service_fee）
+     */
+    @Excel(name = "充值总金额（total_amount=amount+service_fee）", width = 15)
+    private java.lang.Double totalAmount;
+    /**
+     * 项目金额
+     */
+    @Excel(name = "项目金额", width = 15)
+    private java.lang.Double amount;
+    /**
+     * 服务费率
+     */
+    @Excel(name = "服务费率", width = 15)
+    private java.lang.Double serviceRate;
+    /**
+     * 服务费
+     */
+    @Excel(name = "服务费", width = 15)
+    private java.lang.Double serviceFee;
+    /**
+     * 数据权限
+     */
+    @Excel(name = "数据权限", width = 15)
+    private java.lang.String sysOrgCode;
+    /**
+     * 是否在税务统计展示（0：否 1：是）
+     */
+    @Excel(name = "是否在税务统计展示（0：否 1：是）", width = 15)
+    private java.lang.Integer isDisplay;
+    /**
+     * 生成时间
+     */
+    @Excel(name = "生成时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private java.util.Date generateTime;
+    /**
+     * 生成者
+     */
+    @Excel(name = "生成者", width = 15)
+    private java.lang.String generateBy;
+
+    /**
+     * 是否通过平台支付（0：否 1：是）
+     */
+    private Integer isThroughPlatform;
+
+    /**
+     * 是否退款（0：否 1：是）
+     */
+    private Integer isDrawback;
+
+    /**
+     * 付款单号(仅类型为支付时才有)
+     */
+    @TableField(exist = false)
+    private String paymentCode;
+
+    /**
+     * 企业名称
+     */
+    @TableField(exist = false)
+    private java.lang.String companyName;
+
+    /**
+     * 服务商
+     */
+    @TableField(exist = false)
+    private java.lang.String subcontractorName;
+
+    /**
+     * 平台名称
+     */
+    @TableField(exist = false)
+    private java.lang.String platformName;
+
+    /**
+     * 是否修改服务费（1:修改过）
+     */
+    @TableField(exist = false)
+    private Integer isEditServiceFee;
+
+    /**
+     * 备注
+     */
+    @TableField(exist = false)
+    private String remark;
+
+    /**
+     * 充值合计
+     */
+    @TableField(exist = false)
+    private Double rechargeMoney;
+
+    /**
+     * 服务费合计
+     */
+    @TableField(exist = false)
+    private Double serviceMoney;
+
+    /**
+     * 付款合计
+     */
+    @TableField(exist = false)
+    private Double paymentMoney;
+
+    @TableField(exist = false)
+    private String createTime_begin;
+
+    @TableField(exist = false)
+    private String createTime_end;
+
+    /**
+     * 企业id(判断企业是否是开心 0：不是；)
+     */
+    @TableField(exist = false)
+    private Integer companyId;
+
+    /**
+     * 服务商id
+     */
+    @TableField(exist = false)
+    private Integer subcontractorId;
+
+    /**
+     * 账目余额
+     */
+    @TableField(exist = false)
+    private Double balanceMoney;
+
+    /**
+     * 1:服务商 2：开心
+     */
+    @TableField(exist = false)
+    private Integer cpType;
+}

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgaccount/service/IHlgAccountDetailService.java

@@ -1,53 +1,56 @@
-package org.jeecg.modules.hlgaccount.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.hlgaccount.entity.HlgAccountDetail;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.hlgaccount.entity.HlgAccountDetailExport;
-import org.jeecg.modules.hlgaccount.entity.HlgAccountDetailInMoney;
-import org.jeecg.modules.hlgaccount.entity.HlgAccountDetailManagerExport;
-import org.jeecg.modules.hlgcompany.entity.HlgCompanySubcontractor;
-import org.jeecg.modules.hlgcpmanager.entity.HlgCpAccountDetail;
-import org.jeecg.modules.hlgpayment.entity.HlgPaymentDetail;
-
-import java.util.List;
-
-/**
- * @Description: 账户明细表
- * @Author: jeecg-boot
- * @Date: 2020-02-21
- * @Version: V1.0
- */
-public interface IHlgAccountDetailService extends IService<HlgAccountDetail> {
-
-    Page<HlgAccountDetail> pageList(Page<HlgAccountDetail> page, HlgAccountDetail hlgAccountDetail, QueryWrapper<HlgAccountDetail> queryWrapper);
-
-    Page<HlgAccountDetail> pageRefundList(Page<HlgAccountDetail> page, HlgAccountDetail hlgAccountDetail, QueryWrapper<HlgAccountDetail> queryWrapper);
-
-    Result<HlgAccountDetail> refund(HlgAccountDetail hlgAccountDetail);
-
-    Result<HlgAccountDetail> recharge(HlgAccountDetail hlgAccountDetail);
-
-    Page<HlgAccountDetail> pageAllList(Page<HlgAccountDetail> page, HlgAccountDetail hlgAccountDetail, QueryWrapper<HlgAccountDetail> queryWrapper);
-
-    List<HlgAccountDetailExport> findExportList(HlgAccountDetailExport hlgAccountDetail, QueryWrapper<HlgAccountDetailExport> queryWrapper);
-
-    List<HlgAccountDetailInMoney> pageOutList(HlgAccountDetailInMoney hlgAccountDetailInMoney, QueryWrapper<HlgAccountDetailInMoney> queryWrapper);
-
-    List<HlgAccountDetailInMoney> getHlgAccountDetailInMoneyList(HlgAccountDetailInMoney hlgAccountDetailInMoney, QueryWrapper<HlgAccountDetailInMoney> queryWrapper);
-
-    Page<HlgAccountDetail> pageManagerList(Page<HlgAccountDetail> page, HlgAccountDetail hlgAccountDetail, QueryWrapper<HlgAccountDetail> queryWrapper);
-
-    List<HlgPaymentDetail> findListByCompanyIdAndAubcontractorId(HlgCompanySubcontractor hlgCompanySubcontractor);
-
-    Result<HlgAccountDetail> editServiceFee(HlgAccountDetail hlgAccountDetail);
-
-    Result<HlgAccountDetail> rechargeA_B(HlgCpAccountDetail hlgCpAccountDetail);
-
-    Result<HlgAccountDetail> refundA_B(HlgCpAccountDetail hlgCpAccountDetail);
-
-    List<HlgAccountDetailManagerExport> findManagerExportList(HlgAccountDetailManagerExport hlgAccountDetailManagerExport, QueryWrapper<HlgAccountDetailManagerExport> queryWrapper);
-}
+package org.jeecg.modules.hlgaccount.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.hlgaccount.entity.HlgAccountDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.hlgaccount.entity.HlgAccountDetailExport;
+import org.jeecg.modules.hlgaccount.entity.HlgAccountDetailInMoney;
+import org.jeecg.modules.hlgaccount.entity.HlgAccountDetailManagerExport;
+import org.jeecg.modules.hlgcompany.entity.HlgCompanySubcontractor;
+import org.jeecg.modules.hlgcpmanager.entity.HlgCpAccountDetail;
+import org.jeecg.modules.hlgpayment.entity.HlgPaymentDetail;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * @Description: 账户明细表
+ * @Author: jeecg-boot
+ * @Date: 2020-02-21
+ * @Version: V1.0
+ */
+public interface IHlgAccountDetailService extends IService<HlgAccountDetail> {
+
+    Page<HlgAccountDetail> pageList(Page<HlgAccountDetail> page, HlgAccountDetail hlgAccountDetail, QueryWrapper<HlgAccountDetail> queryWrapper);
+
+    Page<HlgAccountDetail> pageRefundList(Page<HlgAccountDetail> page, HlgAccountDetail hlgAccountDetail, QueryWrapper<HlgAccountDetail> queryWrapper);
+
+    Result<HlgAccountDetail> refund(HlgAccountDetail hlgAccountDetail);
+
+    Result<HlgAccountDetail> recharge(HlgAccountDetail hlgAccountDetail);
+
+    Page<HlgAccountDetail> pageAllList(Page<HlgAccountDetail> page, HlgAccountDetail hlgAccountDetail, QueryWrapper<HlgAccountDetail> queryWrapper);
+
+    List<HlgAccountDetailExport> findExportList(HlgAccountDetailExport hlgAccountDetail, QueryWrapper<HlgAccountDetailExport> queryWrapper);
+
+    List<HlgAccountDetailInMoney> pageOutList(HlgAccountDetailInMoney hlgAccountDetailInMoney, QueryWrapper<HlgAccountDetailInMoney> queryWrapper);
+
+    List<HlgAccountDetailInMoney> getHlgAccountDetailInMoneyList(HlgAccountDetailInMoney hlgAccountDetailInMoney, QueryWrapper<HlgAccountDetailInMoney> queryWrapper);
+
+    Page<HlgAccountDetail> pageManagerList(Page<HlgAccountDetail> page, HlgAccountDetail hlgAccountDetail, QueryWrapper<HlgAccountDetail> queryWrapper);
+
+    List<HlgPaymentDetail> findListByCompanyIdAndAubcontractorId(HlgCompanySubcontractor hlgCompanySubcontractor);
+
+    Result<HlgAccountDetail> editServiceFee(HlgAccountDetail hlgAccountDetail);
+
+    Result<HlgAccountDetail> rechargeA_B(HlgCpAccountDetail hlgCpAccountDetail);
+
+    Result<HlgAccountDetail> refundA_B(HlgCpAccountDetail hlgCpAccountDetail);
+
+    List<HlgAccountDetailManagerExport> findManagerExportList(HlgAccountDetailManagerExport hlgAccountDetailManagerExport, QueryWrapper<HlgAccountDetailManagerExport> queryWrapper);
+
+    Page<HlgAccountDetail> pageManagerListApi(Integer pageNo, Integer pageSize, HlgAccountDetail hlgAccountDetail, HttpServletRequest req);
+}

happy-boot-module-settlement/src/main/java/org/jeecg/common/utils/OauthApi.java

@@ -70,10 +70,10 @@ public interface OauthApi {
     public static final String paymentDetailList = "/oauth/hlwPayment/detailList";
 
     //我的账户-服务商账户明细
-    public static final String companyAccountDetailList = "/oauth/hlwCompanyAccountDetail/list";
+    public static final String companyAccountDetailList = "/oauth/hlwCompanyAccount/detailList";
 
     //我的账户-导出
-    public static final String companyAccountDetailExport = "/oauth/hlwCompanyAccountDetail/export";
+    public static final String companyAccountDetailExport = "/oauth/hlwCompanyAccount/detailExport";
 
     //用户-新增
     public static final String userAdd = "/oauth/hlwUser/add";