Merge branch 'master' of http://1.15.26.233:3000/miaxis/twzd

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.extension.dto.ExtensionIncomeListDTO;
 import com.miaxis.extension.service.IWxExtensionIncomeService;
 import com.miaxis.extension.vo.ExtensionIncomeVo;
 import com.miaxis.spread.service.IWxSpreadRelationService;
@@ -43,8 +44,8 @@ public class PcWxExtensionIncomeController extends BaseController {
      */
     @GetMapping(value = "/extensionPoints")
     @ApiOperation("查询下级推广积分")
-    public Response<List<ExtensionIncomeVo>> getDownLevelPoints(String openid) {
-        List<ExtensionIncomeVo> list = userInfoService.getDownLevelPoints(openid);
+    public Response<List<ExtensionIncomeVo>> getDownLevelPoints(ExtensionIncomeListDTO dto) {
+        List<ExtensionIncomeVo> list = userInfoService.getPcDownLevelPoints(dto);
         return Response.success(list);
     }
 

twzd-service/src/main/java/com/miaxis/extension/dto/ExtensionIncomeListDTO.java

@@ -0,0 +1,23 @@
+package com.miaxis.extension.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ */
+@Data
+@ApiModel(value = "ExtensionSettleDTO", description = "结算参数对象")
+public class ExtensionIncomeListDTO {
+
+
+    @ApiModelProperty(value = "微信openid",required = true)
+    private String openid;
+
+    @ApiModelProperty(value = "排序 1-按总推广积分 2-按未结算推广积分 3-按已结算推广积分 4-推广人数")
+    private Integer sortBy;
+
+    @ApiModelProperty(value = "字段名称",hidden = true)
+    private String sortByParmName;
+
+}

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

@@ -27,6 +27,9 @@ public class ExtensionIncomeVo {
     @ApiModelProperty(value = "微信头像地址")
     private String headImage;
 
+    @ApiModelProperty(value = "总推广积分")
+    private Integer achievementTotal;
+
     @ApiModelProperty(value = "未结算推广积分")
     private Integer achievement;
 
@@ -36,4 +39,7 @@ public class ExtensionIncomeVo {
     @ApiModelProperty(value = "推广人数")
     private Integer extensionCount;
 
+    @ApiModelProperty(value = "消费金额(分)")
+    private Integer costCount;
+
 }

twzd-service/src/main/java/com/miaxis/user/mapper/UserInfoMapper.java

@@ -2,6 +2,7 @@ package com.miaxis.user.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.extension.dto.ExtensionIncomeListDTO;
 import com.miaxis.extension.vo.ExtensionIncomeVo;
 
 import java.util.List;
@@ -29,4 +30,6 @@ public interface UserInfoMapper extends BaseMapper<UserInfo> {
     UserInfo getUpUserInfo(String fromUserName);
 
     List<ExtensionIncomeVo> getDownLevelPoints(String openid);
+
+    List<ExtensionIncomeVo> getPcDownLevelPoints(ExtensionIncomeListDTO dto);
 }

twzd-service/src/main/java/com/miaxis/user/service/IUserInfoService.java

@@ -2,6 +2,7 @@ package com.miaxis.user.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.extension.dto.ExtensionIncomeListDTO;
 import com.miaxis.extension.vo.ExtensionIncomeVo;
 
 import java.util.List;
@@ -24,4 +25,6 @@ public interface IUserInfoService extends IService<UserInfo>{
     UserInfo getUpUserInfo(String fromUserName);
 
     List<ExtensionIncomeVo> getDownLevelPoints(String openid);
+
+    List<ExtensionIncomeVo> getPcDownLevelPoints(ExtensionIncomeListDTO dto);
 }

twzd-service/src/main/java/com/miaxis/user/service/impl/UserInfoServiceImpl.java

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.DateUtils;
+import com.miaxis.extension.dto.ExtensionIncomeListDTO;
 import com.miaxis.extension.vo.ExtensionIncomeVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -45,4 +47,22 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
     public List<ExtensionIncomeVo> getDownLevelPoints(String openid) {
         return userInfoMapper.getDownLevelPoints(openid);
     }
+
+    @Override
+    public List<ExtensionIncomeVo> getPcDownLevelPoints(ExtensionIncomeListDTO dto) {
+        if (dto.getSortBy()!= null){
+            if (dto.getSortBy() == 1){
+                dto.setSortByParmName("achievement_total");
+            }else if (dto.getSortBy() == 2){
+                dto.setSortByParmName("achievement");
+            }else if (dto.getSortBy() == 3){
+                dto.setSortByParmName("achievement_settled");
+            }else if (dto.getSortBy() == 4){
+                dto.setSortByParmName("extension_count");
+            }else{
+                throw new CustomException("sortBy值不合法");
+            }
+        }
+        return userInfoMapper.getPcDownLevelPoints(dto);
+    }
 }

twzd-service/src/main/java/com/miaxis/wx/service/impl/WxForeverCodeServiceImpl.java

@@ -78,10 +78,5 @@ public class WxForeverCodeServiceImpl extends ServiceImpl<WxForeverCodeMapper, W
         return sb.toString();
     }
 
-    public static void main(String[] args) {
-        Random random=new Random();
-        for(int i =0 ;i <100;i++){
-            System.out.println(random.nextInt(1));
-        }
-    }
+
 }

