mng

.idea/mybatisx/templates.xml

@@ -49,8 +49,8 @@
             <option name="tableUIInfoList">
               <list>
                 <TableUIInfo>
-                  <option name="className" value="AskaChannelnos" />
-                  <option name="tableName" value="aska_channelnos" />
+                  <option name="className" value="AskaCashrequest" />
+                  <option name="tableName" value="aska_cashrequest" />
                 </TableUIInfo>
               </list>
             </option>

admin/src/main/java/com/mofangchuxing/aska/admin/controller/ChannelController.java

@@ -7,6 +7,7 @@ import com.mofangchuxing.aska.domain.dto.ChannelDto;
 import com.mofangchuxing.aska.domain.dto.ChannelNoDto;
 import com.mofangchuxing.aska.domain.dto.OrderDto;
 import com.mofangchuxing.aska.domain.utils.PageUtils;
+import com.mofangchuxing.aska.domain.vo.AskaChannelsVo;
 import com.mofangchuxing.aska.service.ChannelService;
 import com.mofangchuxing.aska.service.OrderService;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * @Author: syl
@@ -69,4 +71,48 @@ public class ChannelController extends AdminBaseController{
         channelService.addChannelNo(channelNoDto);
         return R.ok();
     }
+
+    @PostMapping("/queryPayment")
+    public R queryPayment() {
+        return R.ok();
+    }
+
+    @PostMapping("/getBalance")
+    public R getBalance(@RequestBody ChannelDto channelDto) {
+        AskaAccounts askaAccounts = getSysUser(channelDto.getT());
+        if (askaAccounts == null){
+            return R.error("token_expire");
+        }
+        AskaChannelsVo askaChannelsVo = channelService.getBalance(channelDto);
+        return R.ok(askaChannelsVo);
+    }
+
+    @PostMapping("/getCash")
+    public R getCash(@RequestBody ChannelDto channelDto) {
+        AskaAccounts askaAccounts = getSysUser(channelDto.getT());
+        if (askaAccounts == null){
+            return R.error("token_expire");
+        }
+        channelService.addCashRequest(askaAccounts, channelDto);
+        return R.ok();
+    }
+
+    @PostMapping("/getCashHistory")
+    public R getCashHistory(@RequestBody ChannelDto channelDto) {
+        AskaAccounts askaAccounts = getSysUser(channelDto.getT());
+        if (askaAccounts == null){
+            return R.error("token_expire");
+        }
+        PageUtils pageUtils = channelService.getCashHistory(channelDto);
+        return R.ok(pageUtils);
+    }
+
+    @PostMapping("/setReceivingConfig")
+    public R setReceivingConfig(@RequestBody ChannelDto channelDto) {
+        AskaAccounts askaAccounts = getSysUser(channelDto.getT());
+        if (askaAccounts == null){
+            return R.error("token_expire");
+        }
+        return R.ok();
+    }
 }

dao/src/main/java/com/mofangchuxing/aska/dao/domain/AskaCashrequest.java

