分成收益接口

twzd-admin/src/main/java/com/miaxis/pc/controller/extension/ExtensionIncomeController.java

@@ -5,6 +5,7 @@ import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.extension.domain.WxExtensionIncome;
 import com.miaxis.extension.service.IWxExtensionIncomeService;
+import com.miaxis.extension.vo.WxExtensionIncomeVo;
 import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -37,9 +38,9 @@ public class ExtensionIncomeController extends BaseController {
             @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
             @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
     })
-    public ResponsePageInfo<WxExtensionIncome> list(@ModelAttribute WxExtensionIncome wxExtensionIncome){
+    public ResponsePageInfo<WxExtensionIncomeVo> list(@ModelAttribute WxExtensionIncomeVo wxExtensionIncome){
         startPage();
-        List<WxExtensionIncome> list = wxExtensionIncomeService.selectWxExtensionIncomeList(wxExtensionIncome);
+        List<WxExtensionIncomeVo> list = wxExtensionIncomeService.selectWxExtensionIncomeList(wxExtensionIncome);
         return toResponsePageInfo(list);
     }
 

twzd-service/src/main/java/com/miaxis/extension/mapper/WxExtensionIncomeMapper.java

@@ -2,6 +2,7 @@ package com.miaxis.extension.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.extension.domain.WxExtensionIncome;
+import com.miaxis.extension.vo.WxExtensionIncomeVo;
 
 import java.util.List;
 
@@ -18,5 +19,5 @@ public interface WxExtensionIncomeMapper extends BaseMapper<WxExtensionIncome> {
      * @param wxExtensionIncome 分成收益
      * @return 分成收益集合
      */
-    List<WxExtensionIncome> selectWxExtensionIncomeList(WxExtensionIncome wxExtensionIncome);
+    List<WxExtensionIncomeVo> selectWxExtensionIncomeList(WxExtensionIncomeVo wxExtensionIncome);
 }

twzd-service/src/main/java/com/miaxis/extension/service/IWxExtensionIncomeService.java

@@ -3,6 +3,7 @@ package com.miaxis.extension.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.extension.domain.WxExtensionIncome;
+import com.miaxis.extension.vo.WxExtensionIncomeVo;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -21,7 +22,7 @@ public interface IWxExtensionIncomeService extends IService<WxExtensionIncome> {
      * @param wxExtensionIncome 分成收益
      * @return 分成收益集合
      */
-    List<WxExtensionIncome> selectWxExtensionIncomeList(WxExtensionIncome wxExtensionIncome);
+    List<WxExtensionIncomeVo> selectWxExtensionIncomeList(WxExtensionIncomeVo wxExtensionIncome);
 
 
     /**

twzd-service/src/main/java/com/miaxis/extension/service/impl/WxExtensionIncomeServiceImpl.java

@@ -6,6 +6,7 @@ import com.miaxis.common.core.domain.entity.SysDictData;
 import com.miaxis.extension.domain.WxExtensionIncome;
 import com.miaxis.extension.mapper.WxExtensionIncomeMapper;
 import com.miaxis.extension.service.IWxExtensionIncomeService;
+import com.miaxis.extension.vo.WxExtensionIncomeVo;
 import com.miaxis.spread.domain.WxSpreadRelation;
 import com.miaxis.spread.service.IWxSpreadRelationService;
 import com.miaxis.system.service.ISysDictDataService;
@@ -44,7 +45,7 @@ public class WxExtensionIncomeServiceImpl extends ServiceImpl<WxExtensionIncomeM
      * @return 分成收益
      */
     @Override
-    public List<WxExtensionIncome> selectWxExtensionIncomeList(WxExtensionIncome wxExtensionIncome){
+    public List<WxExtensionIncomeVo> selectWxExtensionIncomeList(WxExtensionIncomeVo wxExtensionIncome){
         return wxExtensionIncomeMapper.selectWxExtensionIncomeList(wxExtensionIncome);
     }
 

twzd-service/src/main/java/com/miaxis/extension/vo/WxExtensionIncomeVo.java

@@ -0,0 +1,86 @@
+package com.miaxis.extension.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分成收益对象返回参
+ * @author wwl
+ * @version 1.0
+ * @date 2021/11/26 10:33
+ */
+@Data
+@ApiModel(value = "WxExtensionIncomeVo", description = "分成收益对象返回参")
+public class WxExtensionIncomeVo {
+
+    @TableField("nick_name")
+    @ApiModelProperty(value = "微信昵称")
+    private String nickName;
+
+    @TableField("head_image")
+    @ApiModelProperty(value = "微信头像地址")
+    private String headImage;
+
+    @TableField("beneficiary_openid")
+    @ApiModelProperty(value = "受益人----用户唯一标识(微信)")
+    private String beneficiaryOpenid;
+
+    @ApiModelProperty(value = "总收益金额(分)")
+    private Integer totalPrice;
+
+    @ApiModelProperty(value = "已提现金额(分)")
+    private Integer extractPrice;
+
+    @ApiModelProperty(value = "剩余金额(分)")
+    private Integer remainderPrice;
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public String getHeadImage() {
+        return headImage;
+    }
+
+    public void setHeadImage(String headImage) {
+        this.headImage = headImage;
+    }
+
+    public String getBeneficiaryOpenid() {
+        return beneficiaryOpenid;
+    }
+
+    public void setBeneficiaryOpenid(String beneficiaryOpenid) {
+        this.beneficiaryOpenid = beneficiaryOpenid;
+    }
+
+    public Integer getTotalPrice() {
+        return totalPrice;
+    }
+
+    public void setTotalPrice(Integer totalPrice) {
+        this.totalPrice = totalPrice;
+    }
+
+    public Integer getExtractPrice() {
+        return extractPrice;
+    }
+
+    public void setExtractPrice(Integer extractPrice) {
+        this.extractPrice = extractPrice;
+    }
+
+    public Integer getRemainderPrice() {
+        return remainderPrice;
+    }
+
+    public void setRemainderPrice(Integer remainderPrice) {
+        this.remainderPrice = remainderPrice;
+    }
+}

twzd-service/src/main/resources/mapper/extension/WxExtensionIncomeMapper.xml

@@ -21,16 +21,21 @@
         select * from wx_extension_income
     </sql>
 
-    <select id="selectWxExtensionIncomeList" parameterType="WxExtensionIncome" resultMap="WxExtensionIncomeResult">
-        <include refid="selectWxExtensionIncomeVo"/>
+    <select id="selectWxExtensionIncomeList" resultType="com.miaxis.extension.vo.WxExtensionIncomeVo">
+        SELECT
+            ui.nick_name,
+            ui.head_image,
+            e.beneficiary_openid,
+            e.totalPrice,
+            we.extractPrice,
+            ( e.totalPrice - we.extractPrice ) AS remainderPrice
+        FROM
+        ( SELECT ei.beneficiary_openid, SUM( ei.profit_price ) AS totalPrice FROM wx_extension_income ei GROUP BY ei.beneficiary_openid ) e
+        LEFT JOIN user_info ui ON ui.openid = e.beneficiary_openid
+        LEFT JOIN ( SELECT w.openid, SUM( w.extract_price ) AS extractPrice FROM wx_extract w where w.`status`=1 GROUP BY w.openid ) we ON we.openid = e.beneficiary_openid
         <where>
-            <if test="sourceId != null "> and source_id = #{sourceId}</if>
-            <if test="beneficiaryOpenid != null  and beneficiaryOpenid != ''"> and beneficiary_openid = #{beneficiaryOpenid}</if>
-            <if test="sourceOpenid != null  and sourceOpenid != ''"> and source_openid = #{sourceOpenid}</if>
-            <if test="hierarchy != null  and hierarchy != ''"> and hierarchy = #{hierarchy}</if>
-            <if test="percentage != null "> and percentage = #{percentage}</if>
-            <if test="profitPrice != null "> and profit_price = #{profitPrice}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="beneficiaryOpenid != null  and beneficiaryOpenid != ''"> and e.beneficiary_openid = #{beneficiaryOpenid}</if>
+            <if test="nickName != null  and nickName != ''"> and ui.nick_name = #{nickName}</if>
         </where>
     </select>