Merge remote-tracking branch 'origin/dev' into test

# Conflicts:
#	bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRetailDetailMapper.java
#	bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICumemberRetailDetailService.java
#	bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/ICumemberRetailDetailServiceImpl.java
#	bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/memberPointVO.java
#	bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java
#	bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java
#	bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailDetailMapper.xml

bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRetailDetailMapper.java

@@ -2,6 +2,7 @@ package com.hzs.member.base.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hzs.common.domain.member.achieve.CuMemberRetailDetail;
+import com.hzs.member.structure.controller.dto.CuMemberPointDTO;
 import com.hzs.member.structure.controller.vo.ChildCodeVO;
 import com.hzs.member.structure.controller.vo.CuMemberPointDetailVO;
 import com.hzs.member.structure.controller.vo.CuMemberThreeFrameworkVO;
@@ -41,8 +42,8 @@ public interface CuMemberRetailDetailMapper extends BaseMapper<CuMemberRetailDet
                                                                    @Param("stageStatus") Integer stageStatus);
 
 
-    CuMemberPointDetailVO getPointDetailByUserId(@Param("userId") Long userId,
+    CuMemberPointDTO getPointDetailByUserId(@Param("userId") Long userId,
-                                                 @Param("stage") Integer stage,
+                                            @Param("stage") Integer stage,
-                                                 @Param("point") Integer point,
+                                            @Param("point") Integer point,
-                                                 @Param("settleTableName") String settleTableName);
+                                            @Param("settleTableName") String settleTableName);
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICumemberRetailDetailService.java

@@ -24,5 +24,5 @@ public interface ICumemberRetailDetailService {
     List<CuMemberThreeFrameworkVO> getCuMemberRetailDetailList(String settleTableName, String memberCode, Integer stage, Integer stageStatus);
 
 
-    CuMemberPointDetailVO getPointDetailByUserId(Long userId, Integer stage, Integer point, String settleTableName);
+    CuMemberPointDetailVO getPointDetailByUserId(Long userId, Long pointMember,Integer stage, Integer point, String settleTableName);
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/ICumemberRetailDetailServiceImpl.java

@@ -12,6 +12,8 @@ import com.hzs.common.domain.member.base.CuMember;
 import com.hzs.member.base.mapper.CuMemberRetailDetailMapper;
 import com.hzs.member.base.service.ICuMemberService;
 import com.hzs.member.base.service.ICumemberRetailDetailService;
+import com.hzs.member.structure.controller.dto.CuMemberDetailDTO;
+import com.hzs.member.structure.controller.dto.CuMemberPointDTO;
 import com.hzs.member.structure.controller.vo.ChildCodeVO;
 import com.hzs.member.structure.controller.vo.CuMemberPointDetailVO;
 import com.hzs.member.structure.controller.vo.CuMemberThreeFrameworkVO;
@@ -122,10 +124,23 @@ public class ICumemberRetailDetailServiceImpl extends ServiceImpl<CuMemberRetail
     }
 
     @Override