@@ -0,0 +1,308 @@
+package com.mofangchuxing.aska.dao.domain;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 
+ * @TableName aska_cashrequest
+ */
+public class AskaCashrequest implements Serializable {
+    /**
+     * 
+     */
+    private Integer id;
+
+    /**
+     * 合作方id:retailid或channelId
+     */
+    private Integer partnerId;
+
+    /**
+     * 合作方类型:{retail,channel}
+     */
+    private String partnerType;
+
+    /**
+     * 名称
+     */
+    private String partnerName;
+
+    /**
+     * 申请金额(分)
+     */
+    private Integer requestAmount;
+
+    /**
+     * 
+     */
+    private Date requestTime;
+
+    /**
+     * 状态{申请,拒绝,已付款}
+     */
+    private String status;
+
+    /**
+     * 实付金额(分)
+     */
+    private Integer amount;
+
+    /**
+     * 实付时间，如果状态为拒绝，则为拒绝时间
+     */
+    private Date payTime;
+
+    /**
+     * 备注
+     */
+    private String note;
+
+    /**
+     * 操作人id
+     */
+    private Integer userId;
+
+    /**
+     * 操作人姓名
+     */
+    private String userName;
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 合作方id:retailid或channelId
+     */
+    public Integer getPartnerId() {
+        return partnerId;
+    }
+
+    /**
+     * 合作方id:retailid或channelId
+     */
+    public void setPartnerId(Integer partnerId) {
+        this.partnerId = partnerId;
+    }
+
+    /**
+     * 合作方类型:{retail,channel}
+     */
+    public String getPartnerType() {
+        return partnerType;
+    }
+
+    /**
+     * 合作方类型:{retail,channel}
+     */
+    public void setPartnerType(String partnerType) {
+        this.partnerType = partnerType;
+    }
+
+    /**
+     * 名称
+     */
+    public String getPartnerName() {
+        return partnerName;
+    }
+
+    /**
+     * 名称
+     */
+    public void setPartnerName(String partnerName) {
+        this.partnerName = partnerName;
+    }
+
+    /**
+     * 申请金额(分)
+     */
+    public Integer getRequestAmount() {
+        return requestAmount;
+    }
+
+    /**
+     * 申请金额(分)
+     */
+    public void setRequestAmount(Integer requestAmount) {
+        this.requestAmount = requestAmount;
+    }
+
+    /**
+     * 
+     */
+    public Date getRequestTime() {
+        return requestTime;
+    }
+
+    /**
+     * 
+     */
+    public void setRequestTime(Date requestTime) {
+        this.requestTime = requestTime;
+    }
+
+    /**
+     * 状态{申请,拒绝,已付款}
+     */
+    public String getStatus() {
+        return status;
+    }
+
+    /**
+     * 状态{申请,拒绝,已付款}
+     */
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    /**
+     * 实付金额(分)
+     */
+    public Integer getAmount() {
+        return amount;
+    }
+
+    /**
+     * 实付金额(分)
+     */
+    public void setAmount(Integer amount) {
+        this.amount = amount;
+    }
+
+    /**
+     * 实付时间，如果状态为拒绝，则为拒绝时间
+     */
+    public Date getPayTime() {
+        return payTime;
+    }
+
+    /**
+     * 实付时间，如果状态为拒绝，则为拒绝时间
+     */
+    public void setPayTime(Date payTime) {
+        this.payTime = payTime;
+    }
+
+    /**
+     * 备注
+     */
+    public String getNote() {
+        return note;
+    }
+
+    /**
+     * 备注
+     */
+    public void setNote(String note) {
+        this.note = note;
+    }
+
+    /**
+     * 操作人id
+     */
+    public Integer getUserId() {
+        return userId;
+    }
+
+    /**
+     * 操作人id
+     */
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    /**
+     * 操作人姓名
+     */
+    public String getUserName() {
+        return userName;
+    }
+
+    /**
+     * 操作人姓名
+     */
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        AskaCashrequest other = (AskaCashrequest) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getPartnerId() == null ? other.getPartnerId() == null : this.getPartnerId().equals(other.getPartnerId()))
+            && (this.getPartnerType() == null ? other.getPartnerType() == null : this.getPartnerType().equals(other.getPartnerType()))
+            && (this.getPartnerName() == null ? other.getPartnerName() == null : this.getPartnerName().equals(other.getPartnerName()))
+            && (this.getRequestAmount() == null ? other.getRequestAmount() == null : this.getRequestAmount().equals(other.getRequestAmount()))
+            && (this.getRequestTime() == null ? other.getRequestTime() == null : this.getRequestTime().equals(other.getRequestTime()))
+            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
+            && (this.getAmount() == null ? other.getAmount() == null : this.getAmount().equals(other.getAmount()))
+            && (this.getPayTime() == null ? other.getPayTime() == null : this.getPayTime().equals(other.getPayTime()))
+            && (this.getNote() == null ? other.getNote() == null : this.getNote().equals(other.getNote()))
+            && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
+            && (this.getUserName() == null ? other.getUserName() == null : this.getUserName().equals(other.getUserName()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getPartnerId() == null) ? 0 : getPartnerId().hashCode());
+        result = prime * result + ((getPartnerType() == null) ? 0 : getPartnerType().hashCode());
+        result = prime * result + ((getPartnerName() == null) ? 0 : getPartnerName().hashCode());
+        result = prime * result + ((getRequestAmount() == null) ? 0 : getRequestAmount().hashCode());
+        result = prime * result + ((getRequestTime() == null) ? 0 : getRequestTime().hashCode());
+        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
+        result = prime * result + ((getAmount() == null) ? 0 : getAmount().hashCode());
+        result = prime * result + ((getPayTime() == null) ? 0 : getPayTime().hashCode());
+        result = prime * result + ((getNote() == null) ? 0 : getNote().hashCode());
+        result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
+        result = prime * result + ((getUserName() == null) ? 0 : getUserName().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", partnerId=").append(partnerId);
+        sb.append(", partnerType=").append(partnerType);
+        sb.append(", partnerName=").append(partnerName);
+        sb.append(", requestAmount=").append(requestAmount);
+        sb.append(", requestTime=").append(requestTime);
+        sb.append(", status=").append(status);
+        sb.append(", amount=").append(amount);
+        sb.append(", payTime=").append(payTime);
+        sb.append(", note=").append(note);
+        sb.append(", userId=").append(userId);
+        sb.append(", userName=").append(userName);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

