1.账户余额查询接口

src/main/java/com/ydtech/modules/admin/controller/SysUserAccountController.java

@@ -0,0 +1,38 @@
+package com.ydtech.modules.admin.controller;
+
+
+import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.admin.model.po.SysUserAccount;
+import com.ydtech.modules.admin.model.vo.SysUserAccountVo;
+import com.ydtech.modules.admin.service.SysUserAccountService;
+import com.ydtech.modules.base.controller.BaseController;
+import com.ydtech.modules.order.entity.BasePageResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+@Api(tags = "账户余额")
+@RequestMapping("/sysUserAccount")
+@RestController
+public class SysUserAccountController extends BaseController {
+    @Autowired
+    private SysUserAccountService sysUserAccountService;
+
+
+
+    @PostMapping("/queryPage")
+    @ApiOperation(value = "用户账户表分页")
+    public HttpResult<BasePageResult<SysUserAccount>> queryPageOrder(@RequestBody @Valid SysUserAccountVo sysUserAccountVo ) {
+        BasePageResult<SysUserAccount> result = sysUserAccountService.queryByVo(sysUserAccountVo);
+        return HttpResult.ok("success", result);
+    }
+
+
+
+}

src/main/java/com/ydtech/modules/admin/dao/SysUserAccountMapper.java

@@ -1,7 +1,10 @@
 package com.ydtech.modules.admin.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.modules.admin.model.po.SysUserAccount;
+import com.ydtech.modules.admin.model.vo.SysUserAccountVo;
+import org.apache.ibatis.annotations.Param;
 
 /**
 * @author Administrator
@@ -11,6 +14,8 @@ import com.ydtech.modules.admin.model.po.SysUserAccount;
 */
 public interface SysUserAccountMapper extends BaseMapper<SysUserAccount> {
 
+    Page<SysUserAccount> queryPageOrder(SysUserAccountVo sysUserAccountVo,@Param("page") Page page);
+
 }
 
 

src/main/java/com/ydtech/modules/admin/model/po/SysUserAccount.java

@@ -46,10 +46,73 @@ public class SysUserAccount implements Serializable {
     @TableField(value = "create_time")
     private Date createTime;
 
+    /**
+     * 手续费提现总金额
+     */
+    @TableField(value = "handling_amount_withdrawal")
+    private BigDecimal handlingAmountWithdrawal;
+
+    /**
+     * 手续费已到账金额
+     */
+    @TableField(value = "handling_amount_account")
+    private BigDecimal handlingAmountAccount;
+
+    /**
+     * 手续费支付中金额
+     */
+    @TableField(value = "handling_amount_payment")
+    private BigDecimal handlingAmountPayment;
+
+    /**
+     * 非跟单费提现总金额
+     */
+    @TableField(value = "documentary_amount_withdrawal")
+    private BigDecimal documentaryAmountWithdrawal;
+
+    /**
+     * 非跟单费已到账金额
+     */
+    @TableField(value = "documentary_amount_account")
+    private BigDecimal documentaryAmountAccount;
+
+    /**
+     * 非跟单费支付中金额
+     */
+    @TableField(value = "documentary_amount_payment")
+    private BigDecimal documentaryAmountpayment;
+
+    /**
+     * 分销费提现总金额
+     */
+    @TableField(value = "promotion_amount_withdrawal")
+    private BigDecimal promotionAmountWithdrawal;
+
+    /**
+     * 分销费已到账金额
+     */
+    @TableField(value = "promotion_amount_account")
+    private BigDecimal promotionAmountAccount;
+
+    /**
+     * 分销费支付中金额
+     */
+    @TableField(value = "promotion_amount_payment")
+    private BigDecimal promotionAmountPayment;
+
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
     @TableField(exist = false)
     private  String  documentaryStatus;
     @TableField(exist = false)
     private String  suborderId;
+
+    @TableField(exist = false)
+    private  String  deptName;
+    @TableField(exist = false)
+    private  String  name;
+
+    @TableField(exist = false)
+    private  String  deptId;
 }

src/main/java/com/ydtech/modules/admin/model/vo/SysUserAccountVo.java