twzd-service/src/main/java/com/miaxis/wx/service/impl/WxMessageEvenServiceImpl.java

@@ -101,7 +101,7 @@ public class WxMessageEvenServiceImpl implements IWxMessageEvenService {
 
             //推送绑定模板信息到上级
             messageTemplateSend(openid, token, userName);
-            message = "已成功绑定推广关系！";
+            message = "欢迎关注金牌车教，您的学车好伙伴！";
         }
         else {
             message =  "已存在上级绑定关系！";

twzd-service/src/main/resources/mapper/user/UserInfoMapper.xml

@@ -76,4 +76,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where openid in (select openid from wx_spread_relation where parent_openid = #{openid})
     </select>
 
+    <select id="getPcDownLevelPoints"  resultType="com.miaxis.extension.vo.ExtensionIncomeVo">
+        select openid,IFNULL(nick_name,'未知') as nick_name,IFNULL(head_image,'未知') as head_image,achievement+achievement_settled as achievement_total,achievement,achievement_settled,
+        (select count(1) from wx_spread_relation where parent_openid =t1.openid) as extension_count ,
+        ( SELECT count( 1 ) FROM wx_spread_relation WHERE parent_openid = t1.openid ) AS extension_count ,
+        IFNULL(( SELECT sum(payer_total) FROM wx_order WHERE openid = t1.openid and trade_state = 'SUCCESS'  ),0) as cost_count
+        from user_info t1
+        where openid in (select openid from wx_spread_relation where parent_openid = #{openid})
+        <if test="sortByParmName != null  and sortByParmName != ''"> order by ${sortByParmName} desc</if>
+    </select>
+
 </mapper>

twzd-service/src/main/resources/mapper/wx/WxForeverCodeMapper.xml

@@ -15,18 +15,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectWxForeverCodeVo">
-        select * from wx_forever_code
+        select t1.id,t1.openid,t1.code,t1.status,t1.url,t2.nick_name from wx_forever_code t1 left join user_info t2 on (t1.openid=t2.openid)
     </sql>
 
     <select id="selectWxForeverCodeList" parameterType="WxForeverCode" resultMap="WxForeverCodeResult">
         <include refid="selectWxForeverCodeVo"/>
         <where>
-            <if test="openid != null  and openid != ''"> and openid = #{openid}</if>
-            <if test="code != null  and code != ''"> and code = #{code}</if>
-            <if test="nickName != null "> and nick_name like concat('%', #{nickName}, '%')</if>
-            <if test="status != null "> and status = #{status}</if>
+            <if test="openid != null  and openid != ''"> and t1.openid = #{openid}</if>
+            <if test="code != null  and code != ''"> and t1.code = #{code}</if>
+            <if test="nickName != null "> and t2.nick_name like concat('%', #{nickName}, '%')</if>
+            <if test="status != null "> and t1.status = #{status}</if>
         </where>
-        order by create_time desc
+        order by t1.create_time desc
     </select>
 
 </mapper>