dao/src/main/java/com/mofangchuxing/aska/dao/mapper/AskaCashrequestMapper.java

@@ -0,0 +1,30 @@
+package com.mofangchuxing.aska.dao.mapper;
+
+import com.mofangchuxing.aska.dao.domain.AskaCashrequest;
+import com.mofangchuxing.aska.domain.dto.ChannelDto;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+* @author syl
+* @description 针对表【aska_cashrequest】的数据库操作Mapper
+* @createDate 2023-09-06 14:21:41
+* @Entity com.mofangchuxing.aska.dao.domain.AskaCashrequest
+*/
+public interface AskaCashrequestMapper {
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(AskaCashrequest record);
+
+    int insertSelective(AskaCashrequest record);
+
+    AskaCashrequest selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(AskaCashrequest record);
+
+    int updateByPrimaryKey(AskaCashrequest record);
+
+    List<AskaCashrequest> getCashHistory(ChannelDto channelDto);
+}

dao/src/main/resources/mapper/AskaCashrequestMapper.xml

@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mofangchuxing.aska.dao.mapper.AskaCashrequestMapper">
+
+    <resultMap id="BaseResultMap" type="com.mofangchuxing.aska.dao.domain.AskaCashrequest">
+            <id property="id" column="id" jdbcType="INTEGER"/>
+            <result property="partnerId" column="partnerId" jdbcType="INTEGER"/>
+            <result property="partnerType" column="partnerType" jdbcType="CHAR"/>
+            <result property="partnerName" column="partnerName" jdbcType="VARCHAR"/>
+            <result property="requestAmount" column="requestAmount" jdbcType="INTEGER"/>
+            <result property="requestTime" column="requestTime" jdbcType="TIMESTAMP"/>
+            <result property="status" column="status" jdbcType="CHAR"/>
+            <result property="amount" column="amount" jdbcType="INTEGER"/>
+            <result property="payTime" column="payTime" jdbcType="TIMESTAMP"/>
+            <result property="note" column="note" jdbcType="VARCHAR"/>
+            <result property="userId" column="userId" jdbcType="INTEGER"/>
+            <result property="userName" column="userName" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,partnerId,partnerType,
+        partnerName,requestAmount,requestTime,
+        status,amount,payTime,
+        note,userId,userName
+    </sql>
+
+    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from aska_cashrequest
+        where  id = #{id,jdbcType=INTEGER} 
+    </select>
+    <select id="getCashHistory" resultType="com.mofangchuxing.aska.dao.domain.AskaCashrequest">
+        select amount,partnerId,payTime,requestTime,status
+        from aska_cashrequest
+        where 1=1
+        <if test="channelId != null and channelId != ''">
+            and partnerId = #{channelId}
+        </if>
+    </select>
+
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+        delete from aska_cashrequest
+        where  id = #{id,jdbcType=INTEGER} 
+    </delete>
+    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.mofangchuxing.aska.dao.domain.AskaCashrequest" useGeneratedKeys="true">
+        insert into aska_cashrequest
+        ( id,partnerId,partnerType
+        ,partnerName,requestAmount,requestTime
+        ,status,amount,payTime
+        ,note,userId,userName
+        )
+        values (#{id,jdbcType=INTEGER},#{partnerId,jdbcType=INTEGER},#{partnerType,jdbcType=CHAR}
+        ,#{partnerName,jdbcType=VARCHAR},#{requestAmount,jdbcType=INTEGER},#{requestTime,jdbcType=TIMESTAMP}
+        ,#{status,jdbcType=CHAR},#{amount,jdbcType=INTEGER},#{payTime,jdbcType=TIMESTAMP}
+        ,#{note,jdbcType=VARCHAR},#{userId,jdbcType=INTEGER},#{userName,jdbcType=VARCHAR}
+        )
+    </insert>
+    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.mofangchuxing.aska.dao.domain.AskaCashrequest" useGeneratedKeys="true">
+        insert into aska_cashrequest
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+                <if test="id != null">id,</if>
+                <if test="partnerId != null">partnerId,</if>
+                <if test="partnerType != null">partnerType,</if>
+                <if test="partnerName != null">partnerName,</if>
+                <if test="requestAmount != null">requestAmount,</if>
+                <if test="requestTime != null">requestTime,</if>
+                <if test="status != null">status,</if>
+                <if test="amount != null">amount,</if>
+                <if test="payTime != null">payTime,</if>
+                <if test="note != null">note,</if>
+                <if test="userId != null">userId,</if>
+                <if test="userName != null">userName,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+                <if test="id != null">#{id,jdbcType=INTEGER},</if>
+                <if test="partnerId != null">#{partnerId,jdbcType=INTEGER},</if>
+                <if test="partnerType != null">#{partnerType,jdbcType=CHAR},</if>
+                <if test="partnerName != null">#{partnerName,jdbcType=VARCHAR},</if>
+                <if test="requestAmount != null">#{requestAmount,jdbcType=INTEGER},</if>
+                <if test="requestTime != null">#{requestTime,jdbcType=TIMESTAMP},</if>
+                <if test="status != null">#{status,jdbcType=CHAR},</if>
+                <if test="amount != null">#{amount,jdbcType=INTEGER},</if>
+                <if test="payTime != null">#{payTime,jdbcType=TIMESTAMP},</if>
+                <if test="note != null">#{note,jdbcType=VARCHAR},</if>
+                <if test="userId != null">#{userId,jdbcType=INTEGER},</if>
+                <if test="userName != null">#{userName,jdbcType=VARCHAR},</if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.mofangchuxing.aska.dao.domain.AskaCashrequest">
+        update aska_cashrequest
+        <set>
+                <if test="partnerId != null">
+                    partnerId = #{partnerId,jdbcType=INTEGER},
+                </if>
+                <if test="partnerType != null">
+                    partnerType = #{partnerType,jdbcType=CHAR},
+                </if>
+                <if test="partnerName != null">
+                    partnerName = #{partnerName,jdbcType=VARCHAR},
+                </if>
+                <if test="requestAmount != null">
+                    requestAmount = #{requestAmount,jdbcType=INTEGER},
+                </if>
+                <if test="requestTime != null">
+                    requestTime = #{requestTime,jdbcType=TIMESTAMP},
+                </if>
+                <if test="status != null">
+                    status = #{status,jdbcType=CHAR},
+                </if>
+                <if test="amount != null">
+                    amount = #{amount,jdbcType=INTEGER},
+                </if>
+                <if test="payTime != null">
+                    payTime = #{payTime,jdbcType=TIMESTAMP},
+                </if>
+                <if test="note != null">
+                    note = #{note,jdbcType=VARCHAR},
+                </if>
+                <if test="userId != null">
+                    userId = #{userId,jdbcType=INTEGER},
+                </if>
+                <if test="userName != null">
+                    userName = #{userName,jdbcType=VARCHAR},
+                </if>
+        </set>
+        where   id = #{id,jdbcType=INTEGER} 
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.mofangchuxing.aska.dao.domain.AskaCashrequest">
+        update aska_cashrequest
+        set 
+            partnerId =  #{partnerId,jdbcType=INTEGER},
+            partnerType =  #{partnerType,jdbcType=CHAR},
+            partnerName =  #{partnerName,jdbcType=VARCHAR},
+            requestAmount =  #{requestAmount,jdbcType=INTEGER},
+            requestTime =  #{requestTime,jdbcType=TIMESTAMP},
+            status =  #{status,jdbcType=CHAR},
+            amount =  #{amount,jdbcType=INTEGER},
+            payTime =  #{payTime,jdbcType=TIMESTAMP},
+            note =  #{note,jdbcType=VARCHAR},
+            userId =  #{userId,jdbcType=INTEGER},
+            userName =  #{userName,jdbcType=VARCHAR}
+        where   id = #{id,jdbcType=INTEGER} 
+    </update>
+</mapper>

