Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,38 @@
+package com.miaxis.app.controller.Spread;
+
+import com.miaxis.common.constant.Constants;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.spread.service.IWxSpreadRelationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author wwl
+ * @version 1.0
+ * @date 2021/11/25 10:42
+ */
+@RestController
+@RequestMapping(Constants.STUDENT_PREFIX + "/spread/relation")
+@Api(tags={"【H5-wx推广关系】"})
+@AllArgsConstructor
+public class WxSpreadRelationController {
+
+    private final IWxSpreadRelationService wxSpreadRelationService;
+
+    /**
+     * 根据openid查询一二级绑定用户
+     */
+    @GetMapping(value = "/spreadRelationList")
+    @ApiOperation("根据openid查询一二级绑定用户")
+    @ApiImplicitParam(name = "openid", value = "微信openid", dataType = "string", required = true)
+    public Response spreadRelationList(String openid) {
+
+        return wxSpreadRelationService.spreadRelationList(openid);
+    }
+
+}

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

@@ -20,9 +20,9 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/pc/extension/income")
-@Api(tags={"【H5-分成收益】"})
+@Api(tags={"【PC-分成收益】"})
 @AllArgsConstructor
-public class WxExtensionIncomeController extends BaseController {
+public class ExtensionIncomeController extends BaseController {
 
     private final IWxExtensionIncomeService wxExtensionIncomeService;
 

twzd-service/src/main/java/com/miaxis/extension/domain/WxExtensionIncome.java

@@ -8,8 +8,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
  * 分成收益对象 wx_extension_income
  * @author wwl
@@ -51,10 +49,6 @@ public class WxExtensionIncome extends BaseBusinessEntity {
     @ApiModelProperty(value = "收益金额(分)-----根据层级分成百分比计算")
     private Integer profitPrice;
 
-    @TableField("extract_status")
-    @ApiModelProperty(value = "提现状态  0：未提现(默认)、1：已提现")
-    private String extractStatus;
-
     @TableField("status")
     @ApiModelProperty(value = "状态  0：有效(默认)、1：失效 （伪删除）")
     private String status;

twzd-service/src/main/java/com/miaxis/spread/service/IWxSpreadRelationService.java

@@ -1,6 +1,7 @@
 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;
 
 /**
@@ -10,4 +11,12 @@ import com.miaxis.spread.domain.WxSpreadRelation;
  * @date 2021/10/29 9:42
  */
 public interface IWxSpreadRelationService extends IService<WxSpreadRelation> {
+
+    /**
+     * 根据openid查询一二级绑定用户
+     * @param openid
+     * @return
+     */
+    Response spreadRelationList(String openid);
+
 }

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

@@ -1,12 +1,20 @@
 package com.miaxis.spread.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.entity.UserInfo;
 import com.miaxis.spread.domain.WxSpreadRelation;
 import com.miaxis.spread.mapper.WxSpreadRelationMapper;
 import com.miaxis.spread.service.IWxSpreadRelationService;
+import com.miaxis.spread.vo.WxSpreadRelationVo;
+import com.miaxis.user.mapper.UserInfoMapper;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * wx推广关系Service业务层处理
  * @author wwl
@@ -18,5 +26,32 @@ import org.springframework.stereotype.Service;
 public class WxSpreadRelationServiceImpl extends ServiceImpl<WxSpreadRelationMapper, WxSpreadRelation> implements IWxSpreadRelationService {
 
     private final WxSpreadRelationMapper wxSpreadRelationMapper;
+    private final UserInfoMapper userInfoMapper;
+
+    /**
+     * 根据openid查询一二级绑定用户
+     * @param openid
+     * @return
+     */
+    @Override
+    public Response spreadRelationList(String openid) {
+
+        ArrayList<WxSpreadRelationVo> relationVos = new ArrayList<>();
+
+        List<UserInfo> userInfos = userInfoMapper.selectUserByParentOpenid(openid);
+        WxSpreadRelationVo spreadVo = new WxSpreadRelationVo();
+        spreadVo.setTitle("一级");
+        spreadVo.setUserList(userInfos);
+        relationVos.add(spreadVo);
+
+        List<String> collect = userInfos.stream().map(u -> u.getOpenid()).collect(Collectors.toList());
+        List<UserInfo> users = userInfoMapper.selectUserByList(collect);
+        WxSpreadRelationVo spread = new WxSpreadRelationVo();
+        spread.setTitle("二级");
+        spread.setUserList(users);
+        relationVos.add(spread);
+
+        return Response.success(relationVos);
+    }
 
 }

twzd-service/src/main/java/com/miaxis/spread/vo/WxSpreadRelationVo.java

@@ -0,0 +1,30 @@
+package com.miaxis.spread.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.miaxis.common.core.domain.entity.UserInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * wx推广关系对象
+ * @author wwl
+ * @version 1.0
+ * @date 2021/11/25 10:36
+ */
+@Data
+@ApiModel(value = "WxSpreadRelation", description = "wx推广关系对象返回参")
+public class WxSpreadRelationVo {
+
+    @TableField("title")
+    @ApiModelProperty(value = "title（一级、二级..）")
+    private String title;
+
+    @TableField("userList")
+    @ApiModelProperty(value = "用户list")
+    private List<UserInfo> userList;
+
+
+}

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

@@ -19,4 +19,8 @@ public interface UserInfoMapper extends BaseMapper<UserInfo> {
      */
     public List<UserInfo> selectUserInfoList(UserInfo userInfo);
 
+
+    List<UserInfo> selectUserByParentOpenid(String openid);
+
+    List<UserInfo> selectUserByList(List<String> collect);
 }

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

@@ -12,7 +12,6 @@
         <result property="hierarchy"    column="hierarchy"    />
         <result property="percentage"    column="percentage"    />
         <result property="profitPrice"    column="profit_price"    />
-        <result property="extractStatus"    column="extract_status"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
         <result property="status"    column="status"    />
@@ -31,7 +30,6 @@
             <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="extractStatus != null  and extractStatus != ''"> and extract_status = #{extractStatus}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
         </where>
     </select>

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

@@ -36,4 +36,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+    <select id="selectUserByParentOpenid" resultType="com.miaxis.common.core.domain.entity.UserInfo">
+        SELECT
+            u.openid,
+            u.nick_name,
+            u.head_image,
+            u.create_time
+        FROM
+            user_info u
+            LEFT JOIN wx_spread_relation sr ON sr.openid = u.openid
+        WHERE sr.parent_openid = #{openid}
+        ORDER BY u.create_time desc
+
+    </select>
+
+    <select id="selectUserByList" resultType="com.miaxis.common.core.domain.entity.UserInfo">
+        SELECT
+            u.openid,
+            u.nick_name,
+            u.head_image,
+            u.create_time
+        FROM
+            user_info u
+        WHERE u.openid in
+        <foreach collection="list" item="openid" open="(" separator="," close=")">
+            #{openid}
+        </foreach>
+        ORDER BY u.create_time desc
+
+    </select>
+
 </mapper>