收益金额

twzd-admin/src/main/java/com/miaxis/app/controller/Spread/WxSpreadRelationController.java

@@ -5,6 +5,7 @@ import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.entity.UserInfo;
 import com.miaxis.common.utils.SecurityUtils;
 import com.miaxis.spread.service.IWxSpreadRelationService;
+import com.miaxis.spread.vo.WxSpreadRelationVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -13,6 +14,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+
 /**
  * @author wwl
  * @version 1.0
@@ -31,9 +34,10 @@ public class WxSpreadRelationController {
      */
     @GetMapping(value = "/spreadRelationList")
     @ApiOperation("根据openid查询一二级绑定用户")
-    public Response spreadRelationList() {
+    public Response<ArrayList<WxSpreadRelationVo>> spreadRelationList() {
         UserInfo userInfo = SecurityUtils.getLoginUser().getStudent();
-        return wxSpreadRelationService.spreadRelationList(userInfo.getOpenid());
+        ArrayList<WxSpreadRelationVo> wxSpreadRelationVos = wxSpreadRelationService.spreadRelationList(userInfo.getOpenid());
+        return Response.success(wxSpreadRelationVos);
     }
 
 }

twzd-admin/src/main/java/com/miaxis/app/controller/extension/WxExtensionIncomeController.java

@@ -7,6 +7,7 @@ import com.miaxis.common.core.domain.entity.UserInfo;
 import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.common.utils.SecurityUtils;
 import com.miaxis.extension.service.IWxExtensionIncomeService;
+import com.miaxis.extension.vo.ExtensionIncomeVo;
 import com.miaxis.extension.vo.WxGzhExtensionIncomeVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -45,6 +46,17 @@ public class WxExtensionIncomeController extends BaseController {
     }
 
 
+    /**
+     * 查询收益金额（总金额、已提现金额、未提现金额）
+     */
+    @GetMapping(value = "/extensionIncomePrice")
+    @ApiOperation("查询收益金额（总金额、已提现金额、未提现金额）")
+    public Response<ExtensionIncomeVo> extensionIncomePrice() {
+        UserInfo userInfo = SecurityUtils.getLoginUser().getStudent();
+        ExtensionIncomeVo incomePrice = extensionIncomeService.extensionIncomePrice(userInfo.getOpenid());
+        return Response.success(incomePrice);
+    }
+
 
 
 }

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

@@ -30,4 +30,11 @@ public interface WxExtensionIncomeMapper extends BaseMapper<WxExtensionIncome> {
      * @return
      */
     List<WxGzhExtensionIncomeVo> extensionIncomeList(@Param("openid")String openid, @Param("nickName")String nickName);
+
+    /**
+     * 查询收益金额（总金额、已提现金额、未提现金额）
+     * @param openid
+     * @return
+     */
+    ExtensionIncomeVo extensionIncomePrice(String openid);
 }

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

@@ -1,6 +1,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.ExtensionIncomeVo;
 import com.miaxis.extension.vo.WxGzhExtensionIncomeVo;
@@ -40,4 +41,11 @@ public interface IWxExtensionIncomeService extends IService<WxExtensionIncome> {
      * @return
      */
     List<WxGzhExtensionIncomeVo> extensionIncomeList(String openid, String nickName);
+
+    /**
+     * 查询收益金额（总金额、已提现金额、未提现金额）
+     * @param openid
+     * @return
+     */
+    ExtensionIncomeVo extensionIncomePrice(String openid);
 }

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

@@ -2,6 +2,7 @@ package com.miaxis.extension.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.entity.SysDictData;
 import com.miaxis.extension.domain.WxExtensionIncome;
 import com.miaxis.extension.mapper.WxExtensionIncomeMapper;
@@ -113,4 +114,15 @@ public class WxExtensionIncomeServiceImpl extends ServiceImpl<WxExtensionIncomeM
         return wxExtensionIncomeMapper.extensionIncomeList(openid,nickName);
     }
 
+
+    /**
+     * 查询收益金额（总金额、已提现金额、未提现金额）
+     * @param openid
+     * @return
+     */
+    @Override
+    public ExtensionIncomeVo extensionIncomePrice(String openid) {
+        return wxExtensionIncomeMapper.extensionIncomePrice(openid);
+    }
+
 }

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

@@ -36,51 +36,4 @@ public class ExtensionIncomeVo {
     @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/java/com/miaxis/spread/service/IWxSpreadRelationService.java

@@ -3,6 +3,9 @@ package com.miaxis.spread.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.spread.domain.WxSpreadRelation;
+import com.miaxis.spread.vo.WxSpreadRelationVo;
+
+import java.util.ArrayList;
 
 /**
  * wx推广关系Service接口
@@ -17,6 +20,6 @@ public interface IWxSpreadRelationService extends IService<WxSpreadRelation> {
      * @param openid
      * @return
      */
-    Response spreadRelationList(String openid);
+    ArrayList<WxSpreadRelationVo> spreadRelationList(String openid);
 
 }

twzd-service/src/main/java/com/miaxis/spread/service/impl/WxSpreadRelationServiceImpl.java

@@ -34,7 +34,7 @@ public class WxSpreadRelationServiceImpl extends ServiceImpl<WxSpreadRelationMap
      * @return
      */
     @Override
-    public Response spreadRelationList(String openid) {
+    public ArrayList<WxSpreadRelationVo> spreadRelationList(String openid) {
 
         ArrayList<WxSpreadRelationVo> relationVos = new ArrayList<>();
 
@@ -54,7 +54,7 @@ public class WxSpreadRelationServiceImpl extends ServiceImpl<WxSpreadRelationMap
         spread.setUserList(users);
         relationVos.add(spread);
 
-        return Response.success(relationVos);
+        return relationVos;
     }
 
 }

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

@@ -27,8 +27,8 @@
             ui.head_image,
             e.beneficiary_openid,
             e.totalPrice,
-            we.extractPrice,
-            ( e.totalPrice - we.extractPrice ) AS remainderPrice
+            IF( ISNULL(we.extractPrice) = 1, 0, we.extractPrice ) as extractPrice,
+            ( e.totalPrice - IF( ISNULL(we.extractPrice) = 1, 0, 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
@@ -65,4 +65,21 @@
 	        ei.create_time DESC
     </select>
 
+
+    <select id="extensionIncomePrice" resultType="com.miaxis.extension.vo.ExtensionIncomeVo">
+        SELECT
+            ui.nick_name,
+            ui.head_image,
+            e.beneficiary_openid,
+            e.totalPrice,
+            IF( ISNULL(we.extractPrice) = 1, 0, we.extractPrice ) as extractPrice,
+            ( e.totalPrice - IF( ISNULL(we.extractPrice) = 1, 0, 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 e.beneficiary_openid = #{openid}
+    </select>
+
+
 </mapper>