dao/target/classes/mapper/AskaCashrequestMapper.xml

@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mofangchuxing.aska.dao.mapper.AskaCashrequestMapper">
+
+    <resultMap id="BaseResultMap" type="com.mofangchuxing.aska.dao.domain.AskaCashrequest">
+            <id property="id" column="id" jdbcType="INTEGER"/>
+            <result property="partnerId" column="partnerId" jdbcType="INTEGER"/>
+            <result property="partnerType" column="partnerType" jdbcType="CHAR"/>
+            <result property="partnerName" column="partnerName" jdbcType="VARCHAR"/>
+            <result property="requestAmount" column="requestAmount" jdbcType="INTEGER"/>
+            <result property="requestTime" column="requestTime" jdbcType="TIMESTAMP"/>
+            <result property="status" column="status" jdbcType="CHAR"/>
+            <result property="amount" column="amount" jdbcType="INTEGER"/>
+            <result property="payTime" column="payTime" jdbcType="TIMESTAMP"/>
+            <result property="note" column="note" jdbcType="VARCHAR"/>
+            <result property="userId" column="userId" jdbcType="INTEGER"/>
+            <result property="userName" column="userName" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,partnerId,partnerType,
+        partnerName,requestAmount,requestTime,
+        status,amount,payTime,
+        note,userId,userName
+    </sql>
+
+    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from aska_cashrequest
+        where  id = #{id,jdbcType=INTEGER} 
+    </select>
+    <select id="getCashHistory" resultType="com.mofangchuxing.aska.dao.domain.AskaCashrequest">
+        select amount,partnerId,payTime,requestTime,status
+        from aska_cashrequest
+        where 1=1
+        <if test="channelId != null and channelId != ''">
+            and partnerId = #{channelId}
+        </if>
+    </select>
+
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+        delete from aska_cashrequest
+        where  id = #{id,jdbcType=INTEGER} 
+    </delete>
+    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.mofangchuxing.aska.dao.domain.AskaCashrequest" useGeneratedKeys="true">
+        insert into aska_cashrequest
+        ( id,partnerId,partnerType
+        ,partnerName,requestAmount,requestTime
+        ,status,amount,payTime
+        ,note,userId,userName
+        )
+        values (#{id,jdbcType=INTEGER},#{partnerId,jdbcType=INTEGER},#{partnerType,jdbcType=CHAR}
+        ,#{partnerName,jdbcType=VARCHAR},#{requestAmount,jdbcType=INTEGER},#{requestTime,jdbcType=TIMESTAMP}
+        ,#{status,jdbcType=CHAR},#{amount,jdbcType=INTEGER},#{payTime,jdbcType=TIMESTAMP}
+        ,#{note,jdbcType=VARCHAR},#{userId,jdbcType=INTEGER},#{userName,jdbcType=VARCHAR}
+        )
+    </insert>
+    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.mofangchuxing.aska.dao.domain.AskaCashrequest" useGeneratedKeys="true">
+        insert into aska_cashrequest
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+                <if test="id != null">id,</if>
+                <if test="partnerId != null">partnerId,</if>
+                <if test="partnerType != null">partnerType,</if>
+                <if test="partnerName != null">partnerName,</if>
+                <if test="requestAmount != null">requestAmount,</if>
+                <if test="requestTime != null">requestTime,</if>
+                <if test="status != null">status,</if>
+                <if test="amount != null">amount,</if>
+                <if test="payTime != null">payTime,</if>
+                <if test="note != null">note,</if>
+                <if test="userId != null">userId,</if>
+                <if test="userName != null">userName,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+                <if test="id != null">#{id,jdbcType=INTEGER},</if>
+                <if test="partnerId != null">#{partnerId,jdbcType=INTEGER},</if>
+                <if test="partnerType != null">#{partnerType,jdbcType=CHAR},</if>
+                <if test="partnerName != null">#{partnerName,jdbcType=VARCHAR},</if>
+                <if test="requestAmount != null">#{requestAmount,jdbcType=INTEGER},</if>
+                <if test="requestTime != null">#{requestTime,jdbcType=TIMESTAMP},</if>
+                <if test="status != null">#{status,jdbcType=CHAR},</if>
+                <if test="amount != null">#{amount,jdbcType=INTEGER},</if>
+                <if test="payTime != null">#{payTime,jdbcType=TIMESTAMP},</if>
+                <if test="note != null">#{note,jdbcType=VARCHAR},</if>
+                <if test="userId != null">#{userId,jdbcType=INTEGER},</if>
+                <if test="userName != null">#{userName,jdbcType=VARCHAR},</if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.mofangchuxing.aska.dao.domain.AskaCashrequest">
+        update aska_cashrequest
+        <set>
+                <if test="partnerId != null">
+                    partnerId = #{partnerId,jdbcType=INTEGER},
+                </if>
+                <if test="partnerType != null">
+                    partnerType = #{partnerType,jdbcType=CHAR},
+                </if>
+                <if test="partnerName != null">
+                    partnerName = #{partnerName,jdbcType=VARCHAR},
+                </if>
+                <if test="requestAmount != null">
+                    requestAmount = #{requestAmount,jdbcType=INTEGER},
+                </if>
+                <if test="requestTime != null">
+                    requestTime = #{requestTime,jdbcType=TIMESTAMP},
+                </if>
+                <if test="status != null">
+                    status = #{status,jdbcType=CHAR},
+                </if>
+                <if test="amount != null">
+                    amount = #{amount,jdbcType=INTEGER},
+                </if>
+                <if test="payTime != null">
+                    payTime = #{payTime,jdbcType=TIMESTAMP},
+                </if>
+                <if test="note != null">
+                    note = #{note,jdbcType=VARCHAR},
+                </if>
+                <if test="userId != null">
+                    userId = #{userId,jdbcType=INTEGER},
+                </if>
+                <if test="userName != null">
+                    userName = #{userName,jdbcType=VARCHAR},
+                </if>
+        </set>
+        where   id = #{id,jdbcType=INTEGER} 
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.mofangchuxing.aska.dao.domain.AskaCashrequest">
+        update aska_cashrequest
+        set 
+            partnerId =  #{partnerId,jdbcType=INTEGER},
+            partnerType =  #{partnerType,jdbcType=CHAR},
+            partnerName =  #{partnerName,jdbcType=VARCHAR},
+            requestAmount =  #{requestAmount,jdbcType=INTEGER},
+            requestTime =  #{requestTime,jdbcType=TIMESTAMP},
+            status =  #{status,jdbcType=CHAR},
+            amount =  #{amount,jdbcType=INTEGER},
+            payTime =  #{payTime,jdbcType=TIMESTAMP},
+            note =  #{note,jdbcType=VARCHAR},
+            userId =  #{userId,jdbcType=INTEGER},
+            userName =  #{userName,jdbcType=VARCHAR}
+        where   id = #{id,jdbcType=INTEGER} 
+    </update>
+</mapper>

