Explorar o código

fixed 推广邀请明细功能

fushengqian hai 9 meses
pai
achega
df6cd12e71

+ 57 - 0
fuint-application/src/main/java/com/fuint/common/dto/CommissionRelationDto.java

@@ -0,0 +1,57 @@
+package com.fuint.common.dto;
+
+import com.fuint.repository.model.MtUser;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 分销提成邀请记录实体
+ *
+ * Created by FSQ
+ * CopyRight https://www.fuint.cn
+ */
+@Data
+public class CommissionRelationDto implements Serializable {
+
+    @ApiModelProperty("自增ID")
+    private Integer id;
+
+    @ApiModelProperty("所属商户ID")
+    private Integer merchantId;
+
+    @ApiModelProperty("会员ID")
+    private Integer userId;
+
+    @ApiModelProperty("会员信息")
+    private MtUser userInfo;
+
+    @ApiModelProperty("邀请码")
+    private String inviteCode;
+
+    @ApiModelProperty("被邀请会员ID")
+    private Integer subUserId;
+
+    @ApiModelProperty("会员信息")
+    private MtUser subUserInfo;
+
+    @ApiModelProperty("等级")
+    private Integer level;
+
+    @ApiModelProperty("备注")
+    private String description;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("最后操作人")
+    private String operator;
+
+    @ApiModelProperty("状态")
+    private String status;
+
+}

+ 2 - 1
fuint-application/src/main/java/com/fuint/common/service/CommissionRelationService.java

@@ -1,6 +1,7 @@
 package com.fuint.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fuint.common.dto.CommissionRelationDto;
 import com.fuint.framework.pagination.PaginationRequest;
 import com.fuint.framework.pagination.PaginationResponse;
 import com.fuint.framework.exception.BusinessCheckException;
@@ -21,7 +22,7 @@ public interface CommissionRelationService extends IService<MtCommissionRelation
      * @param paginationRequest
      * @return
      */
-    PaginationResponse<MtCommissionRelation> queryRelationByPagination(PaginationRequest paginationRequest) throws BusinessCheckException;
+    PaginationResponse<CommissionRelationDto> queryRelationByPagination(PaginationRequest paginationRequest) throws BusinessCheckException;
 
     /**
      * 设置分销提成关系

+ 18 - 4
fuint-application/src/main/java/com/fuint/common/service/impl/CommissionRelationServiceImpl.java

@@ -3,6 +3,7 @@ package com.fuint.common.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fuint.common.dto.CommissionRelationDto;
 import com.fuint.common.service.CommissionRelationService;
 import com.fuint.common.service.MemberService;
 import com.fuint.common.util.CommonUtil;
@@ -17,9 +18,11 @@ import com.fuint.utils.StringUtil;
 import com.github.pagehelper.PageHelper;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
+import org.apache.velocity.runtime.directive.contrib.For;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.github.pagehelper.Page;
+import org.springframework.beans.BeanUtils;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
@@ -51,7 +54,7 @@ public class CommissionRelationServiceImpl extends ServiceImpl<MtCommissionRelat
      * @return
      */
     @Override