@@ -0,0 +1,88 @@
+package com.ydtech.modules.admin.model.vo;
+
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ApiModel("查询Vo")
+public class SysUserAccountVo {
+
+    @ApiModelProperty(value = "用户id")
+    private String userId;
+
+
+    @ApiModelProperty(value = "手续费佣金")
+    private BigDecimal handlingFee;
+
+    @ApiModelProperty(value = "非跟单佣金")
+    private BigDecimal documentary;
+
+
+    @ApiModelProperty(value = "推广佣金")
+    private BigDecimal promotion;
+
+
+
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @TableField(value = "create_time",fill = FieldFill.INSERT_UPDATE)
+    private Date createTime;
+
+    @ApiModelProperty(value = "手续费提现总金额")
+    private BigDecimal handlingAmountWithdrawal;
+
+    @ApiModelProperty(value = "手续费已到账金额")
+    private BigDecimal handlingAmountAccount;
+
+    @ApiModelProperty(value = "手续费支付中金额")
+    private BigDecimal handlingAmountPayment;
+
+    @ApiModelProperty(value = "非跟单费提现总金额")
+    private BigDecimal documentaryAmountWithdrawal;
+
+    @ApiModelProperty(value = "非跟单费已到账金额")
+    private BigDecimal documentaryAmountAccount;
+
+    @ApiModelProperty(value = "非跟单费支付中金额")
+    private BigDecimal documentaryAmountPayment;
+
+    @ApiModelProperty(value = "分销费提现总金额")
+    private BigDecimal promotionAmountWithdrawal;
+
+    @ApiModelProperty(value = "分销费已到账金额")
+    private BigDecimal promotionAmountAccount;
+
+    @ApiModelProperty(value = "分销费支付中金额")
+    private BigDecimal promotionAmountPayment;
+
+
+    @ApiModelProperty(value = "部门id")
+    private String  deptId;
+
+    @ApiModelProperty(value = "部门id")
+    private String  deptName;
+
+
+
+
+
+    @ApiModelProperty(value = "每页页数")
+    @Min(value = 20, message = "页数最小为20")
+    @Max(value = 100, message = "页数最大为100")
+    private int pageSize;
+
+    @ApiModelProperty(value = "页数")
+    @Min(value = 1, message = "页数最小为1")
+    private int pageNum;
+}

src/main/java/com/ydtech/modules/admin/service/SysUserAccountService.java