dao/target/classes/mapper/AskaChannelnosMapper.xml

@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mofangchuxing.aska.dao.mapper.AskaChannelnosMapper">
+
+    <resultMap id="BaseResultMap" type="com.mofangchuxing.aska.dao.domain.AskaChannelnos">
+            <id property="id" column="id" jdbcType="INTEGER"/>
+            <result property="channelId" column="channelId" jdbcType="INTEGER"/>
+            <result property="channelNo" column="channelNo" jdbcType="CHAR"/>
+            <result property="channelName" column="channelName" jdbcType="CHAR"/>
+            <result property="status" column="status" jdbcType="CHAR"/>
+            <result property="note" column="note" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,channelId,channelNo,
+        channelName,status,note
+    </sql>
+
+    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from aska_channelnos
+        where  id = #{id,jdbcType=INTEGER} 
+    </select>
+    <select id="searchAll" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from aska_channelnos
+        where 1=1
+        <if test="channelId != null and channelId != ''">
+            and channelId = #{channelId}
+        </if>
+    </select>
+
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+        delete from aska_channelnos
+        where  id = #{id,jdbcType=INTEGER} 
+    </delete>
+    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.mofangchuxing.aska.dao.domain.AskaChannelnos" useGeneratedKeys="true">
+        insert into aska_channelnos
+        ( id,channelId,channelNo
+        ,channelName,status,note
+        )
+        values (#{id,jdbcType=INTEGER},#{channelId,jdbcType=INTEGER},#{channelNo,jdbcType=CHAR}
+        ,#{channelName,jdbcType=CHAR},#{status,jdbcType=CHAR},#{note,jdbcType=VARCHAR}
+        )
+    </insert>
+    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.mofangchuxing.aska.dao.domain.AskaChannelnos" useGeneratedKeys="true">
+        insert into aska_channelnos
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+                <if test="id != null">id,</if>
+                <if test="channelId != null">channelId,</if>
+                <if test="channelNo != null">channelNo,</if>
+                <if test="channelName != null">channelName,</if>
+                <if test="status != null">status,</if>
+                <if test="note != null">note,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+                <if test="id != null">#{id,jdbcType=INTEGER},</if>
+                <if test="channelId != null">#{channelId,jdbcType=INTEGER},</if>
+                <if test="channelNo != null">#{channelNo,jdbcType=CHAR},</if>
+                <if test="channelName != null">#{channelName,jdbcType=CHAR},</if>
+                <if test="status != null">#{status,jdbcType=CHAR},</if>
+                <if test="note != null">#{note,jdbcType=VARCHAR},</if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.mofangchuxing.aska.dao.domain.AskaChannelnos">
+        update aska_channelnos
+        <set>
+                <if test="channelId != null">
+                    channelId = #{channelId,jdbcType=INTEGER},
+                </if>
+                <if test="channelNo != null">
+                    channelNo = #{channelNo,jdbcType=CHAR},
+                </if>
+                <if test="channelName != null">
+                    channelName = #{channelName,jdbcType=CHAR},
+                </if>
+                <if test="status != null">
+                    status = #{status,jdbcType=CHAR},
+                </if>
+                <if test="note != null">
+                    note = #{note,jdbcType=VARCHAR},
+                </if>
+        </set>
+        where   id = #{id,jdbcType=INTEGER} 
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.mofangchuxing.aska.dao.domain.AskaChannelnos">
+        update aska_channelnos
+        set 
+            channelId =  #{channelId,jdbcType=INTEGER},
+            channelNo =  #{channelNo,jdbcType=CHAR},
+            channelName =  #{channelName,jdbcType=CHAR},
+            status =  #{status,jdbcType=CHAR},
+            note =  #{note,jdbcType=VARCHAR}
+        where   id = #{id,jdbcType=INTEGER} 
+    </update>
+</mapper>

