From 151d75c1237cc9faf4df295239eed71525fdbb8f Mon Sep 17 00:00:00 2001 From: 13233904609 <13233904609@163.cm> Date: Thu, 1 Aug 2024 10:31:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8A=BD=E5=A5=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/file/AppFileController.java | 24 + .../module/trade/api/order/TradeOrderApi.java | 8 + .../trade/api/order/TradeOrderApiImpl.java | 5 + .../app/cart/AppCartController.java | 67 +++ .../app/order/AppTradeOrderController.java | 64 +++ .../dal/mysql/order/TradeOrderMapper.java | 18 + .../order/TradeOrderUpdateService.java | 8 +- .../order/TradeOrderUpdateServiceImpl.java | 6 + .../DistributionConfigApi.java | 18 + .../vo/DistributionConfigRespDTO.java | 33 ++ .../DistributionConfigApiImpl.java | 49 ++ .../vo/DistributionConfigPageReqVO.java | 11 + .../vo/DistributionConfigRespVO.java | 11 + .../vo/DistributionConfigSaveReqVO.java | 11 + .../DistributionConfigDO.java | 8 + .../DistributionMebConfigDO.java | 4 + .../service/user/MemberUserServiceImpl.java | 7 + .../yudao-module-pay-biz/pom.xml | 10 + .../service/order/PayOrderServiceImpl.java | 23 + .../src/main/resources/application-dev.yaml | 124 ++++- .../src/main/resources/application-local.yaml | 29 +- .../src/main/resources/application.yaml | 3 +- yudao-ui-admin-vue3-master/.env.dev | 10 +- .../components/UserInfo/src/UserInfo.vue | 4 +- .../src/locales/zh-CN.ts | 4 +- .../src/views/Home/Index.vue | 478 ++++-------------- .../src/views/Login/components/LoginForm.vue | 20 +- .../DistributionConfigForm.vue | 10 + .../components/DistributionMebConfigForm.vue | 7 + 29 files changed, 639 insertions(+), 435 deletions(-) create mode 100644 ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/distributionconfig/DistributionConfigApi.java create mode 100644 ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/distributionconfig/vo/DistributionConfigRespDTO.java create mode 100644 ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/distributionconfig/DistributionConfigApiImpl.java diff --git a/ruoyi-vue-pro-master/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/app/file/AppFileController.java b/ruoyi-vue-pro-master/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/app/file/AppFileController.java index e783814..ae2a154 100644 --- a/ruoyi-vue-pro-master/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/app/file/AppFileController.java +++ b/ruoyi-vue-pro-master/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/app/file/AppFileController.java @@ -4,14 +4,20 @@ import cn.hutool.core.codec.Base64; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IoUtil; import cn.hutool.core.lang.UUID; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpUtil; import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.util.qccode.Base64Util; import cn.iocoder.yudao.framework.common.util.qccode.QRCodeUtil; import cn.iocoder.yudao.framework.common.util.qccode.vo.QRCodeConfig; +import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; import cn.iocoder.yudao.module.infra.controller.app.file.vo.AppFileUploadReqVO; import cn.iocoder.yudao.module.infra.service.file.FileService; +import cn.iocoder.yudao.module.member.api.level.MemberLevelApi; +import cn.iocoder.yudao.module.member.api.level.dto.MemberLevelRespDTO; +import cn.iocoder.yudao.module.member.api.user.MemberUserApi; +import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO; import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO; import cn.iocoder.yudao.module.system.service.dict.DictDataService; import io.swagger.v3.oas.annotations.Operation; @@ -30,6 +36,7 @@ import javax.validation.Valid; import java.io.*; import java.util.List; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.error; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; @@ -46,6 +53,12 @@ public class AppFileController { @Resource private DictDataService dictDataService; + @Resource + private MemberUserApi memberUserApi; + + @Resource + private MemberLevelApi memberLevelApi; + @PostMapping("/upload") @Operation(summary = "上传文件") public CommonResult uploadFile(AppFileUploadReqVO uploadReqVO) throws Exception { @@ -87,6 +100,17 @@ public class AppFileController { @RequestMapping("/qrCode64") @Operation(summary = "生成二维码64") public CommonResult qrCode64(@Valid String type) { + //查询会员当前等级 + MemberUserRespDTO user = memberUserApi.getUser(WebFrameworkUtils.getLoginUserId()); +// MemberLevelRespDTO user = memberLevelApi.getMemberLevel(); + if(ObjectUtil.isEmpty(user.getLevelId())){ + return error(1_013_018_010,"无权推广"); + }else{ + MemberLevelRespDTO memberLevelDO1 = memberLevelApi.getMemberLevel(user.getLevelId()); + if(ObjectUtil.isEmpty(memberLevelDO1)){ + return error(1_013_018_010,"无权推广"); + } + } try { ByteArrayOutputStream out = new ByteArrayOutputStream(); // 假设QRCodeUtil.createQrCode是一个正确实现的方法，用于生成二维码并写入到ByteArrayOutputStream中 diff --git a/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApi.java b/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApi.java index 744a7b8..da4ab22 100644 --- a/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApi.java +++ b/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApi.java @@ -37,4 +37,12 @@ public interface TradeOrderApi { */ void cancelPaidOrder(Long userId, Long orderId); + // TODO 芋艿：需要优化下； + /** + * 根据商品编号查询商品购买次数 + * + * @param spuId 用户编号 + */ + Integer getOrderCountBySpuId(Long spuId); + } diff --git a/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java b/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java index 3cb7bba..64c749b 100644 --- a/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java +++ b/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java @@ -40,4 +40,9 @@ public class TradeOrderApiImpl implements TradeOrderApi { tradeOrderUpdateService.cancelPaidOrder(userId, orderId); } + @Override + public Integer getOrderCountBySpuId(Long spuId) { + return tradeOrderUpdateService.getOrderCountBySpuId(spuId); + } + } diff --git a/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/AppCartController.java b/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/AppCartController.java index 2c9d77b..80aa96c 100644 --- a/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/AppCartController.java +++ b/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/AppCartController.java @@ -1,9 +1,24 @@ package cn.iocoder.yudao.module.trade.controller.app.cart; +import cn.hutool.core.util.ObjectUtil; import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated; +import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; +import cn.iocoder.yudao.module.member.api.distributionconfig.DistributionConfigApi; +import cn.iocoder.yudao.module.member.api.distributionconfig.vo.DistributionConfigRespDTO; +import cn.iocoder.yudao.module.member.api.level.MemberLevelApi; +import cn.iocoder.yudao.module.member.api.level.dto.MemberLevelRespDTO; +import cn.iocoder.yudao.module.member.api.user.MemberUserApi; +import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO; +import cn.iocoder.yudao.module.product.api.sku.ProductSkuApi; +import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuRespDTO; +import cn.iocoder.yudao.module.product.api.spu.ProductSpuApi; +import cn.iocoder.yudao.module.product.api.spu.dto.ProductSpuRespDTO; import cn.iocoder.yudao.module.trade.controller.app.cart.vo.*; +import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderSettlementReqVO; import cn.iocoder.yudao.module.trade.service.cart.CartService; +import cn.iocoder.yudao.module.trade.service.order.TradeOrderUpdateService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -16,6 +31,7 @@ import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.error; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; @@ -30,10 +46,61 @@ public class AppCartController { @Resource private CartService cartService; + @Resource + private DistributionConfigApi distributionConfigApi; + + @Resource + private ProductSpuApi productSpuApi; + @Resource + private ProductSkuApi productSkuApi; + + @Resource + private MemberLevelApi memberLevelApi; + + @Resource + private MemberUserApi memberUserApi; + + @Resource + private TradeOrderUpdateService tradeOrderUpdateService; + @PostMapping("/add") @Operation(summary = "添加购物车商品") @PreAuthenticated public CommonResult addCart(@Valid @RequestBody AppCartAddReqVO addCountReqVO) { + //获取用户id + Long loginUserId = WebFrameworkUtils.getLoginUserId(); + //判断商品是否需要会员等级 + //判断订单是否已支付 + //根据商品id查询配置规则 + if(ObjectUtil.isNotEmpty(addCountReqVO.getSkuId())){ + //获取商品spuId + ProductSkuRespDTO sku = productSkuApi.getSku(addCountReqVO.getSkuId()); + if(ObjectUtil.isNotEmpty(sku)){ + ProductSpuRespDTO spu = productSpuApi.getSpu(sku.getSpuId()); + if(ObjectUtil.isNotEmpty(spu)){ + List distributionConfigDOS = distributionConfigApi.distributionConfigDOS(sku.getSpuId()); + if(ObjectUtil.isNotEmpty(distributionConfigDOS)){ + DistributionConfigRespDTO distributionConfigDO = distributionConfigDOS.get(0); + if(ObjectUtil.isNotEmpty(distributionConfigDO.getBuyerLevelId())){ + //查询会员当前等级 + MemberLevelRespDTO memberLevelDO = memberLevelApi.getMemberLevel(distributionConfigDO.getBuyerLevelId()); + //查询会员当前等级 + MemberUserRespDTO user = memberUserApi.getUser(loginUserId); + MemberLevelRespDTO memberLevelDO1 = memberLevelApi.getMemberLevel(user.getLevelId()); + if(memberLevelDO.getLevel()>memberLevelDO1.getLevel()){ + return error(1_013_018_008,"商品"+spu.getName()+"购买需要升级至会员等级"+memberLevelDO.getName()); + } + Integer orderCountBySpuId = tradeOrderUpdateService.getOrderCountBySpuId(sku.getSpuId()); + if(ObjectUtil.isNotEmpty(distributionConfigDO.getPurchaseNum())){ + if(orderCountBySpuId>=distributionConfigDO.getPurchaseNum()){ + return error(1_013_018_009,"商品"+spu.getName()+"购买已达上限"); + } + } + } + } + } + } + } return success(cartService.addCart(getLoginUserId(), addCountReqVO)); } diff --git a/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java b/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java index 6c8b745..48def81 100644 --- a/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java +++ b/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java @@ -1,11 +1,25 @@ package cn.iocoder.yudao.module.trade.controller.app.order; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.security.core.LoginUser; import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated; +import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; +import cn.iocoder.yudao.module.member.api.distributionconfig.DistributionConfigApi; +import cn.iocoder.yudao.module.member.api.distributionconfig.vo.DistributionConfigRespDTO; +import cn.iocoder.yudao.module.member.api.level.MemberLevelApi; +import cn.iocoder.yudao.module.member.api.level.dto.MemberLevelRespDTO; import cn.iocoder.yudao.module.member.api.user.MemberUserApi; +import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO; import cn.iocoder.yudao.module.pay.api.notify.dto.PayOrderNotifyReqDTO; +import cn.iocoder.yudao.module.pay.enums.order.PayOrderStatusEnum; +import cn.iocoder.yudao.module.product.api.sku.ProductSkuApi; +import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuRespDTO; +import cn.iocoder.yudao.module.product.api.spu.ProductSpuApi; +import cn.iocoder.yudao.module.product.api.spu.dto.ProductSpuRespDTO; import cn.iocoder.yudao.module.trade.controller.app.order.vo.*; import cn.iocoder.yudao.module.trade.controller.app.order.vo.item.AppTradeOrderItemCommentCreateReqVO; import cn.iocoder.yudao.module.trade.controller.app.order.vo.item.AppTradeOrderItemRespVO; @@ -33,10 +47,13 @@ import javax.validation.Valid; import java.util.List; import java.util.Map; +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.error; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser; import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; +import static cn.iocoder.yudao.module.pay.enums.ErrorCodeConstants.PAY_ORDER_EXTENSION_STATUS_IS_NOT_WAITING; @Tag(name = "用户 App - 交易订单") @RestController @@ -61,10 +78,57 @@ public class AppTradeOrderController { @Resource private MemberUserApi memberUserApi; + @Resource + private DistributionConfigApi distributionConfigApi; + + @Resource + private ProductSpuApi productSpuApi; + @Resource + private ProductSkuApi productSkuApi; + + @Resource + private MemberLevelApi memberLevelApi; + @GetMapping("/settlement") @Operation(summary = "获得订单结算信息") @PreAuthenticated public CommonResult settlementOrder(@Valid AppTradeOrderSettlementReqVO settlementReqVO) { + //获取用户id + Long loginUserId = WebFrameworkUtils.getLoginUserId(); + //判断商品是否需要会员等级 + //判断订单是否已支付 + //根据商品id查询配置规则 + if(ObjectUtil.isNotEmpty(settlementReqVO.getItems())){ + for (AppTradeOrderSettlementReqVO.Item item :settlementReqVO.getItems()) { + //获取商品spuId + ProductSkuRespDTO sku = productSkuApi.getSku(item.getSkuId()); + if(ObjectUtil.isNotEmpty(sku)){ + ProductSpuRespDTO spu = productSpuApi.getSpu(sku.getSpuId()); + if(ObjectUtil.isNotEmpty(spu)){ + List distributionConfigDOS = distributionConfigApi.distributionConfigDOS(sku.getSpuId()); + if(ObjectUtil.isNotEmpty(distributionConfigDOS)){ + DistributionConfigRespDTO distributionConfigDO = distributionConfigDOS.get(0); + if(ObjectUtil.isNotEmpty(distributionConfigDO.getBuyerLevelId())){ + //查询会员当前等级 + MemberLevelRespDTO memberLevelDO = memberLevelApi.getMemberLevel(distributionConfigDO.getBuyerLevelId()); + //查询会员当前等级 + MemberUserRespDTO user = memberUserApi.getUser(loginUserId); + MemberLevelRespDTO memberLevelDO1 = memberLevelApi.getMemberLevel(user.getLevelId()); + if(memberLevelDO.getLevel()>memberLevelDO1.getLevel()){ + return error(1_013_018_008,"商品"+spu.getName()+"购买需要升级至会员等级"+memberLevelDO.getName()); + } + Integer orderCountBySpuId = tradeOrderUpdateService.getOrderCountBySpuId(sku.getSpuId()); + if(ObjectUtil.isNotEmpty(distributionConfigDO.getPurchaseNum())){ + if(orderCountBySpuId>=distributionConfigDO.getPurchaseNum()){ + return error(1_013_018_009,"商品"+spu.getName()+"购买已达上限"); + } + } + } + } + } + } + } + } return success(tradeOrderUpdateService.settlementOrder(getLoginUserId(), settlementReqVO)); } diff --git a/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java b/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java index f5848ec..5e01fe7 100644 --- a/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java +++ b/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java @@ -9,6 +9,8 @@ import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderPageRe import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.time.LocalDateTime; import java.util.List; @@ -127,4 +129,20 @@ public interface TradeOrderMapper extends BaseMapperX { default String getPickUpVerifyCode(String id){ return selectOne(TradeOrderDO::getId, id).getPickUpVerifyCode(); }; + + /** + * 根据商品编号查询商品购买次数 + * + * @param spuId 用户编号 + */ + @Select("SELECT\n" + + "\tcount( 1 ) \n" + + "FROM\n" + + "\ttrade_order o\n" + + "\tLEFT JOIN trade_order_item t ON o.id = t.order_id \n" + + "WHERE\n" + + "\to.pay_status = 1 \n" + + "\tAND t.spu_id = #{spuId} \n" + + "\tAND t.user_id = #{userId}") + Integer getOrderCountBySpuId(@Param("spuId") Long spuId, @Param("userId") Long userId); } diff --git a/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateService.java b/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateService.java index fb27cf7..a6de386 100644 --- a/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateService.java +++ b/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateService.java @@ -1,6 +1,5 @@ package cn.iocoder.yudao.module.trade.service.order; -import cn.iocoder.yudao.framework.common.enums.TerminalEnum; import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderDeliveryReqVO; import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderRemarkReqVO; import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderUpdateAddressReqVO; @@ -197,4 +196,11 @@ public interface TradeOrderUpdateService { */ void cancelPaidOrder(Long userId, Long orderId); + /** + * 根据商品编号查询商品购买次数 + * + * @param spuId 用户编号 + */ + Integer getOrderCountBySpuId(Long spuId); + } diff --git a/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java b/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java index 30f4f79..1952832 100644 --- a/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java +++ b/ruoyi-vue-pro-master/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java @@ -11,6 +11,7 @@ import cn.iocoder.yudao.framework.common.core.KeyValue; import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; import cn.iocoder.yudao.framework.common.util.json.JsonUtils; import cn.iocoder.yudao.framework.common.util.number.MoneyUtils; +import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; import cn.iocoder.yudao.module.member.api.address.MemberAddressApi; import cn.iocoder.yudao.module.member.api.address.dto.MemberAddressRespDTO; import cn.iocoder.yudao.module.pay.api.order.PayOrderApi; @@ -857,6 +858,11 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService { cancelOrder0(order, TradeOrderCancelTypeEnum.MEMBER_CANCEL); } + @Override + public Integer getOrderCountBySpuId(Long spuId) { + return tradeOrderMapper.getOrderCountBySpuId(spuId, WebFrameworkUtils.getLoginUserId()); + } + /** * 创建单个订单的评论 * diff --git a/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/distributionconfig/DistributionConfigApi.java b/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/distributionconfig/DistributionConfigApi.java new file mode 100644 index 0000000..b6fcd89 --- /dev/null +++ b/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/distributionconfig/DistributionConfigApi.java @@ -0,0 +1,18 @@ +package cn.iocoder.yudao.module.member.api.distributionconfig; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.member.api.distributionconfig.vo.DistributionConfigRespDTO; + +import javax.validation.Valid; +import java.util.List; + +/** + * 分销配置 Service 接口 + * + * @author 芋道源码 + */ +public interface DistributionConfigApi { + + List distributionConfigDOS(Long spuId); + +} diff --git a/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/distributionconfig/vo/DistributionConfigRespDTO.java b/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/distributionconfig/vo/DistributionConfigRespDTO.java new file mode 100644 index 0000000..f6add33 --- /dev/null +++ b/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/distributionconfig/vo/DistributionConfigRespDTO.java @@ -0,0 +1,33 @@ +package cn.iocoder.yudao.module.member.api.distributionconfig.vo; + +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +public class DistributionConfigRespDTO { + + private Long id; + + private Long productId; + + private Long levelId; + + private String status; + + private LocalDateTime createTime; + + private String levelName; + + private String supName; + + /** + * 购买人等级 + */ + private Long buyerLevelId; + /** + * 限购次数 + */ + private Integer purchaseNum; + +} diff --git a/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/distributionconfig/DistributionConfigApiImpl.java b/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/distributionconfig/DistributionConfigApiImpl.java new file mode 100644 index 0000000..32a3bcd --- /dev/null +++ b/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/distributionconfig/DistributionConfigApiImpl.java @@ -0,0 +1,49 @@ +package cn.iocoder.yudao.module.member.api.distributionconfig; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.member.api.distributionconfig.vo.DistributionConfigRespDTO; +import cn.iocoder.yudao.module.member.controller.admin.distributionconfig.vo.DistributionConfigPageReqVO; +import cn.iocoder.yudao.module.member.controller.admin.distributionconfig.vo.DistributionConfigRespVO; +import cn.iocoder.yudao.module.member.controller.admin.distributionconfig.vo.DistributionConfigSaveReqVO; +import cn.iocoder.yudao.module.member.convert.user.MemberUserConvert; +import cn.iocoder.yudao.module.member.dal.dataobject.distributionconfig.DistributionConfigDO; +import cn.iocoder.yudao.module.member.dal.dataobject.distributionconfig.DistributionMebConfigDO; +import cn.iocoder.yudao.module.member.dal.mysql.distributionconfig.DistributionConfigMapper; +import cn.iocoder.yudao.module.member.dal.mysql.distributionconfig.DistributionMebConfigMapper; +import cn.iocoder.yudao.module.member.service.distributionconfig.DistributionConfigService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.validation.annotation.Validated; + +import javax.annotation.Resource; +import java.util.List; + +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.DISTRIBUTION_CONFIG_NOT_EXISTS; + +/** + * 分销配置 Service 实现类 + * + * @author 芋道源码 + */ +@Service +@Validated +public class DistributionConfigApiImpl implements DistributionConfigApi { + + @Resource + private DistributionConfigMapper distributionConfigMapper; + @Resource + private DistributionMebConfigMapper distributionMebConfigMapper; + + @Override + public List distributionConfigDOS(Long spuId) { + List distributionConfigDOS = distributionConfigMapper.selectList(new LambdaQueryWrapperX() + .eq(DistributionConfigDO::getProductId, spuId) + .eq(DistributionConfigDO::getDeleted, 0) + .eq(DistributionConfigDO::getStatus, 0) + .orderByDesc(DistributionConfigDO::getCreateTime)); + return BeanUtils.toBean(distributionConfigDOS, DistributionConfigRespDTO.class); + } +} diff --git a/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/distributionconfig/vo/DistributionConfigPageReqVO.java b/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/distributionconfig/vo/DistributionConfigPageReqVO.java index 9ffa72f..f059762 100644 --- a/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/distributionconfig/vo/DistributionConfigPageReqVO.java +++ b/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/distributionconfig/vo/DistributionConfigPageReqVO.java @@ -27,4 +27,15 @@ public class DistributionConfigPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; + /** + * 购买人等级 + */ + @Schema(description = "购买人等级") + private Long buyerLevelId; + /** + * 限购次数 + */ + @Schema(description = "限购次数", example = "1") + private Integer purchaseNum; + } diff --git a/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/distributionconfig/vo/DistributionConfigRespVO.java b/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/distributionconfig/vo/DistributionConfigRespVO.java index 541f6db..4ab7ea3 100644 --- a/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/distributionconfig/vo/DistributionConfigRespVO.java +++ b/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/distributionconfig/vo/DistributionConfigRespVO.java @@ -40,4 +40,15 @@ public class DistributionConfigRespVO { @ExcelProperty("商品名称") private String supName; + /** + * 购买人等级 + */ + @Schema(description = "购买人等级") + private Long buyerLevelId; + /** + * 限购次数 + */ + @Schema(description = "限购次数", example = "1") + private Integer purchaseNum; + } diff --git a/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/distributionconfig/vo/DistributionConfigSaveReqVO.java b/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/distributionconfig/vo/DistributionConfigSaveReqVO.java index 2d424d9..558757f 100644 --- a/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/distributionconfig/vo/DistributionConfigSaveReqVO.java +++ b/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/distributionconfig/vo/DistributionConfigSaveReqVO.java @@ -25,4 +25,15 @@ public class DistributionConfigSaveReqVO { @Schema(description = "分销配置关联会员等级列表") private List distributionMebConfigs; + /** + * 购买人等级 + */ + @Schema(description = "购买人等级") + private Long buyerLevelId; + /** + * 限购次数 + */ + @Schema(description = "限购次数", example = "1") + private Integer purchaseNum; + } diff --git a/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/distributionconfig/DistributionConfigDO.java b/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/distributionconfig/DistributionConfigDO.java index fe8710e..d1e0068 100644 --- a/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/distributionconfig/DistributionConfigDO.java +++ b/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/distributionconfig/DistributionConfigDO.java @@ -39,5 +39,13 @@ public class DistributionConfigDO extends BaseDO { * 购买人提升会员等级 */ private Long levelId; + /** + * 购买人等级 + */ + private Long buyerLevelId; + /** + * 限购次数 + */ + private Integer purchaseNum; } diff --git a/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/distributionconfig/DistributionMebConfigDO.java b/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/distributionconfig/DistributionMebConfigDO.java index 696e490..c1ecb89 100644 --- a/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/distributionconfig/DistributionMebConfigDO.java +++ b/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/distributionconfig/DistributionMebConfigDO.java @@ -39,5 +39,9 @@ public class DistributionMebConfigDO extends BaseDO { * 佣金 */ private Integer brokerage; + /** + * 复购奖励 + */ + private Integer repeatStatus; } diff --git a/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java b/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java index 4f115f0..a2ea1f3 100644 --- a/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java +++ b/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java @@ -485,6 +485,13 @@ public class MemberUserServiceImpl implements MemberUserService { if(ObjectUtil.isNotEmpty(distributionMebConfigDOS)){ for (DistributionMebConfigDO eg :distributionMebConfigDOS) { if(eg.getLevelId() == memberUserDO.getLevelId()){ + //判断商品购买次数 + Integer orderCountBySpuId = tradeOrderApi.getOrderCountBySpuId(productId); + if(ObjectUtil.isNotEmpty(eg.getRepeatStatus())){ + if(orderCountBySpuId>eg.getRepeatStatus()){ + continue; + } + } //添加佣金记录 BrokerageRecordDO brokerageRecordDO = new BrokerageRecordDO(); // brokerageRecordDO.setId(Math.toIntExact(brokerageUserDO.getBindUserId())); diff --git a/ruoyi-vue-pro-master/yudao-module-pay/yudao-module-pay-biz/pom.xml b/ruoyi-vue-pro-master/yudao-module-pay/yudao-module-pay-biz/pom.xml index 738b133..347e9a9 100644 --- a/ruoyi-vue-pro-master/yudao-module-pay/yudao-module-pay-biz/pom.xml +++ b/ruoyi-vue-pro-master/yudao-module-pay/yudao-module-pay-biz/pom.xml @@ -28,6 +28,16 @@ yudao-module-member-api ${revision} + + cn.iocoder.boot + yudao-module-trade-biz + ${revision} + + + cn.iocoder.boot + yudao-module-product-biz + ${revision} + diff --git a/ruoyi-vue-pro-master/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceImpl.java b/ruoyi-vue-pro-master/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceImpl.java index fe9d7ec..bdac905 100644 --- a/ruoyi-vue-pro-master/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceImpl.java +++ b/ruoyi-vue-pro-master/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceImpl.java @@ -32,6 +32,13 @@ import cn.iocoder.yudao.module.pay.framework.pay.config.PayProperties; import cn.iocoder.yudao.module.pay.service.app.PayAppService; import cn.iocoder.yudao.module.pay.service.channel.PayChannelService; import cn.iocoder.yudao.module.pay.service.notify.PayNotifyService; +import cn.iocoder.yudao.module.product.dal.dataobject.sku.ProductSkuDO; +import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO; +import cn.iocoder.yudao.module.product.dal.mysql.sku.ProductSkuMapper; +import cn.iocoder.yudao.module.product.dal.mysql.spu.ProductSpuMapper; +import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO; +import cn.iocoder.yudao.module.trade.dal.mysql.order.TradeOrderItemMapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.google.common.annotations.VisibleForTesting; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -79,6 +86,15 @@ public class PayOrderServiceImpl implements PayOrderService { @Resource private MemberUserApi memberUserApi; + @Resource + private TradeOrderItemMapper tradeOrderItemMapper; + + @Resource + private ProductSkuMapper productSkuMapper; + + @Resource + private ProductSpuMapper productSpuMapper; + @Override public PayOrderDO getOrder(Long id) { return orderMapper.selectById(id); @@ -275,6 +291,13 @@ public class PayOrderServiceImpl implements PayOrderService { PayOrderExtensionDO orderExtension = updateOrderSuccess(notify); PayOrderDO payOrderDO = orderMapper.selectPayOrderDOById(orderExtension.getOrderId()); memberUserApi.updateUserUpgradesLevelcallback(Long.valueOf(payOrderDO.getMerchantOrderId())); + //更新商品销量 + //查询商品订单信息 + List tradeOrderItemDOS = tradeOrderItemMapper.selectListByOrderId(Long.valueOf(payOrderDO.getMerchantOrderId())); + if(ObjectUtil.isNotEmpty(tradeOrderItemDOS)){ + productSkuMapper.update(new UpdateWrapper().lambda().eq(ProductSkuDO::getId,tradeOrderItemDOS.get(0).getSkuId()).setSql("sales_count = sales_count + 1")); + productSpuMapper.update(new UpdateWrapper().lambda().eq(ProductSpuDO::getId,tradeOrderItemDOS.get(0).getSpuId()).setSql("sales_count = sales_count + 1")); + } return; } // 情况二：支付失败的回调 diff --git a/ruoyi-vue-pro-master/yudao-server/src/main/resources/application-dev.yaml b/ruoyi-vue-pro-master/yudao-server/src/main/resources/application-dev.yaml index e1cfb12..be93eb7 100644 --- a/ruoyi-vue-pro-master/yudao-server/src/main/resources/application-dev.yaml +++ b/ruoyi-vue-pro-master/yudao-server/src/main/resources/application-dev.yaml @@ -8,6 +8,10 @@ spring: autoconfigure: exclude: - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 排除 Druid 的自动配置，使用 dynamic-datasource-spring-boot-starter 配置多数据源 + # - org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration # 默认 local 环境，不开启 Quartz 的自动配置 + - de.codecentric.boot.admin.server.config.AdminServerAutoConfiguration # 禁用 Spring Boot Admin 的 Server 的自动配置 + - de.codecentric.boot.admin.server.ui.config.AdminServerUiAutoConfiguration # 禁用 Spring Boot Admin 的 Server UI 的自动配置 + - de.codecentric.boot.admin.client.config.SpringBootAdminClientAutoConfiguration # 禁用 Spring Boot Admin 的 Client 的自动配置 datasource: druid: # Druid 【监控】相关的全局配置 web-stat-filter: @@ -29,42 +33,64 @@ spring: multi-statement-allow: true dynamic: # 多数据源配置 druid: # Druid 【连接池】相关的全局配置 - initial-size: 5 # 初始连接数 - min-idle: 10 # 最小连接池数量 + initial-size: 1 # 初始连接数 + min-idle: 1 # 最小连接池数量 max-active: 20 # 最大连接池数量 max-wait: 600000 # 配置获取连接等待超时的时间，单位：毫秒 time-between-eviction-runs-millis: 60000 # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位：毫秒 min-evictable-idle-time-millis: 300000 # 配置一个连接在池中最小生存的时间，单位：毫秒 max-evictable-idle-time-millis: 900000 # 配置一个连接在池中最大生存的时间，单位：毫秒 - validation-query: SELECT 1 # 配置检测连接是否有效 + validation-query: SELECT 1 FROM DUAL # 配置检测连接是否有效 test-while-idle: true test-on-borrow: false test-on-return: false primary: master datasource: master: - url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 + name: zdsc + url: jdbc:mysql://221.176.140.236:23307/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 + # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例 + # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.master.name} # PostgreSQL 连接的示例 + # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例 + # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.master.name} # SQLServer 连接的示例 + # url: jdbc:dm://10.211.55.4:5236?schema=RUOYI_VUE_PRO # DM 连接的示例 username: root - password: 123456 - slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改 + password: hmkj@2023 + # username: sa + # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W + # username: SYSDBA # DM 连接的示例 + # password: SYSDBA # DM 连接的示例 + slave: # 模拟从库，可根据自己需要修改 + name: zdsc lazy: true # 开启懒加载，保证启动速度 - url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 + url: jdbc:mysql://221.176.140.236:23307/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 + # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例 + # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例 + # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例 + # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.slave.name} # SQLServer 连接的示例 username: root - password: 123456 + password: hmkj@2023 + # username: sa + # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 + # redis: + # host: 127.0.0.1 # 地址 + # port: 6379 # 端口 + # database: 0 # 数据库索引 + # password: # 密码，建议生产环境开启 redis: - host: 400-infra.server.iocoder.cn # 地址 - port: 6379 # 端口 - database: 1 # 数据库索引 -# password: 123456 # 密码，建议生产环境开启 + host: 120.46.159.203 # 地址 + port: 16379 # 端口 + database: 0 # 数据库索引 + password: a8EYUSoT8wHbuRkX # 密码，建议生产环境开启 --- #################### 定时任务相关配置 #################### # Quartz 配置项，对应 QuartzProperties 配置类 spring: quartz: - auto-startup: true # 测试环境，需要开启 Job + auto-startup: true # 本地开发环境，尽量不要开启 Job scheduler-name: schedulerName # Scheduler 名字。默认为 schedulerName job-store-type: jdbc # Job 存储器类型。默认为 memory 表示内存，可选 jdbc 使用数据库。 wait-for-jobs-to-complete-on-shutdown: true # 应用关闭时，是否等待定时任务执行完成。默认为 false ，建议设置为 true @@ -99,10 +125,11 @@ rocketmq: spring: # RabbitMQ 配置项，对应 RabbitProperties 配置类 rabbitmq: - host: 127.0.0.1 # RabbitMQ 服务的地址 + host: 192.168.10.14 # RabbitMQ 服务的地址 port: 5672 # RabbitMQ 服务的端口 username: guest # RabbitMQ 服务的账号 password: guest # RabbitMQ 服务的密码 + virtual-host: / # Kafka 配置项，对应 KafkaProperties 配置类 kafka: bootstrap-servers: 127.0.0.1:9092 # 指定 Kafka Broker 地址，可以设置多个，以逗号分隔 @@ -140,21 +167,51 @@ spring: logging: file: name: ${user.home}/logs/${spring.application.name}.log # 日志文件名，全路径 + level: + # 配置自己写的 MyBatis Mapper 打印日志 + cn.iocoder.yudao.module.bpm.dal.mysql: debug + cn.iocoder.yudao.module.infra.dal.mysql: debug + cn.iocoder.yudao.module.infra.dal.mysql.job.JobLogMapper: INFO # 配置 JobLogMapper 的日志级别为 info + cn.iocoder.yudao.module.infra.dal.mysql.file.FileConfigMapper: INFO # 配置 FileConfigMapper 的日志级别为 info + cn.iocoder.yudao.module.pay.dal.mysql: debug + cn.iocoder.yudao.module.pay.dal.mysql.notify.PayNotifyTaskMapper: INFO # 配置 JobLogMapper 的日志级别为 info + cn.iocoder.yudao.module.system.dal.mysql: debug + cn.iocoder.yudao.module.system.dal.mysql.sensitiveword.SensitiveWordMapper: INFO # 配置 SensitiveWordMapper 的日志级别为 info + cn.iocoder.yudao.module.system.dal.mysql.sms.SmsChannelMapper: INFO # 配置 SmsChannelMapper 的日志级别为 info + cn.iocoder.yudao.module.tool.dal.mysql: debug + cn.iocoder.yudao.module.member.dal.mysql: debug + cn.iocoder.yudao.module.trade.dal.mysql: debug + cn.iocoder.yudao.module.promotion.dal.mysql: debug + cn.iocoder.yudao.module.statistics.dal.mysql: debug + cn.iocoder.yudao.module.crm.dal.mysql: debug + cn.iocoder.yudao.module.erp.dal.mysql: debug + org.springframework.context.support.PostProcessorRegistrationDelegate: ERROR # TODO 芋艿：先禁用，Spring Boot 3.X 存在部分错误的 WARN 提示 ---- #################### 微信公众号相关配置 #################### -wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md 文档 - mp: - # 公众号配置(必填) - app-id: wx041349c6f39b268b - secret: 5abee519483bc9f8cb37ce280e814bd0 +debug: false + +--- #################### 微信公众号、小程序相关配置 #################### +wx: + mp: # 公众号配置（必填），参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md 文档 + # app-id: wx041349c6f39b268b # 测试号（牛希尧提供的） + # secret: 5abee519483bc9f8cb37ce280e814bd0 + app-id: wx5b23ba7a5589ecbb # 测试号（自己的） + secret: 2a7b3b20c537e52e74afd395eb85f61f + # app-id: wxa69ab825b163be19 # 测试号（Kongdy 提供的） + # secret: bd4f9fab889591b62aeac0d7b8d8b4a0 # 存储配置，解决 AccessToken 的跨节点的共享 config-storage: type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取 key-prefix: wx # Redis Key 的前缀 http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台 miniapp: # 小程序配置（必填），参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-miniapp-spring-boot-starter/README.md 文档 - appid: wx63c280fe3248a3e7 - secret: 6f270509224a7ae1296bbf1c8cb97aed + # appid: wx62056c0d5e8db250 # 测试号（牛希尧提供的） + # secret: 333ae72f41552af1e998fe1f54e1584a + appid: wx879300e525dc9847 + secret: 4b61f8af2eba7c71b0be50fa46855377 + #appid: wx63c280fe3248a3e7 # wenhualian的接口测试号 + #secret: 6f270509224a7ae1296bbf1c8cb97aed + # appid: wxc4598c446f8a9cb3 # 测试号（Kongdy 提供的） + # secret: 4a1a04e07f6a4a0751b39c3064a92c8b config-storage: type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取 key-prefix: wa # Redis Key 的前缀 @@ -164,15 +221,23 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta # 芋道配置项，设置当前项目所有自定义的配置 yudao: + captcha: + enable: false # 本地环境，暂时关闭图片验证码，方便登录等接口的测试； + security: + mock-enable: true xss: enable: false exclude-urls: # 如下两个 url，仅仅是为了演示，去掉配置也没关系 - ${spring.boot.admin.context-path}/** # 不处理 Spring Boot Admin 的请求 - ${management.endpoints.web.base-path}/** # 不处理 Actuator 的请求 pay: - order-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/order # 支付渠道的【支付】回调地址 - refund-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/refund # 支付渠道的【退款】回调地址 - demo: true # 开启演示模式 + order-notify-url: https://zd.huamar.com/admin-api/pay/notify/order # 支付渠道的【支付】回调地址 + refund-notify-url: https://zd.huamar.com/admin-api/pay/notify/refund # 支付渠道的【退款】回调地址 + access-log: # 访问日志的配置项 + enable: false + error-code: # 错误码相关配置项 + enable: false + demo: false # 关闭演示模式 tencent-lbs-key: TVDBZ-TDILD-4ON4B-PFDZA-RNLKH-VVF6E # QQ 地图的密钥 https://lbs.qq.com/service/staticV2/staticGuide/staticDoc justauth: @@ -187,7 +252,6 @@ justauth: client-secret: 1wTb7hYxnpT2TUbIeHGXGo7T0odav1ic10mLdyyATOw agent-id: 1000004 ignore-check-redirect-uri: true - # noinspection SpringBootApplicationYaml WECHAT_MINI_APP: # 微信小程序 client-id: ${wx.miniapp.appid} client-secret: ${wx.miniapp.secret} @@ -200,4 +264,10 @@ justauth: cache: type: REDIS prefix: 'social_auth_state:' # 缓存前缀，目前只对 Redis 缓存生效，默认 JUSTAUTH::STATE:: - timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟 \ No newline at end of file + timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟 +io: + port: 7070 + host: 127.0.0.1 +xor: + massage: 151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515 + type: mobile diff --git a/ruoyi-vue-pro-master/yudao-server/src/main/resources/application-local.yaml b/ruoyi-vue-pro-master/yudao-server/src/main/resources/application-local.yaml index cbc6ef6..1897c41 100644 --- a/ruoyi-vue-pro-master/yudao-server/src/main/resources/application-local.yaml +++ b/ruoyi-vue-pro-master/yudao-server/src/main/resources/application-local.yaml @@ -48,14 +48,14 @@ spring: datasource: master: name: zdsc - url: jdbc:mysql://192.168.10.14:23306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 + url: jdbc:mysql://47.94.137.109:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.master.name} # PostgreSQL 连接的示例 # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例 # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.master.name} # SQLServer 连接的示例 # url: jdbc:dm://10.211.55.4:5236?schema=RUOYI_VUE_PRO # DM 连接的示例 username: root - password: hmkj@2023 + password: flAYMJUPCCXDMGFM4KX6 # username: sa # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W # username: SYSDBA # DM 连接的示例 @@ -63,22 +63,27 @@ spring: slave: # 模拟从库，可根据自己需要修改 name: zdsc lazy: true # 开启懒加载，保证启动速度 - url: jdbc:mysql://192.168.10.14:23306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 + url: jdbc:mysql://47.94.137.109:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例 # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例 # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.slave.name} # SQLServer 连接的示例 username: root - password: hmkj@2023 + password: flAYMJUPCCXDMGFM4KX6 # username: sa # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 +# redis: +# host: 127.0.0.1 # 地址 +# port: 6379 # 端口 +# database: 0 # 数据库索引 +# password: # 密码，建议生产环境开启 redis: - host: 192.168.10.14 # 地址 - port: 26379 # 端口 + host: 47.94.137.109 # 地址 + port: 6379 # 端口 database: 0 # 数据库索引 - password: hmkj@2023 # 密码，建议生产环境开启 +# password: a8EYUSoT8wHbuRkX # 密码，建议生产环境开启 --- #################### 定时任务相关配置 #################### @@ -201,8 +206,8 @@ wx: miniapp: # 小程序配置（必填），参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-miniapp-spring-boot-starter/README.md 文档 # appid: wx62056c0d5e8db250 # 测试号（牛希尧提供的） # secret: 333ae72f41552af1e998fe1f54e1584a - appid: wx53b5ac263b9cdb5b - secret: baa127ca662344cf9b0b8e52b26bac9d + appid: wx879300e525dc9847 + secret: 4b61f8af2eba7c71b0be50fa46855377 #appid: wx63c280fe3248a3e7 # wenhualian的接口测试号 #secret: 6f270509224a7ae1296bbf1c8cb97aed # appid: wxc4598c446f8a9cb3 # 测试号（Kongdy 提供的） @@ -226,8 +231,8 @@ yudao: - ${spring.boot.admin.context-path}/** # 不处理 Spring Boot Admin 的请求 - ${management.endpoints.web.base-path}/** # 不处理 Actuator 的请求 pay: - order-notify-url: https://yanghaodong.51vip.biz/admin-api/pay/notify/order # 支付渠道的【支付】回调地址 - refund-notify-url: https://yanghaodong.51vip.biz/admin-api/pay/notify/refund # 支付渠道的【退款】回调地址 + order-notify-url: https://zd.huamar.com/admin-api/pay/notify/order # 支付渠道的【支付】回调地址 + refund-notify-url: https://zd.huamar.com/admin-api/pay/notify/refund # 支付渠道的【退款】回调地址 access-log: # 访问日志的配置项 enable: false error-code: # 错误码相关配置项 @@ -265,4 +270,4 @@ io: host: 127.0.0.1 xor: massage: 151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515 - type: mobile \ No newline at end of file + type: mobile diff --git a/ruoyi-vue-pro-master/yudao-server/src/main/resources/application.yaml b/ruoyi-vue-pro-master/yudao-server/src/main/resources/application.yaml index bc62abe..92a9ad4 100644 --- a/ruoyi-vue-pro-master/yudao-server/src/main/resources/application.yaml +++ b/ruoyi-vue-pro-master/yudao-server/src/main/resources/application.yaml @@ -3,6 +3,7 @@ spring: name: yudao-server profiles: +# active: dev active: local main: @@ -272,4 +273,4 @@ debug: false # 积木报表配置 jeecg: jmreport: - saas-mode: tenant \ No newline at end of file + saas-mode: tenant diff --git a/yudao-ui-admin-vue3-master/.env.dev b/yudao-ui-admin-vue3-master/.env.dev index 92626f9..81bd56e 100644 --- a/yudao-ui-admin-vue3-master/.env.dev +++ b/yudao-ui-admin-vue3-master/.env.dev @@ -4,12 +4,18 @@ NODE_ENV=production VITE_DEV=true # 请求路径 -VITE_BASE_URL='http://zd.huamar.com' +VITE_BASE_URL='http://localhost:48080' # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务 VITE_UPLOAD_TYPE=server # 上传路径 -VITE_UPLOAD_URL='http://zd.huamar.com/admin-api/infra/file/upload' +VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload' +# VITE_BASE_URL='http://zd.huamar.com' + +# # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务 +# VITE_UPLOAD_TYPE=server +# # 上传路径 +# VITE_UPLOAD_URL='http://zd.huamar.com/admin-api/infra/file/upload' # 接口地址 VITE_API_URL=/admin-api diff --git a/yudao-ui-admin-vue3-master/src/layout/components/UserInfo/src/UserInfo.vue b/yudao-ui-admin-vue3-master/src/layout/components/UserInfo/src/UserInfo.vue index 5c5e373..d78a949 100644 --- a/yudao-ui-admin-vue3-master/src/layout/components/UserInfo/src/UserInfo.vue +++ b/yudao-ui-admin-vue3-master/src/layout/components/UserInfo/src/UserInfo.vue @@ -68,10 +68,10 @@ const toDocument = () => {
{{ t('common.profile') }}
- +
{{ t('lock.lockScreen') }}
diff --git a/yudao-ui-admin-vue3-master/src/locales/zh-CN.ts b/yudao-ui-admin-vue3-master/src/locales/zh-CN.ts index 0721651..a1bde1d 100644 --- a/yudao-ui-admin-vue3-master/src/locales/zh-CN.ts +++ b/yudao-ui-admin-vue3-master/src/locales/zh-CN.ts @@ -7,7 +7,7 @@ export default { login: '登录', required: '该项为必填项', loginOut: '退出系统', - document: '项目文档', + // document: '项目文档', profile: '个人中心', reminder: '温馨提示', loginOutMessage: '是否退出本系统？', @@ -152,7 +152,7 @@ export default { router: { login: '登录', socialLogin: '社交登录', - home: '首页', + home: '商城首页', analysis: '分析页', workplace: '工作台' }, diff --git a/yudao-ui-admin-vue3-master/src/views/Home/Index.vue b/yudao-ui-admin-vue3-master/src/views/Home/Index.vue index c59b9d2..89baf33 100644 --- a/yudao-ui-admin-vue3-master/src/views/Home/Index.vue +++ b/yudao-ui-admin-vue3-master/src/views/Home/Index.vue @@ -1,391 +1,113 @@ + diff --git a/yudao-ui-admin-vue3-master/src/views/Login/components/LoginForm.vue b/yudao-ui-admin-vue3-master/src/views/Login/components/LoginForm.vue index 3dbaff3..3703244 100644 --- a/yudao-ui-admin-vue3-master/src/views/Login/components/LoginForm.vue +++ b/yudao-ui-admin-vue3-master/src/views/Login/components/LoginForm.vue @@ -58,9 +58,9 @@ {{ t('login.remember') }} - + @@ -82,7 +82,7 @@ mode="pop" @success="handleLogin" /> - + + + + + diff --git a/yudao-ui-admin-vue3-master/src/views/member/distributionconfig/DistributionConfigForm.vue b/yudao-ui-admin-vue3-master/src/views/member/distributionconfig/DistributionConfigForm.vue index 6b74bc2..adb2907 100644 --- a/yudao-ui-admin-vue3-master/src/views/member/distributionconfig/DistributionConfigForm.vue +++ b/yudao-ui-admin-vue3-master/src/views/member/distributionconfig/DistributionConfigForm.vue @@ -19,6 +19,12 @@ 禁用 + + + + + + @@ -52,6 +58,8 @@ const formData = ref({ productId: undefined, status: undefined, levelId: undefined, + buyerLevelId: undefined, + purchaseNum: undefined }) const formRules = reactive({ }) @@ -119,6 +127,8 @@ const resetForm = () => { productId: undefined, status: undefined, levelId: undefined, + buyerLevelId: undefined, + purchaseNum: undefined } formRef.value?.resetFields() } diff --git a/yudao-ui-admin-vue3-master/src/views/member/distributionconfig/components/DistributionMebConfigForm.vue b/yudao-ui-admin-vue3-master/src/views/member/distributionconfig/components/DistributionMebConfigForm.vue index a515bd8..885c6ab 100644 --- a/yudao-ui-admin-vue3-master/src/views/member/distributionconfig/components/DistributionMebConfigForm.vue +++ b/yudao-ui-admin-vue3-master/src/views/member/distributionconfig/components/DistributionMebConfigForm.vue @@ -23,6 +23,13 @@ + + +