@@ -2,6 +2,8 @@ package com.ydtech.modules.admin.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.modules.admin.model.po.SysUserAccount;
+import com.ydtech.modules.admin.model.vo.SysUserAccountVo;
+import com.ydtech.modules.order.entity.BasePageResult;
 
 /**
 * @author Administrator
@@ -12,4 +14,5 @@ public interface SysUserAccountService extends IService<SysUserAccount> {
 
     void addOrUpdate(SysUserAccount sysUserAccount);
 
+    BasePageResult<SysUserAccount> queryByVo(SysUserAccountVo sysUserAccountVo);
 }

src/main/java/com/ydtech/modules/admin/service/impl/SysUserAccountServiceImpl.java

@@ -1,15 +1,19 @@
 package com.ydtech.modules.admin.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.modules.admin.dao.SysUserAccountMapper;
 import com.ydtech.modules.admin.model.po.SysUserAccount;
 import com.ydtech.modules.admin.model.po.SysUserAccountHistory;
 import com.ydtech.modules.admin.model.po.SysUserBankCard;
+import com.ydtech.modules.admin.model.vo.SysUserAccountVo;
 import com.ydtech.modules.admin.service.SysUserAccountHistoryService;
 import com.ydtech.modules.admin.service.SysUserAccountService;
 import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.esm.model.EsmUserReferrer;
 import com.ydtech.modules.esm.service.EsmUserReferrerService;
+import com.ydtech.modules.order.entity.BasePageResult;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,7 +39,6 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
     @Override
     @Transactional
     public void addOrUpdate(SysUserAccount sysUserAccount) {
-        SysUserAccountHistory sysUserAccountHistory = new SysUserAccountHistory();
 
 //      如果用户id有值则累加   没有则 新增
         BigDecimal handlingFee = BigDecimal.ZERO;
@@ -82,7 +85,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
             if (sysUserAccountEntity.getPromotion() == null) {
                 sysUserAccountEntity.setPromotion(handlingFee);
             } else {
-                remainingAmount = remainingAmount.add(sysUserAccountEntity.getPromotion());
+                    remainingAmount = remainingAmount.add(sysUserAccountEntity.getPromotion());
 
             }
             sysUserAccountEntity.setHandlingFee(sysUserAccount.getHandlingFee().add(sysUserAccountEntity.getHandlingFee()));
@@ -111,6 +114,16 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
 
     }
 
+    @Override
+    public BasePageResult<SysUserAccount> queryByVo(SysUserAccountVo sysUserAccountVo) {
+        Page<SysUserAccount> page = new Page<>(sysUserAccountVo.getPageNum(), sysUserAccountVo.getPageSize());
+        QueryWrapper<SysUserAccount> wrapper = new QueryWrapper<>();
+
+        Page<SysUserAccount> sysUserAccountHistoryPage  = baseMapper.queryPageOrder(sysUserAccountVo,page);
+        return new BasePageResult<>(sysUserAccountVo.getPageNum(), page.getSize(), sysUserAccountHistoryPage.getTotal(), page.getPages(),
+                sysUserAccountHistoryPage.getRecords());
+    }
+
     private void judgeLevel(String userId, SysUserAccount sysUserAccountEntity, SysUserAccount newAccount) {
         if (!ObjectUtils.isNotEmpty(sysUserAccountEntity)) {
             sysUserAccountEntity = newAccount;

src/main/resources/mapper/modules/admin/SysUserAccountMapper.xml

@@ -10,10 +10,52 @@
             <result property="documentary" column="documentary" jdbcType="DECIMAL"/>
             <result property="promotion" column="promotion" jdbcType="DECIMAL"/>
             <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="handlingAmountWithdrawal" column="handling_amount_withdrawal" jdbcType="DECIMAL"/>
+            <result property="handlingAmountAccount" column="handling_amount_account" jdbcType="DECIMAL"/>
+            <result property="handlingAmountPayment" column="handling_amount_payment" jdbcType="DECIMAL"/>
+            <result property="documentaryAmountWithdrawal" column="documentary_amount_withdrawal" jdbcType="DECIMAL"/>
+            <result property="documentaryAmountAccount" column="documentary_amount_account" jdbcType="DECIMAL"/>
+            <result property="documentaryAmountPayment" column="documentary_amount_payment" jdbcType="DECIMAL"/>
+            <result property="promotionAmountWithdrawal" column="promotion_amount_withdrawal" jdbcType="DECIMAL"/>
+            <result property="promotionAmountAccount" column="promotion_amount_account" jdbcType="DECIMAL"/>
+            <result property="promotionAmountPayment" column="promotion_amount_payment" jdbcType="DECIMAL"/>
+
     </resultMap>
 
     <sql id="Base_Column_List">
         user_id,handling_fee,documentary,
         promotion,create_time
     </sql>
+
+    <select id="queryPageOrder"  resultType="com.ydtech.modules.admin.model.po.SysUserAccount">
+        select
+          a.user_id as "userId",
+          a.handling_fee as "handlingFee",
+          a.documentary as "documentary",
+          a.promotion as "promotion",
+          a.create_time as "createTime",
+          a.handling_amount_withdrawal as "handlingAmountWithdrawal",
+          a.handling_amount_account as "handlingAmountAccount",
+          a.handling_amount_payment as "handlingAmountPayment",
+          a.documentary_amount_withdrawal as "documentaryAmountWithdrawal",
+          a.documentary_amount_account as "documentaryAmountAccount",
+          a.documentary_amount_payment as "documentaryAmountPayment",
+          a.promotion_amount_withdrawal as "promotionAmountWithdrawal",
+          a.promotion_amount_account as "promotionAmountAccount",
+          a.promotion_amount_payment as "promotionAmountPayment",
+          b.dept_id  as  "deptId",
+          b.name  as  "name",
+          sd.name  as  "deptName"
+        from
+        sys_user_account a
+        left join   sys_user  b  on  a.user_id  = b.id
+        left join   sys_dept  sd  on  sd.id =b.dept_id
+        <where>
+            <if test="sysUserAccountVo.userId != null and sysUserAccountVo.userId != ''">
+                and a.user_id = #{sysUserAccountVo.userId}
+            </if>
+        </where>
+    </select>
+
+
 </mapper>