From dbe4a36ba70197985391d7266b52b9e532797f83 Mon Sep 17 00:00:00 2001 From: huk Date: Thu, 18 Sep 2025 17:16:00 +0800 Subject: [PATCH] =?UTF-8?q?refactor(multiple=20files):=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=BC=9A=E5=91=98=E5=92=8C=E8=AE=A2=E5=8D=95=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在SmsAuthStrategy.java中移除了未使用的导入，并添加了获取会员绑定团长租户ID的逻辑。 - 在LoginUser.java中新增了`referenceTenantId`字段，用于存储所属团长的租户ID。 - 在MemberController.java中更新了Swagger注解，并调整了部分方法的注释。 - 在MemberMapper.java中新增了`getReferenceTenantIdBySpreadUid`方法，用于查询会员绑定团长的租户ID。- 在OrderBo.java中将`tenantId`字段设置为隐藏。- 在OrderController.java中更新了Swagger注解，并调整了部分方法的注释。 - 在OrderMapper.java和OrderMapper.xml中移除了不必要的租户ID过滤条件。 - 在OrderService.java和OrderServiceImpl.java中新增了分页查询当前商铺和团长绑定会员的订单列表的方法。 - 在ISysTenantService.java、SysReferenceBo.java、SysReferenceController.java、SysTenantMapper.java和SysTenantServiceImpl.java中更新了接口和实现，以支持新的查询参数。 --- .../web/service/impl/SmsAuthStrategy.java | 8 ++- .../common/core/domain/model/LoginUser.java | 5 ++ .../member/controller/MemberController.java | 43 +++++++------ .../soopin/member/mapper/MemberMapper.java | 15 ++++- .../order/controller/OrderController.java | 64 +++++++++++-------- .../wzj/soopin/order/domain/bo/OrderBo.java | 3 +- .../wzj/soopin/order/mapper/OrderMapper.java | 2 +- .../soopin/order/service/OrderService.java | 19 +++++- .../order/service/impl/OrderServiceImpl.java | 16 ++++- .../src/main/resources/mapper/OrderMapper.xml | 7 +- .../controller/SysReferenceController.java | 10 +-- .../system/domain/bo/SysReferenceBo.java | 7 +- .../domain/query/SysReferenceQuery.java | 41 ------------ .../system/mapper/SysTenantMapper.java | 8 +-- .../system/service/ISysTenantService.java | 3 +- .../service/impl/SysTenantServiceImpl.java | 3 +- 16 files changed, 137 insertions(+), 117 deletions(-) delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/query/SysReferenceQuery.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java index 0865368f6..fc11c8eb4 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java @@ -2,7 +2,6 @@ package org.dromara.web.service.impl; import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.StpUtil; -import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.wzj.soopin.member.domain.po.Member; @@ -26,7 +25,6 @@ import org.dromara.common.core.utils.ValidatorUtils; import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.redis.utils.RedisUtils; import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.system.domain.SysUser; import org.dromara.system.domain.vo.SysClientVo; import org.dromara.system.domain.vo.SysUserVo; @@ -34,7 +32,6 @@ import org.dromara.system.mapper.SysUserMapper; import org.dromara.web.domain.vo.LoginVo; import org.dromara.web.service.IAuthStrategy; import org.dromara.web.service.SysLoginService; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; /** @@ -52,6 +49,7 @@ public class SmsAuthStrategy implements IAuthStrategy { private final MemberMapper memberMapper; private final MemberRegisterService memberRegisterService; + @Override public LoginVo login(String body, SysClientVo client) { SmsLoginBody loginBody = JsonUtils.parseObject(body, SmsLoginBody.class); @@ -110,6 +108,10 @@ public class SmsAuthStrategy implements IAuthStrategy { user.setTenantId(sysUser.getTenantId()); } } + // 获取会员绑定团长的租户id + if(member.getSpreadUid() != null){ + user.setReferenceTenantId(memberMapper.getReferenceTenantIdBySpreadUid(member.getSpreadUid())); + } return user; } }else{ diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java index f6edeabd9..17ba1ca59 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java @@ -143,6 +143,11 @@ public class LoginUser implements Serializable { */ private String avatar; + /** + * 所属团长的租户Id + */ + private String referenceTenantId; + /** * 获取登录id diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberController.java index 918d3d578..8e5c82706 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberController.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberController.java @@ -11,6 +11,7 @@ import com.wzj.soopin.member.domain.vo.MemberDataStatisticsVO; import com.wzj.soopin.member.domain.vo.MemberVO; import com.wzj.soopin.member.domain.vo.ReferenceMemberVO; import com.wzj.soopin.member.service.IMemberService; +import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.domain.R; @@ -32,7 +33,7 @@ import java.util.Map; * @author zcc * @date 2022-11-28 */ -@Tag(name = "会员信息接口列表") +@Tag(name = "会员管理") @RequestMapping("/ums/member/") @RestController @Slf4j @@ -43,7 +44,10 @@ public class MemberController extends BaseController { private MemberConvert convert; - @Tag(name = "查询会员信息列表") + /** + * 查询会员信息列表 + */ + @Operation(summary = "查询会员信息列表") @SaCheckPermission("ums:member:list") @PostMapping("list") public R> list(@RequestBody MemberBO bo, @RequestBody Page page) { @@ -52,7 +56,10 @@ public class MemberController extends BaseController { return R.ok(convert.toVO(memberPage)); } - @Tag(name = "导出会员信息列表") + /** + * 导出会员信息列表 + */ + @Operation(summary = "导出会员信息列表") @Log(title = "会员信息", businessType = BusinessType.EXPORT) @PostMapping("export") public R export(MemberBO query) { @@ -61,13 +68,13 @@ public class MemberController extends BaseController { return R.ok(util.writeExcel(convert.toVO(list), "会员信息数据")); } - @Tag(name = "获取会员信息详细信息") + @Operation(summary = "获取会员信息详细信息") @GetMapping(value = "{id}") public R getInfo(@PathVariable("id") Long id) { return R.ok(service.getMemberInfo(id)); } - @Tag(name = "新增会员信息") + @Operation(summary = "新增会员信息") @SaCheckPermission("'ums:member:add") @Log(title = "会员信息", businessType = BusinessType.INSERT) @PostMapping("add") @@ -75,7 +82,7 @@ public class MemberController extends BaseController { return R.ok(service.save(convert.toPo(member))); } - @Tag(name = "修改会员信息") + @Operation(summary = "修改会员信息") @SaCheckPermission("ums:member:edit") @Log(title = "会员信息", businessType = BusinessType.UPDATE) @PostMapping("update") @@ -195,7 +202,7 @@ public class MemberController extends BaseController { } } - @Tag(name = "修改会员备注信息") + @Operation(summary = "修改会员备注信息") @SaCheckPermission("ums:member:edit") @Log(title = "会员备注信息", businessType = BusinessType.UPDATE) @PostMapping("mark/update") @@ -203,7 +210,7 @@ public class MemberController extends BaseController { return R.ok(service.updateMark(member)); } - @Tag(name = "删除会员信息") + @Operation(summary = "删除会员信息") @SaCheckPermission("ums:member:remove") @Log(title = "会员信息", businessType = BusinessType.DELETE) @DeleteMapping("{id}") @@ -211,20 +218,20 @@ public class MemberController extends BaseController { return R.ok(service.removeById(id)); } - @Tag(name = ("修改会员账户状态")) + @Operation(summary = "修改会员账户状态") @Log(title = "会员信息", businessType = BusinessType.UPDATE) @PostMapping("status/change") public R changeStatus(@RequestBody MemberBO memberBO) { return R.ok(service.changeStatus(memberBO)); } - @Tag(name = "会员手机号解密") + @Operation(summary = "会员手机号解密") @GetMapping("phone/decrypt/{phoneEncrypted}") public R getPhoneDecrypted(@PathVariable String phoneEncrypted) { return R.ok(service.getPhoneDecrypted(phoneEncrypted)); } - @Tag(name = "查看会员统计数据") + @Operation(summary = "查看会员统计数据") @GetMapping("view/statistics/{memberId}") public R viewStatistics(@PathVariable Long memberId) { // return ResponseEntity.ok(service.viewStatistics(memberId)); @@ -232,26 +239,24 @@ public class MemberController extends BaseController { } - @Tag(name ="获取登录会员的信息") + @Operation(summary = "获取登录会员的信息") @GetMapping(value = "login/info") + public R getLoinInfo() { return R.ok(service.getLoginMemberInfo()); } - @Tag(name ="同步会员的信息") + @Operation(summary = "同步会员的信息") @GetMapping(value = "sync") public R syncInfo() { service.syncInfo(); return R.ok(); } - /** - * 分页查询团长绑定的会员账户信息 - */ -// @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) 团长 - @GetMapping(value = "/getByReference") - public R> getByReference(ReferenceMemberQuery query) { + @Operation(summary = "分页查询团长绑定的会员账户信息") + @PostMapping(value = "/getByReference") + public R> getByReference(@RequestBody ReferenceMemberQuery query) { Page memberPage = service.getByReference(query); TableDataInfo.build(memberPage); return R.ok(memberPage); diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/MemberMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/MemberMapper.java index ddba05a28..ba4276500 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/MemberMapper.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/MemberMapper.java @@ -48,9 +48,9 @@ public interface MemberMapper extends BaseMapper { int countByUsername(@Param("username") String username); - @Select("SELECT * \n" + - "FROM li_member \n" + - "WHERE id = #{memberId} \n" + + @Select("SELECT * " + + "FROM li_member " + + "WHERE id = #{memberId} " + " AND expert = 1;") Member isExpert(String memberId); @@ -58,4 +58,13 @@ public interface MemberMapper extends BaseMapper { Object countMember(); IPage getMember(@Param("page") Page page, @Param("query") MemberBO query); + + @Select("SELECT " + + " su.tenant_id " + + "FROM " + + " ums_member um " + + " LEFT JOIN sys_user su ON um.user_id = su.user_id " + + " WHERE um.id = #{spreadUid} ") + String getReferenceTenantIdBySpreadUid(@Param("spreadUid") Long spreadUid); + } diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderController.java index 6a9f40a1b..9d4b3abcd 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderController.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderController.java @@ -1,14 +1,15 @@ package com.wzj.soopin.order.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fasterxml.jackson.databind.ObjectMapper; import com.wzj.soopin.order.convert.OrderConvert; import com.wzj.soopin.order.domain.bo.OrderBo; -import com.wzj.soopin.order.domain.bo.SaveOrderBO; import com.wzj.soopin.order.domain.entity.Order; -import com.wzj.soopin.order.domain.vo.*; -import com.wzj.soopin.order.service.OrderService; +import com.wzj.soopin.order.domain.vo.ManagerOrderDetailVO; +import com.wzj.soopin.order.domain.vo.OrderVO; import com.wzj.soopin.order.service.OrderItemService; +import com.wzj.soopin.order.service.OrderService; +import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -19,18 +20,17 @@ import org.dromara.common.log.enums.BusinessType; import org.dromara.common.redis.redis.RedisService; import org.dromara.common.redis.utils.RedisUtils; import org.dromara.common.web.core.BaseController; - import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; -import com.fasterxml.jackson.databind.ObjectMapper; /** - * 订单接口列表 + * 订单管理 * * @author zcc * @date 2022-12-01 */ +@Tag(name = "订单管理") @RestController @RequestMapping("/oms/order") @Slf4j @@ -47,19 +47,28 @@ public class OrderController extends BaseController { private final OrderItemService orderItemService; - @Tag(name ="查询订单列表") - @PostMapping("/list") - public R> list(@RequestBody OrderBo query, Page page){ - return R.ok(orderService.getlist(page,query)); + @Operation(summary = "分页查询当前商铺的订单列表") + @PostMapping("/merchant/list") + public R> merchantOrderList(@RequestBody OrderBo query){ + return R.ok(orderService.merchantOrderList(query)); } - @Tag(name ="修改收件人信息") + + @Operation(summary = "分页查询团长绑定会员的订单列表") + @PostMapping("/reference/list") + public R> referenceMemberOrderList(@RequestBody OrderBo query){ + return R.ok(orderService.referenceMemberOrderList(query)); + } + + + @Operation(summary = "修改收件人信息") @PostMapping("/receiver/update") public R updateReceiver(@RequestBody Order order) { return R.ok(orderService.updateById(order)); } - @Tag(name ="导出订单表列表") + + @Operation(summary = "导出订单表列表") @Log(title = "订单售后", businessType = BusinessType.EXPORT) @PostMapping("export") public R export(OrderBo query) { @@ -68,32 +77,32 @@ public class OrderController extends BaseController { return R.ok(util.writeExcel(convert.toVO(list), "订单列表数据")); } - /** - * 获取订单详细信息 - * @param id 订单id - * @return - */ + + @Operation(summary = "获取订单详细信息") @GetMapping(value = "/{id}") public R getInfo(@PathVariable("id") Long id) { return R.ok(orderService.selectById(id)); } - @Tag(name ="修改订单表") + + @Operation(summary = "修改订单表") @Log(title = "订单表", businessType = BusinessType.UPDATE) @PostMapping("/update") public R edit(@RequestBody Order order) { return R.ok(orderService.updateById(order)); } - @Tag(name ="删除订单表") + + @Operation(summary = "删除订单表") @Log(title = "订单表", businessType = BusinessType.DELETE) @DeleteMapping("/{id}") public R remove(@PathVariable Long id) { return R.ok(orderService.removeById(id)); } - @Tag(name ="添加备注") + + @Operation(summary = "添加备注") @Log(title = "订单表", businessType = BusinessType.UPDATE) @PostMapping("/merchantNote/add") public R saveMerchantNote(@RequestBody Order order){ @@ -101,19 +110,22 @@ public class OrderController extends BaseController { } - @Tag(name ="订单日志") + + @Operation(summary = "订单日志") @GetMapping("/log/{orderId}") public R log(@PathVariable Long orderId){ return R.ok (orderService.log(orderId)); } - @Tag(name ="订单解密") + + @Operation(summary = "订单解密") @GetMapping("/decryptPhone/{orderId}") public R decryptPhone(@PathVariable Long orderId){ return orderService.decryptPhone(orderId); } - @Tag(name = "手动触发缓存交易量最多商品") + + @Operation(summary = "手动触发缓存交易量最多商品") @PostMapping("/cacheTopTradingProducts") public R cacheTopTradingProducts(@RequestParam(defaultValue = "100") int limit) { try { @@ -125,7 +137,8 @@ public class OrderController extends BaseController { } } - @Tag(name = "获取缓存交易量最多商品") + + @Operation(summary = "获取缓存交易量最多商品") @GetMapping("/getTopTradingProducts") public R getTopTradingProducts(@RequestParam(required = false) String date) { try { @@ -151,4 +164,5 @@ public class OrderController extends BaseController { } + } diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/OrderBo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/OrderBo.java index a6eeee5a3..9c0a08d25 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/OrderBo.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/OrderBo.java @@ -19,7 +19,7 @@ public class OrderBo extends BaseBO { @Schema(description ="订单编号 精确匹配") private String orderSn; - @Schema(description ="租户id 精确匹配") + @Schema(description ="租户id 精确匹配", hidden = true) private String tenantId; @Schema(description ="用户帐号 精确匹配") @@ -93,6 +93,7 @@ public class OrderBo extends BaseBO { @Schema(description = "买家手机号") private String memberPhoneEncrypted; + public LambdaQueryWrapper toWrapper() { return new LambdaQueryWrapper() .eq(memberId != null, Order::getMemberId, memberId) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/OrderMapper.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/OrderMapper.java index 080b135e5..60139d0c3 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/OrderMapper.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/mapper/OrderMapper.java @@ -35,7 +35,7 @@ public interface OrderMapper extends BaseMapper { List selectManagerOrderPage(ManagerOrderQueryForm request); - IPage getlist(@Param("page") Page page,@Param("query") OrderBo query,@Param("tenantId") String tenantId); + IPage getlist(@Param("page") Page page,@Param("query") OrderBo query); @Select("SELECT " + "COUNT(*) AS count1, " + diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/OrderService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/OrderService.java index 00da46abb..47e5810ff 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/OrderService.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/OrderService.java @@ -1,7 +1,6 @@ package com.wzj.soopin.order.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.wzj.soopin.order.domain.bo.OrderBo; import com.wzj.soopin.order.domain.bo.RefundBO; @@ -25,7 +24,21 @@ public interface OrderService extends IService { R decryptPhone(Long orderId); - IPage getlist(Page page, OrderBo query); + /** + * 分页查询当前商铺的订单列表 + * @param page + * @param query + * @return + */ + IPage merchantOrderList(OrderBo query); + + /** + * 分页查询当前团长绑定的会员的订单列表 + * @param page + * @param query + * @return + */ + IPage referenceMemberOrderList(OrderBo query); Order getByNo(String orderNo); @@ -34,4 +47,6 @@ public interface OrderService extends IService { void cancel(Long orderId); void refund(RefundBO refundBO); + + } diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderServiceImpl.java index 20adcbef5..06152f123 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderServiceImpl.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.date.DatePattern; import cn.hutool.core.lang.Assert; import cn.hutool.core.text.StrBuilder; import cn.hutool.core.util.RandomUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -231,7 +232,7 @@ public class OrderServiceImpl extends ServiceImpl implements .memberId(loginUser.getUserId()) .memberUsername(loginUser.getUsername()) .totalAmount(totalAmount) - .tenantId(loginUser.getTenantId()) + .tenantId(loginUser.getReferenceTenantId()) .orderSn(generateOrderSn()) .type(saveOrderBO.getType()) .payType(Constants.PayType.NO_PAY) @@ -249,6 +250,7 @@ public class OrderServiceImpl extends ServiceImpl implements .pic(sku.getPic()) .salePrice(sku.getPrice()) .quantity(map.get(sku.getId())) + .tenantId(sku.getTenantId()) .build(); }).toList(); orderItemMapper.insert(orderItemList); @@ -406,9 +408,17 @@ public class OrderServiceImpl extends ServiceImpl implements } @Override - public IPage getlist(Page page, OrderBo query) { + public IPage merchantOrderList(OrderBo query) { + return null; + } - IPage resultPage = orderMapper.getlist(page, query, TenantHelper.getTenantId()); + @Override + public IPage referenceMemberOrderList(OrderBo query) { + Assert.isTrue(query.getCurrent() != null && query.getSize() != null, "分页参数不能为空"); + if(StrUtil.isBlank(query.getTenantId())){ + query.setTenantId(TenantHelper.getTenantId()); + } + IPage resultPage = TenantHelper.ignore(() -> orderMapper.getlist(Page.of(query.getCurrent(), query.getSize()), query)); List orderVOList = resultPage.getRecords(); if (orderVOList.isEmpty()) { return resultPage; diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/OrderMapper.xml b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/OrderMapper.xml index 60e2f1857..8aa54006f 100644 --- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/OrderMapper.xml +++ b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/OrderMapper.xml @@ -268,10 +268,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" o.aftersale, o.create_time, o.payment_time, - o.delivery_time, o.receive_time, - o.receiver_name, - o.receiver_phone, o.receiver_province, o.receiver_city, o.receiver_district, @@ -292,8 +289,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN oms_order_item oi ON o.id = oi.order_id LEFT JOIN pms_product pp ON oi.product_id = pp.id AND pp.publish_status = 1 - - AND o.tenant_id LIKE CONCAT('%', #{tenantId}, '%') + + AND o.tenant_id = #{query.tenantId} AND o.order_sn LIKE CONCAT('%', #{query.orderSn}, '%') diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysReferenceController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysReferenceController.java index e61dc63b4..4d2727b46 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysReferenceController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysReferenceController.java @@ -12,12 +12,14 @@ import org.dromara.common.log.enums.BusinessType; import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysReferenceBo; -import org.dromara.system.domain.query.SysReferenceQuery; import org.dromara.system.domain.vo.SysReferenceVO; import org.dromara.system.service.ISysTenantService; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** @@ -79,8 +81,8 @@ public class SysReferenceController extends BaseController { // TenantConstants.TENANT_ADMIN_ROLE_KEY // }, mode = SaMode.OR) // @SaCheckPermission("system:tenant:list") - @GetMapping("/list") - public R> list(SysReferenceQuery query){ + @PostMapping("/list") + public R> list(@RequestBody SysReferenceBo query){ return R.ok(tenantService.getReferenceList(query)); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysReferenceBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysReferenceBo.java index 8dc00e02a..55559a1a0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysReferenceBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysReferenceBo.java @@ -7,6 +7,8 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.common.core.domain.BaseBO; +import org.dromara.system.domain.SysTenant; import java.time.LocalDateTime; @@ -17,7 +19,7 @@ import java.time.LocalDateTime; @AllArgsConstructor @NoArgsConstructor @Data -public class SysReferenceBo { +public class SysReferenceBo extends BaseBO { @Schema(description = "主键, 修改必填") private Long id; @@ -25,6 +27,9 @@ public class SysReferenceBo { @Schema(description = "租户编号, 修改必填") private String tenantId; + @Schema(description = "所属代理商id", hidden = true) + private Long oneParentId; + @Schema(description = "团长姓名") @NotBlank(message = "团长姓名不能为空") private String personName; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/query/SysReferenceQuery.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/query/SysReferenceQuery.java deleted file mode 100644 index 7e657e635..000000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/query/SysReferenceQuery.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.dromara.system.domain.query; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.dromara.common.core.domain.BaseBO; -import org.dromara.system.domain.SysTenant; - -/** - * 达人类型租户接口请求对象 - */ -@Builder -@AllArgsConstructor -@NoArgsConstructor -@Data -public class SysReferenceQuery extends BaseBO { - - /** - * 所属代理商 - */ - @Schema(description = "所属代理商id", hidden = true) - private Long oneParentId; - - /** - * 团长姓名 - */ - private String personName; - - /** - * 团长手机号 - */ - private String personPhone; - - /** - * 租户状态（0正常 1停用） - */ - private String status; -} - diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java index 30d2fd0d4..3859c5d4a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java @@ -3,16 +3,14 @@ package org.dromara.system.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.*; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.system.domain.SysTenant; +import org.dromara.system.domain.bo.SysReferenceBo; import org.dromara.system.domain.bo.SysTenantBo; import org.dromara.system.domain.bo.SysTenantExtendBo; import org.dromara.system.domain.dto.TenantDTO; -import org.dromara.system.domain.query.SysReferenceQuery; import org.dromara.system.domain.vo.SysReferenceVO; import org.dromara.system.domain.vo.SysTenantVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import java.util.List; import java.util.Map; @@ -111,5 +109,5 @@ public interface SysTenantMapper extends BaseMapperPlus " AND sys_dept.del_flag = '0'") SysTenant queryByDeptId(@Param("deptId") Long deptId); - IPage getReferenceList(@Param("page")Page page, @Param("query")SysReferenceQuery query); + IPage getReferenceList(@Param("page")Page page, @Param("query") SysReferenceBo query); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantService.java index 881d4ce85..c112352bf 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantService.java @@ -10,7 +10,6 @@ import org.dromara.system.domain.bo.SysTenantBo; import org.dromara.system.domain.bo.SysTenantExtendBo; import org.dromara.system.domain.bo.SysTenantReviewBo; import org.dromara.system.domain.dto.TenantDTO; -import org.dromara.system.domain.query.SysReferenceQuery; import org.dromara.system.domain.vo.SysReferenceVO; import org.dromara.system.domain.vo.SysTenantVo; @@ -146,5 +145,5 @@ public interface ISysTenantService { * @param query * @return */ - IPage getReferenceList(SysReferenceQuery query); + IPage getReferenceList(SysReferenceBo query); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java index 923f482f8..0d1a433cd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java @@ -39,7 +39,6 @@ import org.dromara.system.domain.bo.SysTenantBo; import org.dromara.system.domain.bo.SysTenantExtendBo; import org.dromara.system.domain.bo.SysTenantReviewBo; import org.dromara.system.domain.dto.TenantDTO; -import org.dromara.system.domain.query.SysReferenceQuery; import org.dromara.system.domain.vo.SysReferenceVO; import org.dromara.system.domain.vo.SysTenantVo; import org.dromara.system.mapper.*; @@ -842,7 +841,7 @@ public class SysTenantServiceImpl implements ISysTenantService { } @Override - public IPage getReferenceList(SysReferenceQuery query) { + public IPage getReferenceList(SysReferenceBo query) { SysTenantVo sysTenantVo = queryByTenantId(TenantHelper.getTenantId()); query.setOneParentId(sysTenantVo.getId()); IPage resultPage = baseMapper.getReferenceList(Page.of(query.getCurrent(), query.getSize()),query);