domain/src/main/java/com/mofangchuxing/aska/domain/dto/ChannelDto.java

@@ -25,4 +25,12 @@ public class ChannelDto extends BaseDto{
     private String note;
 
     private String channelName;
+
+    private Integer cashAmount;
+
+    private String account;
+
+    private String relation;
+
+    private String type;
 }

domain/src/main/java/com/mofangchuxing/aska/domain/dto/ChannelNoDto.java

@@ -17,4 +17,6 @@ public class ChannelNoDto extends BaseDto{
     private String channelNo;
 
     private String note;
+
+    private Integer cashAmount;
 }

service/src/main/java/com/mofangchuxing/aska/service/ChannelService.java

@@ -1,5 +1,6 @@
 package com.mofangchuxing.aska.service;
 
+import com.mofangchuxing.aska.dao.domain.AskaAccounts;
 import com.mofangchuxing.aska.dao.domain.AskaChannelcouponnos;
 import com.mofangchuxing.aska.dao.domain.AskaChannels;
 import com.mofangchuxing.aska.domain.dto.ChannelCouponDto;
@@ -7,6 +8,7 @@ import com.mofangchuxing.aska.domain.dto.ChannelDto;
 import com.mofangchuxing.aska.domain.dto.ChannelNoDto;
 import com.mofangchuxing.aska.domain.utils.PageUtils;
 import com.mofangchuxing.aska.domain.vo.AskaChannelsVo;