-    public CuMemberPointDetailVO getPointDetailByUserId(Long userId, Integer stage, Integer point, String settleTableName) {
+    public CuMemberPointDetailVO getPointDetailByUserId(Long userId, Long pointMember, Integer stage, Integer point, String settleTableName) {
-        CuMemberPointDetailVO pointDetailByUserId = baseMapper.getPointDetailByUserId(userId, stage, point, settleTableName);
+        CuMemberPointDTO cuMemberPointDTO = baseMapper.getPointDetailByUserId(pointMember, stage, point, settleTableName);
-        pointDetailByUserId.setMemberName(pointDetailByUserId.getMemberName() + "-" + point);
+        CuMemberDetailDTO cuMemberDetailDTO = iCuMemberService.getCuMemberDetailById(pointMember);
-        return pointDetailByUserId;
+        if (cuMemberDetailDTO == null || cuMemberPointDTO == null) {
+            return null;
+        }
+        return makeCuMemberPointDetailVO(cuMemberDetailDTO,cuMemberPointDTO,point);
+    }
+
+    private CuMemberPointDetailVO makeCuMemberPointDetailVO(CuMemberDetailDTO cuMemberDetailDTO, CuMemberPointDTO cuMemberPointDTO,Integer point) {
+        return CuMemberPointDetailVO.builder()
+                .memberCode(cuMemberDetailDTO.getMemberCode())
+                .memberName(cuMemberDetailDTO.getMemberName() + "-" + point)
+                .awardsName(cuMemberDetailDTO.getAwardsName())
+                .vertexName(cuMemberDetailDTO.getVertexName())
+                .creationTime(cuMemberPointDTO.getCreationTime())
+                .build();
     }
 
 

bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/memberPointVO.java

@@ -1,6 +1,7 @@
 package com.hzs.member.base.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.hzs.common.core.annotation.Excel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -14,26 +15,32 @@ public class memberPointVO {
     /**
      * 会员编号
      */
+    @Excel(name = "会员编号")
     private String memberCode;
     /**
      * 会员姓名
      */
+    @Excel(name = "会员姓名")
     private String memberName;
     /**
      * 子点位总数
      */
+    @Excel(name = "子点位总数")
     private Integer pointCount;
     /**
      * 待激活点位数
      */
+    @Excel(name = "待激活点位数")
     private Integer waitPointCount;
     /**
      * 复购业绩余额
      */
+    @Excel(name = "复购业绩余额")
     private Long repPvBalance;
     /**
      * 期数
      */
+    @Excel(name = "期数",dateFormat = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date memberSettlePeriod;
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java

@@ -11,7 +11,6 @@ import com.hzs.common.core.web.page.TableDataInfo;
 import com.hzs.common.domain.member.achieve.CuMemberRetailDetail;
 import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod;
 import com.hzs.common.domain.member.base.CuMember;
-import com.hzs.common.security.service.UserTokenService;
 import com.hzs.common.security.utils.SecurityUtils;
 import com.hzs.member.achieve.service.ICuMemberSettlePeriodService;
 import com.hzs.member.base.service.ICuMemberService;
@@ -19,18 +18,14 @@ import com.hzs.member.base.service.ICumemberRetailDetailService;
 import com.hzs.member.structure.controller.vo.ChildCodeVO;
 import com.hzs.member.structure.controller.vo.CuMemberPointDetailVO;
 import com.hzs.member.structure.controller.vo.CuMemberThreeFrameworkVO;
-import com.hzs.system.sys.dto.LoginUser;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.text.DateFormatSymbols;
-import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -158,8 +153,8 @@ public class ApiMemberStructureController extends BaseController {
 
     @Log(module = EOperationModule.MEMBER_RETAIL_TREE_LIST, business = EOperationBusiness.MEMBER_RETAIL_TREE_LIST, method = EOperationMethod.SELECT)
     @GetMapping("/pointDetail")
-    public AjaxResult pointDetail(Integer stage,Integer point) {
+    public AjaxResult pointDetail(Integer stage,Integer point,Long pointMember) {
-        if (stage == null ||  point == null) {
+        if (stage == null ||  point == null || pointMember == null) {
             log.error("参数错误");
             return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
         }
@@ -181,7 +176,7 @@ public class ApiMemberStructureController extends BaseController {
             log.error("当前会员日结信息不存在{}",settleTableName);
             return AjaxResult.error("数据查询错误,请联系客服处理");
         }
-        CuMemberPointDetailVO cuMemberPointDetailVO = iCumemberRetailDetailService.getPointDetailByUserId(userId,stage,point,settleTableName);
+        CuMemberPointDetailVO cuMemberPointDetailVO = iCumemberRetailDetailService.getPointDetailByUserId(userId, pointMember, stage, point, settleTableName);
         if (cuMemberPointDetailVO == null) {
             return null;
         }

bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java

@@ -278,8 +278,8 @@ public class MemberStructureController extends BaseController {
 
     @Log(module = EOperationModule.MEMBER_RETAIL_TREE_LIST, business = EOperationBusiness.MEMBER_RETAIL_TREE_LIST, method = EOperationMethod.SELECT)
     @GetMapping("/pointDetail")
-    public AjaxResult pointDetail(Long pkMember,Integer stage,Integer point,Long memberSettlePeriodId) {
+    public AjaxResult pointDetail(Long pkMember,Long pointMember,Integer stage,Integer point,Long memberSettlePeriodId) {
-        if (pkMember == null || stage == null || point == null ||  memberSettlePeriodId == null) {
+        if (pkMember == null || stage == null || point == null ||  memberSettlePeriodId == null || pointMember == null) {
             log.error("参数错误");
             return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
         }
@@ -293,7 +293,7 @@ public class MemberStructureController extends BaseController {
             log.error("当前表名不存在{}",settleTableName);
             return AjaxResult.error("当前日结信息表不存在",settleTableName);
         }
-        CuMemberPointDetailVO cuMemberPointDetailVO = iCumemberRetailDetailService.getPointDetailByUserId(pkMember,stage,point,settleTableName);
+        CuMemberPointDetailVO cuMemberPointDetailVO = iCumemberRetailDetailService.getPointDetailByUserId(pkMember,pointMember,stage,point,settleTableName);
         if (cuMemberPointDetailVO == null) {
             return null;
         }

bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailDetailMapper.xml

@@ -79,18 +79,11 @@
             curd.CHILD_NODE
     </select>
     <select id="getPointDetailByUserId"
-            resultType="com.hzs.member.structure.controller.vo.CuMemberPointDetailVO">
+            resultType="com.hzs.member.structure.controller.dto.CuMemberPointDTO">
         SELECT
-            cu.MEMBER_CODE,
-            cu.MEMBER_NAME,
-            ba.AWARDS_NAME,
-            bv.VERTEX_NAME,
             cur.CREATION_TIME
         FROM
             ${settleTableName} cur
-                LEFT JOIN CU_MEMBER cu ON cur.PK_MEMBER = cu.PK_ID
-                LEFT JOIN BD_AWARDS ba ON cu.PK_AWARDS = ba.PK_ID
-                LEFT JOIN BD_VERTEX bv ON cu.PK_VERTEX = bv.PK_ID
         WHERE
             cur.PK_MEMBER = #{ userId }
           AND cur.STAGE = #{stage}