From 6c1d9c531eb74d548f373e78d91498e7bc633332 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 12 Mar 2021 17:15:06 +0800
Subject: [PATCH] 新增申请成为分销员接口10
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java | 11 +++++
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderTask.java | 2
zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesmanCenterInfo.java | 33 ++++++++++++++++
zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java | 2 +
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml | 34 +++++++++++++++++
5 files changed, 81 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java
index 3658015..af0d1eb 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java
@@ -8,6 +8,7 @@
import com.matrix.system.fenxiao.entity.ShopSalesmanApply;
import com.matrix.system.fenxiao.vo.ShopSalesmanAppliingVo;
import com.matrix.system.fenxiao.vo.ShopSalesmanApplyVo;
+import com.matrix.system.shopXcx.vo.SalesmanCenterInfo;
import com.matrix.system.shopXcx.vo.SalesmanVo;
import org.apache.ibatis.annotations.Param;
@@ -31,4 +32,5 @@
IPage<ShopSalesmanAppliingVo> selectBizUserApplyList(Page<ShopSalesmanAppliingVo> page,
@Param("record")ShopSalesmanAppliingDto shopSalesmanAppliingDto);
+ SalesmanCenterInfo selectSalesmanCenterInfo(String openId);
}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java
index ea148ec..ef0fd64 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java
@@ -23,6 +23,7 @@
import com.matrix.system.fenxiao.entity.ShopSalesmanApply;
import com.matrix.system.fenxiao.service.ShopSalesmanApplyService;
import com.matrix.system.shopXcx.api.WeChatApiTools;
+import com.matrix.system.shopXcx.vo.SalesmanCenterInfo;
import com.matrix.system.shopXcx.vo.SalesmanVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -213,6 +214,16 @@
}
+ @ApiOperation(value = "查询分销员中心信息", notes = "")
+ @PostMapping(value = "/getSalesmanCenterInfo")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "ok", response = SalesmanCenterInfo.class)
+ })
+ AjaxResult getSalesmanCenterInfo() {
+ BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
+ SalesmanCenterInfo salesmanCenterInfo= salesmanApplyDao.selectSalesmanCenterInfo(loginUser.getOpenId());
+ return AjaxResult.buildSuccessInstance(salesmanCenterInfo);
+ }
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderTask.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderTask.java
index db41768..a61c024 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderTask.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderTask.java
@@ -309,7 +309,7 @@
if(hasInvitationMan){
ShopSalesmanGrade invitationManGrade = shopSalesmanGradeDao.selectById(invitationMan.getSalesmanGrade());
- invitationAmount+=item.getTotalPrice().doubleValue()*(invitationManGrade.getSealesCommission()/100);
+ invitationAmount+=item.getTotalPrice().doubleValue()*(invitationManGrade.getInvitationCommission()/100);
}
}else{
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesmanCenterInfo.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesmanCenterInfo.java
new file mode 100644
index 0000000..ca95447
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesmanCenterInfo.java
@@ -0,0 +1,33 @@
+package com.matrix.system.shopXcx.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "SalesmanCenterInfo", description = " 销售员中心返回参数")
+public class SalesmanCenterInfo {
+
+ @ApiModelProperty(value = "累计收益")
+ private String totalRevenue;
+
+
+ @ApiModelProperty(value = "待结算收益")
+ private String djsRevenue;
+
+
+ @ApiModelProperty(value = "可提现金额")
+ private String withdrawalCash;
+
+ @ApiModelProperty(value = "推广订单数")
+ private String orderCount;
+
+
+ @ApiModelProperty(value = "客户数")
+ private Double customerCount;
+
+ @ApiModelProperty(value = "邀请下级数")
+ private Double invitationCount;
+
+
+}
diff --git a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
index c2261ad..55b82c5 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
@@ -118,4 +118,38 @@
</if>
</select>
+ <select id="selectSalesmanCenterInfo" resultType="com.matrix.system.shopXcx.vo.SalesmanCenterInfo">
+ select
+ IFNULL(withdrawal_cash,0) as withdrawal_cash,
+ (
+ SELECT
+ IFNULL(sum(IFNULL( b.amount, 0 )),0)
+ FROM
+ shop_salesman_order b
+ WHERE
+ b.user_id = a.open_id
+ and order_status=2
+ AND b.sales_user_id = #{openId}
+
+ ) AS totalRevenue,
+ IFNULL(withdrawal_cash,0) as withdrawal_cash,
+ (
+ SELECT
+ IFNULL(sum(IFNULL( b.amount, 0 )),0)
+ FROM
+ shop_salesman_order b
+ WHERE
+ b.user_id = a.open_id
+ and order_status=1
+ AND b.sales_user_id = #{openId}
+
+ ) AS djsRevenue,
+ ( SELECT count( * ) FROM shop_salesman_order c WHERE c.user_id = a.open_id AND c.sales_user_id = #{openId} ) AS orderCount,
+ (select count(*) from biz_user where parent_open_id=#{openId} and is_sales=1) as invitationCount,
+ (select count(*) from biz_user where parent_open_id=#{openId} and is_sales=2) as customerCount
+ from biz_user a where
+ a.open_id=#{openId}
+
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1