+import com.mofangchuxing.aska.domain.vo.AskaRetailsVo;
 
 import java.util.List;
 
@@ -34,4 +36,12 @@ public interface ChannelService {
     PageUtils getChannelNoList(ChannelCouponDto channelCouponDto);
 
     void addChannelNo(ChannelNoDto channelNoDto);
+
+    AskaChannelsVo getBalance(ChannelDto channelDto);
+
+    void addCashRequest(AskaAccounts askaAccounts, ChannelDto channelDto);
+
+    PageUtils getCashHistory(ChannelDto channelDto);
+
+    void setReceivingConfig(ChannelDto channelDto);
 }

service/src/main/java/com/mofangchuxing/aska/service/impl/ChannelServiceImpl.java

@@ -3,10 +3,8 @@ package com.mofangchuxing.aska.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.mofangchuxing.aska.dao.domain.AskaChannelcouponnos;
-import com.mofangchuxing.aska.dao.domain.AskaChannelnos;
-import com.mofangchuxing.aska.dao.domain.AskaChannels;
-import com.mofangchuxing.aska.dao.domain.AskaRetails;
+import com.mofangchuxing.aska.dao.domain.*;
+import com.mofangchuxing.aska.dao.mapper.AskaCashrequestMapper;
 import com.mofangchuxing.aska.dao.mapper.AskaChannelcouponnosMapper;
 import com.mofangchuxing.aska.dao.mapper.AskaChannelnosMapper;
 import com.mofangchuxing.aska.dao.mapper.AskaChannelsMapper;
