ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCompanyController.java
@@ -1,7 +1,12 @@ package com.ruoyi.web.controller.api; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.ExcelImportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.ImportParams; import cn.hutool.core.util.RandomUtil; import cn.hutool.crypto.SecureUtil; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSON; @@ -9,31 +14,49 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.UserStatus; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.WebUtils; import com.ruoyi.system.export.BigGiftPackageImport; import com.ruoyi.system.export.SysUserImport; import com.ruoyi.system.model.TBigGiftPackage; import com.ruoyi.system.model.TCompany; import com.ruoyi.system.model.TPhysicalGoods; import com.ruoyi.system.query.BigGiftPackageQuery; import com.ruoyi.system.query.CompanyUserQuery; import com.ruoyi.system.query.TCompanyQuery; import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.TCompanyService; import com.ruoyi.system.service.TPhysicalGoodsService; import com.ruoyi.system.query.*; import com.ruoyi.system.service.*; import com.ruoyi.system.vo.ProfitPageListVo; import com.ruoyi.system.vo.PromotionPageListVo; import com.ruoyi.system.vo.SysUserVO; import com.ruoyi.web.controller.system.SysUserController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.client.RestTemplate; import org.springframework.web.multipart.MultipartFile; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; import java.io.InputStream; import java.math.BigDecimal; import java.net.URLEncoder; import java.text.MessageFormat; import java.util.*; import java.util.concurrent.TimeUnit; @@ -55,12 +78,16 @@ private final TCompanyService companyService; private final ISysUserService userService; private final RedisTemplate redisTemplate; private final TAppUserService appUserService ; private final TBigGiftPackageOrderService bigGiftPackageOrderService; public TCompanyController(TCompanyService companyService, ISysUserService userService, RedisTemplate redisTemplate) { public TCompanyController(TCompanyService companyService, ISysUserService userService, RedisTemplate redisTemplate, TAppUserService appUserService, TBigGiftPackageOrderService bigGiftPackageOrderService) { this.companyService = companyService; this.userService = userService; this.redisTemplate = redisTemplate; this.appUserService = appUserService; this.bigGiftPackageOrderService = bigGiftPackageOrderService; } @ApiOperation(value = "公司分页列表") @@ -103,6 +130,8 @@ return R.fail("新增用户'" + user.getUserName() + "'失败，登录账号已存在"); } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) { return R.fail("新增用户'" + user.getUserName() + "'失败，手机号码已存在"); }else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkCodeUnique(user)) { return R.fail("新增用户'" + user.getUserName() + "'失败，推广码已存在"); } user.setCreateBy(getUsername()); user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); @@ -169,7 +198,8 @@ @ApiOperation(value = "公司需求--管理人员获取二维码") @GetMapping(value = "/getQrcode") public R<String> getQrcode(@RequestParam Long userId) { Object o = redisTemplate.opsForValue().get("ADMIN_WX_IMG" + userId); SysUser sysUser = userService.selectUserById(userId); Object o = redisTemplate.opsForValue().get("ADMIN_WX_IMG" + sysUser.getCode()); if(o!=null){ return R.ok(o.toString()); } @@ -231,10 +261,13 @@ { return R.fail("新增用户'" + user.getUserName() + "'失败，手机号码已存在"); } else if (StringUtils.isNotEmpty(user.getCode()) && !userService.checkCodeUnique(user)) { return R.fail("新增用户'" + user.getUserName() + "'失败，推广号已存在"); } user.setCreateBy(getUsername()); user.setPassword(SecurityUtils.encryptPassword("123456")); user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); // 随机10数数字 user.setCode(RandomUtil.randomNumbers(10)); userService.insertUser(user); if(user.getCompanyId()!=null){ String accessToken = getAccessToken(); @@ -242,7 +275,7 @@ Map<String, Object> param = new HashMap<>(); param.put("page", "pages/home/home"); param.put("width", 430); //二维码尺寸 param.put("scene", "userId=" + user.getUserId()); //二维码尺寸 param.put("scene", "code=" + user.getCode()+"&type=1"); //二维码尺寸 param.put("env_version", "trial"); //二维码尺寸 HttpRequest post = HttpUtil.createPost(url); post.body(JSON.toJSONString(param)); @@ -251,7 +284,7 @@ // base64 String img = Base64.getEncoder().encodeToString(result); // 后台用户的小程序码 redisTemplate.opsForValue().set("ADMIN_WX_IMG" + user.getUserId(), img); redisTemplate.opsForValue().set("ADMIN_WX_IMG" + user.getCode(), img); } return R.ok(); } @@ -300,8 +333,173 @@ @Log(title = "股东-导入", businessType = BusinessType.IMPORT) @ApiOperation(value = "股东-导入") @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW) @PostMapping("/import") public R<String> importInfo(@RequestPart("file") MultipartFile file, @RequestParam Integer companyId) { List<SysUserImport> imports = new ArrayList<>(); ImportParams params = new ImportParams(); params.setHeadRows(1); //表头行数 InputStream inputStream = null; try { inputStream = file.getInputStream(); imports = ExcelImportUtil.importExcel(inputStream, SysUserImport.class, params); } catch (Exception e) { e.printStackTrace(); throw new ServiceException("股东导入失败!"); } finally { try { inputStream.close(); } catch (IOException e) { throw new ServiceException(e.getMessage()); } } if (CollectionUtils.isEmpty(imports)) { throw new ServiceException("股东数据为空!"); } cn.hutool.json.JSONObject result = new cn.hutool.json.JSONObject(); int i = 1; for (SysUserImport sysUserImport : imports) { if (!org.springframework.util.StringUtils.hasLength(sysUserImport.getUserName())){ result.append("第"+i+"行：[", "人员名称"+"]不能为空"); continue; } if (!org.springframework.util.StringUtils.hasLength(sysUserImport.getCode())){ result.append("第"+i+"行：[", "推广号"+"]不能为空"); continue; } if (!org.springframework.util.StringUtils.hasLength(sysUserImport.getPhone())){ result.append("第"+i+"行：[", "联系电话"+"]不能为空"); continue; } if (!org.springframework.util.StringUtils.hasLength(sysUserImport.getAccount())){ result.append("第"+i+"行：[", "登录账号"+"]不能为空"); continue; } if (!org.springframework.util.StringUtils.hasLength(sysUserImport.getPassword())){ result.append("第"+i+"行：[", "初始密码"+"]不能为空"); continue; } SysUser sysUser = new SysUser(); sysUser.setUserName(sysUserImport.getAccount()); if(!userService.checkUserNameUnique(sysUser)){ result.append("第"+i+"行：[", "登录账号"+"]已存在"); continue; } sysUser.setNickName(sysUserImport.getUserName()); sysUser.setPhonenumber(sysUserImport.getPhone()); sysUser.setPassword(SecurityUtils.encryptPassword(sysUserImport.getPassword())); sysUser.setCompanyId(companyId); sysUser.setRemark(sysUserImport.getRemark()); sysUser.setCode(sysUserImport.getCode()); if(!userService.checkCodeUnique(sysUser)){ result.append("第"+i+"行：[", "推广号"+"]已存在"); continue; } sysUser.setCreateBy(getUsername()); sysUser.setRoleType(3); sysUser.setRoleId(1L); // sysUsers.add(sysUser); userService.insertUser(sysUser); i++; } if(!result.isEmpty()){ return R.fail(result.toString()); } return R.ok(); } @ApiOperation(value = "推广记录") @PostMapping("/promotionPageList") public R<Page<PromotionPageListVo>> promotionPageList(@RequestBody @Valid PromotionPageListQuery query) { Page<PromotionPageListVo> page = new Page<>(query.getPageNum(), query.getPageSize()); List<PromotionPageListVo> list = appUserService.promotionPageList(page,query); page.setRecords(list); return R.ok(page); } @ApiOperation(value = "推广记录导出") @PostMapping(value = "/export") @Log(title = "推广记录-导出", businessType = BusinessType.EXPORT) public void export(@RequestBody @Valid PromotionPageListQuery query){ List<PromotionPageListVo> list = appUserService.promotionPageListExport(query); Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), PromotionPageListVo.class, list); HttpServletResponse response = WebUtils.response(); assert response != null; response.setContentType("application/vnd.ms-excel"); response.setCharacterEncoding("utf-8"); ServletOutputStream outputStream = null; try { String fileName = URLEncoder.encode("推广记录导出信息.xls", "utf-8"); response.setHeader("Content-Disposition", "attachment;filename=" + fileName); response.setContentType("application/vnd.ms-excel;charset=UTF-8"); response.setHeader("Pragma", "no-cache"); response.setHeader("Cache-Control", "no-cache"); outputStream = response.getOutputStream(); workbook.write(outputStream); } catch (IOException e) { e.printStackTrace(); } finally { try { outputStream.close(); } catch (IOException e) { e.printStackTrace(); } } } @ApiOperation(value = "收益明细") @PostMapping("/profitPageList") public R<Page<ProfitPageListVo>> profitPageList(@RequestBody @Valid ProfitPageListQuery query) { Page<ProfitPageListVo> page = new Page<>(query.getPageNum(), query.getPageSize()); List<ProfitPageListVo> list = bigGiftPackageOrderService.profitPageList(page,query); page.setRecords(list); return R.ok(page); } @ApiOperation(value = "收益明细导出") @PostMapping(value = "/exportProfit") @Log(title = "收益明细-导出", businessType = BusinessType.EXPORT) public void exportProfit(@RequestBody @Valid ProfitPageListQuery query){ List<ProfitPageListVo> list = bigGiftPackageOrderService.profitPageListExport(query); Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), ProfitPageListVo.class, list); HttpServletResponse response = WebUtils.response(); assert response != null; response.setContentType("application/vnd.ms-excel"); response.setCharacterEncoding("utf-8"); ServletOutputStream outputStream = null; try { String fileName = URLEncoder.encode("收益明细导出信息.xls", "utf-8"); response.setHeader("Content-Disposition", "attachment;filename=" + fileName); response.setContentType("application/vnd.ms-excel;charset=UTF-8"); response.setHeader("Pragma", "no-cache"); response.setHeader("Cache-Control", "no-cache"); outputStream = response.getOutputStream(); workbook.write(outputStream); } catch (IOException e) { e.printStackTrace(); } finally { try { outputStream.close(); } catch (IOException e) { e.printStackTrace(); } } } } ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TRefundApplicationController.java
@@ -117,6 +117,16 @@ return R.ok(vo); } @ApiOperation(value = "退款申请删除") @DeleteMapping(value = "/delete/{id}") @Log(title = "退款申请-删除", businessType = BusinessType.DELETE) public R<String> delete(@PathVariable Integer id) { TRefundApplication refundApplication = tRefundApplicationService.getById(id); refundApplication.setDelFlag(1); tRefundApplicationService.updateById(refundApplication); return R.ok(); } @ApiOperation(value = "退款申请审核") @PostMapping(value = "/refundAudit") @Log(title = "退款申请-审核", businessType = BusinessType.UPDATE) @@ -137,6 +147,7 @@ return R.ok("操作成功"); } @ApiOperation(value = "退款申请导出") @PostMapping(value = "/export") @Log(title = "退款申请-导出", businessType = BusinessType.EXPORT) ruoyi-system/src/main/java/com/ruoyi/system/export/SysUserImport.java
New file @@ -0,0 +1,34 @@ package com.ruoyi.system.export; import cn.afterturn.easypoi.excel.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @ApiModel("股东导入") public class SysUserImport { @ApiModelProperty(value = "人员名称") @Excel(name = "人员名称") private String userName; @ApiModelProperty(value = "推广号") @Excel(name = "推广号") private String code; @ApiModelProperty(value = "联系电话") @Excel(name = "联系电话") private String phone; @ApiModelProperty(value = "备注") @Excel(name = "备注") private String remark; @ApiModelProperty(value = "登录账号") @Excel(name = "登录账号") private String account; @ApiModelProperty(value = "初始密码") @Excel(name = "初始密码") private String password; } ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
@@ -202,4 +202,5 @@ List<SysUser> getCompanyUserList(@Param("page") Page<SysUser> page, @Param("companyId") Integer companyId); SysUser checkCodeUnique(@Param("code") String code); } ruoyi-system/src/main/java/com/ruoyi/system/mapper/TAppUserMapper.java
@@ -1,9 +1,12 @@ package com.ruoyi.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.system.model.TAppUser; import com.ruoyi.system.query.AppUserListQuery; import com.ruoyi.system.query.PromotionPageListQuery; import com.ruoyi.system.vo.PromotionPageListVo; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -19,4 +22,9 @@ public interface TAppUserMapper extends BaseMapper<TAppUser> { List<TAppUser> pageList(@Param("query")AppUserListQuery query,@Param("pageInfo") PageInfo<TAppUser> pageInfo); List<PromotionPageListVo> promotionPageList(@Param("page") Page<PromotionPageListVo> page, @Param("query") PromotionPageListQuery query); List<PromotionPageListVo> promotionPageListExport(@Param("query") PromotionPageListQuery query); } ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBigGiftPackageOrderMapper.java
@@ -4,6 +4,8 @@ import com.ruoyi.system.model.TBigGiftPackageOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.system.query.BigGiftPackageOrderQuery; import com.ruoyi.system.query.ProfitPageListQuery; import com.ruoyi.system.vo.ProfitPageListVo; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -22,4 +24,8 @@ List<TBigGiftPackageOrder> export(@Param("query") BigGiftPackageOrderQuery query, @Param("sTime") String sTime, @Param("eTime") String eTime); List<ProfitPageListVo> profitPageList(@Param("page") Page<ProfitPageListVo> page, @Param("query") ProfitPageListQuery query, @Param("sTime") String sTime, @Param("eTime") String eTime); List<ProfitPageListVo> profitPageListExport(@Param("query") ProfitPageListQuery query, @Param("sTime") String sTime, @Param("eTime") String eTime); } ruoyi-system/src/main/java/com/ruoyi/system/model/TRefundApplication.java
@@ -67,5 +67,9 @@ @TableField("audit_remark") private String auditRemark; @ApiModelProperty(value = "删除标识（0=正常，1=删除）") @TableField("del_flag") private Integer delFlag; } ruoyi-system/src/main/java/com/ruoyi/system/query/ProfitPageListQuery.java
New file @@ -0,0 +1,28 @@ package com.ruoyi.system.query; import com.ruoyi.common.core.domain.BasePage; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotNull; @Data @ApiModel("收益明细分页查询参数") public class ProfitPageListQuery extends BasePage { @ApiModelProperty("用户姓名") private String userName; @ApiModelProperty("用户手机号") private String phone; @ApiModelProperty("订单编号") private String code; @ApiModelProperty("下单时间 2022-02-02 - 2022-03-03") private String createTime; @ApiModelProperty("公司id") @NotNull(message = "公司id不能为空") private Integer companyId; } ruoyi-system/src/main/java/com/ruoyi/system/query/PromotionPageListQuery.java
New file @@ -0,0 +1,33 @@ package com.ruoyi.system.query; import com.ruoyi.common.core.domain.BasePage; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotNull; import java.math.BigDecimal; @Data @ApiModel(value = "推广记录列表查询参数") public class PromotionPageListQuery extends BasePage { @ApiModelProperty(value = "上级用户姓名") private String lastUserName; @ApiModelProperty(value = "上级用户电话") private String lastPhone; @ApiModelProperty(value = "用户名") private String userName; @ApiModelProperty(value = "联系电话") private String phone; @ApiModelProperty(value = "公司id") @NotNull(message = "公司id不能为空") private Integer companyId; } ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
@@ -298,4 +298,5 @@ List<SysUser> getCompanyUserList(Page<SysUser> page, Integer companyId); boolean checkCodeUnique(SysUser user); } ruoyi-system/src/main/java/com/ruoyi/system/service/TAppUserService.java
@@ -1,10 +1,18 @@ package com.ruoyi.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.model.LoginUserApplet; import com.ruoyi.system.model.TAppUser; import com.ruoyi.system.query.AppUserListQuery; import com.ruoyi.system.query.ProfitPageListQuery; import com.ruoyi.system.query.PromotionPageListQuery; import com.ruoyi.system.vo.ProfitPageListVo; import com.ruoyi.system.vo.PromotionPageListVo; import javax.validation.Valid; import java.util.List; /** * <p> @@ -26,4 +34,11 @@ * @param loginUserApplet */ void confirmSuperior(Integer superiorType, Integer superiorId, LoginUserApplet loginUserApplet); List<PromotionPageListVo> promotionPageList(Page<PromotionPageListVo> page, @Valid PromotionPageListQuery query); List<PromotionPageListVo> promotionPageListExport(@Valid PromotionPageListQuery query); } ruoyi-system/src/main/java/com/ruoyi/system/service/TBigGiftPackageOrderService.java
@@ -5,8 +5,11 @@ import com.ruoyi.system.dto.BigGiftPlaceOrderDTO; import com.ruoyi.system.model.TBigGiftPackageOrder; import com.ruoyi.system.query.BigGiftPackageOrderQuery; import com.ruoyi.system.query.ProfitPageListQuery; import com.ruoyi.system.vo.ProfitPageListVo; import com.ruoyi.system.vo.PlaceOrderVO; import javax.validation.Valid; import java.util.List; /** @@ -44,4 +47,10 @@ */ PlaceOrderVO payFinalPayment(Integer orderId, Integer appUserId, String openid); List<ProfitPageListVo> profitPageList(Page<ProfitPageListVo> page, @Valid ProfitPageListQuery query); List<ProfitPageListVo> profitPageListExport(@Valid ProfitPageListQuery query); } ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -196,6 +196,17 @@ } return UserConstants.UNIQUE; } @Override public boolean checkCodeUnique(SysUser user) { Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); SysUser info = userMapper.checkCodeUnique(user.getCode()); if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) { return UserConstants.NOT_UNIQUE; } return UserConstants.UNIQUE; } /** * 校验email是否唯一 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java
@@ -1,22 +1,30 @@ package com.ruoyi.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.model.LoginUserApplet; import com.ruoyi.system.mapper.TAppUserMapper; import com.ruoyi.system.model.TAppUser; import com.ruoyi.system.model.*; import com.ruoyi.system.query.AppUserListQuery; import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.TAppUserService; import com.ruoyi.system.query.PromotionPageListQuery; import com.ruoyi.system.service.*; import com.ruoyi.system.vo.PromotionPageListVo; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; /** * <p> @@ -31,6 +39,18 @@ @RequiredArgsConstructor(onConstructor_ = {@Lazy}) public class TAppUserServiceImpl extends ServiceImpl<TAppUserMapper, TAppUser> implements TAppUserService { private final ISysUserService sysUserService; @Autowired private TBigGiftPackageOrderService tBigGiftPackageOrderService; @Autowired private TPhysicalGoodsOrderService tPhysicalGoodsOrderService; @Autowired private TCommissionTransactionFlowService tCommissionTransactionFlowService; @Autowired private TIntegralSettlementService tIntegralSettlementService; @Override public PageInfo<TAppUser> pageList(AppUserListQuery query) { @@ -62,4 +82,66 @@ this.updateById(appUser); } } @Override public List<PromotionPageListVo> promotionPageList(Page<PromotionPageListVo> page, PromotionPageListQuery query) { List<PromotionPageListVo> list = this.baseMapper.promotionPageList(page,query); if (!list.isEmpty()) { List<Integer> userIds = list.stream().map(PromotionPageListVo::getUserId).collect(Collectors.toList()); // List<TPhysicalGoodsOrder> physicalGoodsOrders = tPhysicalGoodsOrderService.list(new LambdaQueryWrapper<TPhysicalGoodsOrder>().in(TPhysicalGoodsOrder::getAppUserId, userIds).notIn(TPhysicalGoodsOrder::getStatus,Arrays.asList(1,4))); List<TBigGiftPackageOrder> giftPackageOrders = tBigGiftPackageOrderService.list(new LambdaQueryWrapper<TBigGiftPackageOrder>().in(TBigGiftPackageOrder::getAppUserId, userIds).notIn(TBigGiftPackageOrder::getStatus,Arrays.asList(1,5))); List<TCommissionTransactionFlow> flows = tCommissionTransactionFlowService.list(new LambdaQueryWrapper<TCommissionTransactionFlow>().in(TCommissionTransactionFlow::getAppUserId, userIds)); List<TIntegralSettlement> settlements = tIntegralSettlementService.list(new LambdaQueryWrapper<TIntegralSettlement>().in(TIntegralSettlement::getAppUserId, userIds)); for (PromotionPageListVo promotionPageListVo : list) { // BigDecimal total = physicalGoodsOrders.stream().filter(e -> e.getAppUserId().equals(promotionPageListVo.getUserId())).map(TPhysicalGoodsOrder::getPaymentPrice).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal totalOne = giftPackageOrders.stream().filter(e -> e.getAppUserId().equals(promotionPageListVo.getUserId())).map(TBigGiftPackageOrder::getPaymentPrice).reduce(BigDecimal.ZERO, BigDecimal::add); promotionPageListVo.setTotalConsume(totalOne); BigDecimal totalIncome = flows.stream().filter(e -> e.getAppUserId().equals(promotionPageListVo.getUserId())).map(TCommissionTransactionFlow::getCommissionAmount).reduce(BigDecimal.ZERO, BigDecimal::add); promotionPageListVo.setTotalIncome(totalIncome); BigDecimal totalSettledIncome = settlements.stream().filter(e -> e.getAppUserId().equals(promotionPageListVo.getUserId())).map(TIntegralSettlement::getTotalSettlementIntegral).reduce(BigDecimal.ZERO, BigDecimal::add); promotionPageListVo.setTotalSettledIncome(totalSettledIncome); } } return list; } @Override public List<PromotionPageListVo> promotionPageListExport(PromotionPageListQuery query) { List<PromotionPageListVo> list = this.baseMapper.promotionPageListExport(query); if (!list.isEmpty()) { List<Integer> userIds = list.stream().map(PromotionPageListVo::getUserId).collect(Collectors.toList()); // List<TPhysicalGoodsOrder> physicalGoodsOrders = tPhysicalGoodsOrderService.list(new LambdaQueryWrapper<TPhysicalGoodsOrder>().in(TPhysicalGoodsOrder::getAppUserId, userIds).notIn(TPhysicalGoodsOrder::getStatus,Arrays.asList(1,4))); List<TBigGiftPackageOrder> giftPackageOrders = tBigGiftPackageOrderService.list(new LambdaQueryWrapper<TBigGiftPackageOrder>().in(TBigGiftPackageOrder::getAppUserId, userIds).notIn(TBigGiftPackageOrder::getStatus,Arrays.asList(1,5))); List<TCommissionTransactionFlow> flows = tCommissionTransactionFlowService.list(new LambdaQueryWrapper<TCommissionTransactionFlow>().in(TCommissionTransactionFlow::getAppUserId, userIds)); List<TIntegralSettlement> settlements = tIntegralSettlementService.list(new LambdaQueryWrapper<TIntegralSettlement>().in(TIntegralSettlement::getAppUserId, userIds)); for (PromotionPageListVo promotionPageListVo : list) { // BigDecimal total = physicalGoodsOrders.stream().filter(e -> e.getAppUserId().equals(promotionPageListVo.getUserId())).map(TPhysicalGoodsOrder::getPaymentPrice).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal totalOne = giftPackageOrders.stream().filter(e -> e.getAppUserId().equals(promotionPageListVo.getUserId())).map(TBigGiftPackageOrder::getPaymentPrice).reduce(BigDecimal.ZERO, BigDecimal::add); promotionPageListVo.setTotalConsume(totalOne); BigDecimal totalIncome = flows.stream().filter(e -> e.getAppUserId().equals(promotionPageListVo.getUserId())).map(TCommissionTransactionFlow::getCommissionAmount).reduce(BigDecimal.ZERO, BigDecimal::add); promotionPageListVo.setTotalIncome(totalIncome); BigDecimal totalSettledIncome = settlements.stream().filter(e -> e.getAppUserId().equals(promotionPageListVo.getUserId())).map(TIntegralSettlement::getTotalSettlementIntegral).reduce(BigDecimal.ZERO, BigDecimal::add); promotionPageListVo.setTotalSettledIncome(totalSettledIncome); } } return list; } } ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBigGiftPackageOrderServiceImpl.java
@@ -1,5 +1,7 @@ package com.ruoyi.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -8,13 +10,20 @@ import com.ruoyi.system.config.ICBCConfig; import com.ruoyi.system.dto.BigGiftPlaceOrderDTO; import com.ruoyi.system.mapper.TBigGiftPackageMapper; import com.ruoyi.system.mapper.TCommissionTransactionFlowMapper; import com.ruoyi.system.mapper.TBigGiftPackageOrderMapper; import com.ruoyi.system.mapper.TCompanyMapper; import com.ruoyi.system.model.TBigGiftPackage; import com.ruoyi.system.model.TBigGiftPackageOrder; import com.ruoyi.system.mapper.TBigGiftPackageOrderMapper; import com.ruoyi.system.model.TCommissionTransactionFlow; import com.ruoyi.system.model.TCompany; import com.ruoyi.system.query.BigGiftPackageOrderQuery; import com.ruoyi.system.query.ProfitPageListQuery; import com.ruoyi.system.service.TBigGiftPackageOrderService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.service.TCommissionTransactionFlowService; import com.ruoyi.system.vo.ProfitPageListVo; import com.ruoyi.system.utils.ICBCPayUtil; import com.ruoyi.system.utils.OrderCodeGenerator; import com.ruoyi.system.vo.PlaceOrderVO; @@ -48,6 +57,9 @@ @Resource private TBigGiftPackageMapper bigGiftPackageMapper; @Resource private TCommissionTransactionFlowMapper commissionTransactionFlowMapper; @Autowired private ICBCPayUtil icbcPayUtil; @@ -108,6 +120,68 @@ } @Override public List<ProfitPageListVo> profitPageList(Page<ProfitPageListVo> page, ProfitPageListQuery query) { String sTime = null; String eTime = null; if(query.getCreateTime()!=null && !query.getCreateTime().isEmpty()){ String[] split = query.getCreateTime().split(" - "); sTime = split[0] + " 00:00:00"; eTime = split[1] + " 23:59:59"; } List<ProfitPageListVo> profitPageListVos = this.baseMapper.profitPageList(page, query, sTime, eTime); if(!profitPageListVos.isEmpty()){ List<Integer> orderIds = profitPageListVos.stream().map(ProfitPageListVo::getId).collect(Collectors.toList()); List<TCommissionTransactionFlow> tCommissionTransactionFlows = commissionTransactionFlowMapper.selectList(new LambdaQueryWrapper<TCommissionTransactionFlow>().in(TCommissionTransactionFlow::getOrderId, orderIds)); for (ProfitPageListVo profitPageListVo : profitPageListVos) { TCommissionTransactionFlow flow = tCommissionTransactionFlows.stream().filter(e -> e.getOrderId().equals(profitPageListVo.getId()) && e.getAppUserType()==2).findFirst().orElse( null); if(flow!=null){ profitPageListVo.setSaleProfit(flow.getCommissionAmount()); } TCommissionTransactionFlow flow1 = tCommissionTransactionFlows.stream().filter(e -> e.getOrderId().equals(profitPageListVo.getId()) && e.getAppUserType()==3).findFirst().orElse( null); if(flow1!=null){ profitPageListVo.setPartnerProfit(flow1.getCommissionAmount()); } } } return profitPageListVos; } @Override public List<ProfitPageListVo> profitPageListExport(ProfitPageListQuery query) { String sTime = null; String eTime = null; if(query.getCreateTime()!=null && !query.getCreateTime().isEmpty()){ String[] split = query.getCreateTime().split(" - "); sTime = split[0] + " 00:00:00"; eTime = split[1] + " 23:59:59"; } List<ProfitPageListVo> profitPageListVos = this.baseMapper.profitPageListExport(query, sTime, eTime); if(!profitPageListVos.isEmpty()){ List<Integer> orderIds = profitPageListVos.stream().map(ProfitPageListVo::getId).collect(Collectors.toList()); List<TCommissionTransactionFlow> tCommissionTransactionFlows = commissionTransactionFlowMapper.selectList(new LambdaQueryWrapper<TCommissionTransactionFlow>().in(TCommissionTransactionFlow::getOrderId, orderIds)); for (ProfitPageListVo profitPageListVo : profitPageListVos) { TCommissionTransactionFlow flow = tCommissionTransactionFlows.stream().filter(e -> e.getOrderId().equals(profitPageListVo.getId()) && e.getAppUserType()==2).findFirst().orElse( null); if(flow!=null){ profitPageListVo.setSaleProfit(flow.getCommissionAmount()); } TCommissionTransactionFlow flow1 = tCommissionTransactionFlows.stream().filter(e -> e.getOrderId().equals(profitPageListVo.getId()) && e.getAppUserType()==3).findFirst().orElse( null); if(flow1!=null){ profitPageListVo.setPartnerProfit(flow1.getCommissionAmount()); } } } return profitPageListVos; } @Override @Transactional(rollbackFor = Exception.class) public PlaceOrderVO placeOrder(BigGiftPlaceOrderDTO dto, Integer appUserId, String openid) { // 1. 校验商品是否存在 ruoyi-system/src/main/java/com/ruoyi/system/vo/ProfitPageListVo.java
New file @@ -0,0 +1,45 @@ package com.ruoyi.system.vo; import cn.afterturn.easypoi.excel.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; import java.time.LocalDateTime; @Data @ApiModel("收益明细Vo") public class ProfitPageListVo { @ApiModelProperty("订单id") private Integer id; @ApiModelProperty("订单编号") @Excel(name = "订单编号", orderNum = "1", width = 20) private String code; @ApiModelProperty("下单时间") @Excel(name = "下单时间", orderNum = "2", width = 20,format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; @ApiModelProperty("下单用户") @Excel(name = "下单用户", orderNum = "3", width = 20) private String userName; @ApiModelProperty("用户手机号") @Excel(name = "用户手机号", orderNum = "4", width = 20) private String phone; @ApiModelProperty("订单价格") @Excel(name = "订单价格", orderNum = "5", width = 20) private BigDecimal orderPrice; @ApiModelProperty("推广员收益") @Excel(name = "推广员收益", orderNum = "6", width = 20) private BigDecimal saleProfit=BigDecimal.ZERO; @ApiModelProperty("合伙人收益") @Excel(name = "合伙人收益", orderNum = "7", width = 20) private BigDecimal partnerProfit=BigDecimal.ZERO; } ruoyi-system/src/main/java/com/ruoyi/system/vo/PromotionPageListVo.java
New file @@ -0,0 +1,70 @@ package com.ruoyi.system.vo; import cn.afterturn.easypoi.excel.annotation.Excel; import com.ruoyi.common.core.domain.BasePage; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @Data @ApiModel(value = "推广记录列表Vo") public class PromotionPageListVo { @ApiModelProperty(value = "上级用户姓名") @Excel(name = "上级用户", width = 20) private String lastUserName; @ApiModelProperty(value = "上级用户电话") @Excel(name = "上级用户电话", width = 20) private String lastPhone; @ApiModelProperty(value = "上级用户角色 1=游客，2=营销员，3=合伙人") @Excel(name = "上级用户角色", width = 20, replace = {"游客_1", "营销员_2", "合伙人_3"}) private Integer lastRoleName; @ApiModelProperty(value = "上级用户头像") private String lastAvatar; @ApiModelProperty(value = "上级用户ID") private Integer lastUserId; @ApiModelProperty(value = "头像") @Excel(name = "头像", width = 20,imageType = 1,type = 2) private String avatar; @ApiModelProperty(value = "用户名") @Excel(name = "用户名", width = 20) private String userName; @ApiModelProperty(value = "用户ID") private Integer userId; @ApiModelProperty(value = "联系电话") @Excel(name = "联系电话", width = 20) private String phone; @ApiModelProperty(value = "当前角色 1=游客，2=营销员，3=合伙人") @Excel(name = "当前角色", width = 20, replace = {"游客_1", "营销员_2", "合伙人_3"}) private Integer roleName; @ApiModelProperty(value = "状态 1=正常，2=冻结") @Excel(name = "状态", width = 20, replace = {"使用中_1", "冻结_2"}) private Integer status; @ApiModelProperty(value = "合计消费") @Excel(name = "合计消费", width = 20) private BigDecimal totalConsume; @ApiModelProperty(value = "合计收益") @Excel(name = "合计收益", width = 20) private BigDecimal totalIncome; @ApiModelProperty(value = "已结算收益") @Excel(name = "已结算收益", width = 20) private BigDecimal totalSettledIncome; } ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -146,7 +146,10 @@ <select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult"> select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1 </select> <select id="checkCodeUnique" parameterType="String" resultMap="SysUserResult"> select user_id, phonenumber from sys_user where code = #{code} and del_flag = '0' limit 1 </select> <select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult"> select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1 </select> @@ -301,7 +304,7 @@ select * from sys_user where company_id = #{companyId} and del_flag = 0 </select> <insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId"> <insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId"> insert into sys_user( <if test="userId != null and userId != 0">user_id,</if> <if test="deptId != null and deptId != 0">dept_id,</if> ruoyi-system/src/main/resources/mapper/system/TAppUserMapper.xml
@@ -41,4 +41,48 @@ order by t1.create_time desc </select> <select id="promotionPageList" resultType="com.ruoyi.system.vo.PromotionPageListVo"> select t1.id userId,t1.name userName,t1.phone phone,t1.profile_photo avatar,t1.user_type roleName,t1.status status, t2.id lastUserId,t2.name lastUserName,t2.phone lastPhone,t2.profile_photo lastAvatar,t2.user_type lastRoleName from t_app_user t1 left join t_app_user t2 on t1.referrer_user_id =t2.id where t1.company_id = #{query.companyId} and t1.status !=3 <if test="query.userName != null and query.userName != ''"> and t1.name like concat('%',#{query.userName},'%') </if> <if test="query.phone != null and query.phone != ''"> and t1.phone like concat('%',#{query.phone},'%') </if> <if test="query.lastUserName != null and query.lastUserName != ''"> and t2.name like concat('%',#{query.lastUserName},'%') </if> <if test="query.lastPhone != null and query.lastPhone != ''"> and t2.phone like concat('%',#{query.lastPhone},'%') </if> order by t1.create_time desc </select> <select id="promotionPageListExport" resultType="com.ruoyi.system.vo.PromotionPageListVo"> select t1.id userId,t1.name userName,t1.phone phone,t1.profile_photo avatar,t1.user_type roleName,t1.status status, t2.id lastUserId,t2.name lastUserName,t2.phone lastPhone,t2.profile_photo lastAvatar,t2.user_type lastRoleName from t_app_user t1 left join t_app_user t2 on t1.referrer_user_id =t2.id where t1.company_id = #{query.companyId} and t1.status !=3 <if test="query.userName != null and query.userName != ''"> and t1.name like concat('%',#{query.userName},'%') </if> <if test="query.phone != null and query.phone != ''"> and t1.phone like concat('%',#{query.phone},'%') </if> <if test="query.lastUserName != null and query.lastUserName != ''"> and t2.name like concat('%',#{query.lastUserName},'%') </if> <if test="query.lastPhone != null and query.lastPhone != ''"> and t2.phone like concat('%',#{query.lastPhone},'%') </if> order by t1.create_time desc </select> </mapper> ruoyi-system/src/main/resources/mapper/system/TBigGiftPackageOrderMapper.xml
@@ -80,5 +80,41 @@ </if> order by t1.create_time desc </select> <select id="profitPageList" resultType="com.ruoyi.system.vo.ProfitPageListVo"> select t1.id,t1.code,t1.create_time,t2.name userName,t2.phone,t1.order_price from t_big_gift_package_order t1 left join t_app_user t2 on t1.app_user_id = t2.id where t1.del_flag = 0 and t1.company_id = #{query.companyId} <if test="query.phone != null and query.phone != ''"> AND t2.phone = #{query.phone} </if> <if test="query.code != null and query.code != ''"> AND t1.code = #{query.code} </if> <if test="query.userName != null and query.userName != ''"> AND t2.name like concat('%',#{query.userName},'%') </if> <if test="sTime !=null "> AND t1.create_time BETWEEN #{sTime} AND #{eTime} </if> order by t1.create_time desc </select> <select id="profitPageListExport" resultType="com.ruoyi.system.vo.ProfitPageListVo"> select t1.id,t1.code,t1.create_time,t2.name userName,t2.phone,t1.order_price from t_big_gift_package_order t1 left join t_app_user t2 on t1.app_user_id = t2.id where t1.del_flag = 0 and t1.company_id = #{query.companyId} <if test="query.phone != null and query.phone != ''"> AND t2.phone = #{query.phone} </if> <if test="query.code != null and query.code != ''"> AND t1.code = #{query.code} </if> <if test="query.userName != null and query.userName != ''"> AND t2.name like concat('%',#{query.userName},'%') </if> <if test="sTime !=null "> AND t1.create_time BETWEEN #{sTime} AND #{eTime} </if> order by t1.create_time desc </select> </mapper> ruoyi-system/src/main/resources/mapper/system/TRefundApplicationMapper.xml
@@ -23,7 +23,7 @@ <select id="pageRefundList" resultType="com.ruoyi.system.model.TBigGiftPackageOrder"> select t1.id,t2.code,t2.create_time,t3.name userName,t3.phone,t2.order_price,t4.name bigGiftPackageName,t2.payment_type,t2.deposit,t2.final_payment,t1.status auditStatus from t_refund_application t1 left join t_big_gift_package_order t2 on t1.big_gift_package_order_id = t2.id left join t_app_user t3 on t2.app_user_id = t3.id left join t_big_gift_package t4 on t2.big_gift_package_id = t4.id where 1=1 where t1.del_flag = 0 <if test="query.name != null and query.name != ''"> and t4.name like concat('%',#{query.name},'%') </if>