-    public PaginationResponse<MtCommissionRelation> queryRelationByPagination(PaginationRequest paginationRequest) {
+    public PaginationResponse<CommissionRelationDto> queryRelationByPagination(PaginationRequest paginationRequest) throws BusinessCheckException {
         Page<MtCommissionRelation> pageHelper = PageHelper.startPage(paginationRequest.getCurrentPage(), paginationRequest.getPageSize());
         LambdaQueryWrapper<MtCommissionRelation> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.ne(MtCommissionRelation::getStatus, StatusEnum.DISABLE.getKey());
@@ -73,11 +76,22 @@ public class CommissionRelationServiceImpl extends ServiceImpl<MtCommissionRelat
         }
 
         lambdaQueryWrapper.orderByDesc(MtCommissionRelation::getId);
-        List<MtCommissionRelation> dataList = mtCommissionRelationMapper.selectList(lambdaQueryWrapper);
-
+        List<MtCommissionRelation> relationList = mtCommissionRelationMapper.selectList(lambdaQueryWrapper);
+        List<CommissionRelationDto> dataList = new ArrayList<>();
+        if (relationList != null && relationList.size() > 0) {
+            for (MtCommissionRelation mtCommissionRelation : relationList) {
+                 CommissionRelationDto commissionRelationDto = new CommissionRelationDto();
+                 BeanUtils.copyProperties(mtCommissionRelation, commissionRelationDto);
+                 MtUser userInfo = memberService.queryMemberById(mtCommissionRelation.getUserId());
+                 MtUser subUserInfo = memberService.queryMemberById(mtCommissionRelation.getSubUserId());
+                 commissionRelationDto.setUserInfo(userInfo);
+                 commissionRelationDto.setSubUserInfo(subUserInfo);
+                 dataList.add(commissionRelationDto);
+            }
+        }
         PageRequest pageRequest = PageRequest.of(paginationRequest.getCurrentPage(), paginationRequest.getPageSize());
         PageImpl pageImpl = new PageImpl(dataList, pageRequest, pageHelper.getTotal());
-        PaginationResponse<MtCommissionRelation> paginationResponse = new PaginationResponse(pageImpl, MtCommissionRelation.class);
+        PaginationResponse<CommissionRelationDto> paginationResponse = new PaginationResponse(pageImpl, CommissionRelationDto.class);
         paginationResponse.setTotalPages(pageHelper.getPages());
         paginationResponse.setTotalElements(pageHelper.getTotal());
         paginationResponse.setContent(dataList);

+ 165 - 0
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCommissionRelationController.java

@@ -0,0 +1,165 @@
+package com.fuint.module.backendApi.controller;
+
+import com.fuint.common.dto.AccountInfo;
+import com.fuint.common.dto.CommissionRelationDto;
+import com.fuint.common.service.CommissionRelationService;
+import com.fuint.common.service.StoreService;
+import com.fuint.common.util.TokenUtil;
+import com.fuint.framework.web.BaseController;
+import com.fuint.framework.web.ResponseObject;
+import com.fuint.common.Constants;
+import com.fuint.common.enums.StatusEnum;
+import com.fuint.framework.pagination.PaginationRequest;
+import com.fuint.framework.pagination.PaginationResponse;
+import com.fuint.framework.exception.BusinessCheckException;
+import com.fuint.repository.model.MtCommissionRelation;
+import com.fuint.repository.model.MtStore;
+import com.fuint.utils.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 分销提成邀请记录管理类controller
+ *
+ * Created by FSQ
+ * CopyRight https://www.fuint.cn
+ */
+@Api(tags="管理端-分销提成邀请记录相关接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping(value = "/backendApi/commissionRelation")
+public class BackendCommissionRelationController extends BaseController {
+
+    /**
+     * 分销提成邀请记录业务接口
+     */
+    private CommissionRelationService commissionRelationService;
+
+    /**
+     * 店铺服务接口
+     */
+    private StoreService storeService;
+
+    /**
+     * 分销提成邀请记录列表查询
+     *
+     * @param request HttpServletRequest对象
+     * @return 分销提成邀请记录
+     */
+    @ApiOperation(value = "分销提成邀请记录查询")
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @CrossOrigin
+    @PreAuthorize("@pms.hasPermission('commission:relation:index')")
+    public ResponseObject list(HttpServletRequest request) throws BusinessCheckException {
+        String token = request.getHeader("Access-Token");
+        Integer page = request.getParameter("page") == null ? Constants.PAGE_NUMBER : Integer.parseInt(request.getParameter("page"));
+        Integer pageSize = request.getParameter("pageSize") == null ? Constants.PAGE_SIZE : Integer.parseInt(request.getParameter("pageSize"));
+        String userId = request.getParameter("userId");
+        String status = request.getParameter("status");
+        String searchStoreId = request.getParameter("storeId");
+        String subUserId = request.getParameter("subUserId");
+
+        AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
+        if (accountInfo == null) {
+            return getFailureResult(1001, "请先登录");
+        }
+
+        PaginationRequest paginationRequest = new PaginationRequest();
+        paginationRequest.setCurrentPage(page);
+        paginationRequest.setPageSize(pageSize);
+
+        Map<String, Object> params = new HashMap<>();
+        if (StringUtil.isNotEmpty(userId)) {
+            params.put("userId", userId);
+        }
+        if (StringUtil.isNotEmpty(status)) {
+            params.put("status", status);
+        }
+        if (accountInfo.getStoreId() != null && accountInfo.getStoreId() > 0) {
+            params.put("storeId", accountInfo.getStoreId());
+        }
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            params.put("merchantId", accountInfo.getMerchantId());
+        }
+        if (StringUtil.isNotEmpty(subUserId)) {
+            params.put("subUserId", subUserId);
+        }
+        if (StringUtil.isNotEmpty(searchStoreId)) {
+            params.put("storeId", searchStoreId);
+        }
+        paginationRequest.setSearchParams(params);
+        PaginationResponse<CommissionRelationDto> paginationResponse = commissionRelationService.queryRelationByPagination(paginationRequest);
+
+        Map<String, Object> param = new HashMap<>();
+        if (accountInfo.getStoreId() != null && accountInfo.getStoreId() > 0) {
+            param.put("storeId", accountInfo.getStoreId().toString());
+        }
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            param.put("merchantId", accountInfo.getMerchantId());
+        }
+        param.put("status", StatusEnum.ENABLED.getKey());
+        List<MtStore> storeList = storeService.queryStoresByParams(param);
+
+        Map<String, Object> result = new HashMap<>();
+        result.put("dataList", paginationResponse);
+        result.put("storeList", storeList);
+
+        return getSuccessResult(result);
+    }
+
+    /**
+     * 更新邀请记录状态
+     *
+     * @return
+     */
+    @ApiOperation(value = "更新邀请记录状态")
+    @RequestMapping(value = "/updateStatus", method = RequestMethod.POST)
+    @CrossOrigin
+    @PreAuthorize("@pms.hasPermission('commission:relation:index')")
+    public ResponseObject updateStatus(HttpServletRequest request, @RequestBody Map<String, Object> param) throws BusinessCheckException {
+        String token = request.getHeader("Access-Token");
+        AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
+        if (accountInfo == null) {
+            return getFailureResult(1001, "请先登录");
+        }
+        Integer id = param.get("id") == null ? 0 : Integer.parseInt(param.get("id").toString());
+        String status = param.get("status") == null ? StatusEnum.ENABLED.getKey() : param.get("status").toString();
+
+        MtCommissionRelation mtCommissionRelation = commissionRelationService.getById(id);
+        mtCommissionRelation.setStatus(status);
+        commissionRelationService.updateById(mtCommissionRelation);
+
+        return getSuccessResult(true);
+    }
+
+    /**
+     * 删除分销提成邀请记录
+     *
+     * @param  id 邀请记录ID
+     * @return
+     */
+    @ApiOperation(value = "删除分销提成邀请记录")
+    @RequestMapping(value = "/delete/{id}", method = RequestMethod.GET)
+    @CrossOrigin
+    @PreAuthorize("@pms.hasPermission('commission:relation:index')")
+    public ResponseObject delete(HttpServletRequest request, @PathVariable("id") Integer id) throws BusinessCheckException {
+        String token = request.getHeader("Access-Token");
+        AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
+        if (accountInfo == null) {
+            return getFailureResult(1001, "请先登录");
+        }
+
+        MtCommissionRelation mtCommissionRelation = commissionRelationService.getById(id);
+        mtCommissionRelation.setStatus(StatusEnum.DISABLE.getKey());
+        commissionRelationService.updateById(mtCommissionRelation);
+
+        return getSuccessResult(true);
+    }
+}

+ 1 - 1
fuint-application/src/main/java/com/fuint/module/schedule/CommissionJob.java

@@ -66,7 +66,7 @@ public class CommissionJob {
              param.put("PAY_STATUS", PayStatusEnum.SUCCESS.getKey());
 
              Calendar calendar = Calendar.getInstance();
-             calendar.add(Calendar.DATE, OVER_DAY);
+             calendar.add(Calendar.DATE, -OVER_DAY);
              Date dateTime = calendar.getTime();
              String endTime = DateUtil.formatDate(dateTime, "yyyy-MM-dd HH:mm:ss");