@@ -35,6 +33,8 @@ public class ChannelServiceImpl implements ChannelService {
     private AskaChannelcouponnosMapper askaChannelcouponnosMapper;
     @Resource
     private AskaChannelnosMapper askaChannelnosMapper;
+    @Resource
+    private AskaCashrequestMapper askaCashrequestMapper;
 
     public AskaChannels addChannel(ChannelDto channelDto) {
         AskaChannels askaChannels = new AskaChannels();
@@ -106,4 +106,48 @@ public class ChannelServiceImpl implements ChannelService {
         askaChannelnos.setStatus("在用");
         askaChannelnosMapper.insertSelective(askaChannelnos);
     }
+
+    @Override
+    public AskaChannelsVo getBalance(ChannelDto channelDto) {
+        AskaChannelsVo askaChannelsVo = new AskaChannelsVo();
+        AskaChannels askaChannels = askaChannelsMapper.selectByPrimaryKey(channelDto.getChannelId().longValue());
+        BeanUtil.copyProperties(askaChannels, askaChannelsVo);
+        return askaChannelsVo;
+    }
+
+    @Override
+    public void addCashRequest(AskaAccounts askaAccounts, ChannelDto channelDto) {
+        AskaChannels askaChannels = askaChannelsMapper.selectByPrimaryKey(channelDto.getChannelId().longValue());
+        AskaCashrequest askaCashrequest = new AskaCashrequest();
+        askaCashrequest.setPartnerId(askaChannels.getId());
+        askaCashrequest.setPartnerType("channel");
+        askaCashrequest.setPartnerName(askaChannels.getName());
+        askaCashrequest.setRequestAmount(channelDto.getCashAmount());
+        askaCashrequest.setStatus("申请");
+        askaCashrequest.setAmount(0);
+        askaCashrequest.setNote("");
+        askaCashrequest.setUserId(askaAccounts.getId());
+        askaCashrequest.setUserName(askaAccounts.getName());
+        askaCashrequestMapper.insertSelective(askaCashrequest);
+    }
+
+    @Override
+    public PageUtils getCashHistory(ChannelDto channelDto) {
+        PageHelper.startPage(channelDto.getPageNum(), channelDto.getPageSize());
+        List<AskaCashrequest> cashrequestList = askaCashrequestMapper.getCashHistory(channelDto);
+        PageInfo<AskaCashrequest> pageInfo = new PageInfo<>(cashrequestList);
+        PageUtils page = new PageUtils(pageInfo.getList(), (int) pageInfo.getTotal(), pageInfo.getPageSize(), pageInfo.getPageNum());
+        return page;
+    }
+
+    @Override
+    public void setReceivingConfig(ChannelDto channelDto) {
+        AskaChannels askaChannels = new AskaChannels();
+        askaChannels.setId(channelDto.getChannelId());
+        askaChannels.setAccount(channelDto.getAccount());
+        askaChannels.setName(channelDto.getName());
+        askaChannels.setRelation(channelDto.getRelation());
+        askaChannels.setAccountType(channelDto.getType());
+        askaChannelsMapper.updateByPrimaryKeySelective(askaChannels);
+    }
 }