ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MgtFrozenMemberDto.java
New file @@ -0,0 +1,22 @@ package com.ruoyi.system.api.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * @ClassName MgtFrozenMemberDto * @Description TODO * @Author jqs * @Date 2023/7/24 18:02 * @Version 1.0 */ @Data public class MgtFrozenMemberDto extends MgtBaseDto { @ApiModelProperty(value = "请求对象id") private Long id; @ApiModelProperty(value = "冻结标记 1冻结 0解冻") private Integer frozenFlag; } ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/MemberCoupon.java
@@ -64,11 +64,16 @@ @TableField("coupon_name") private String couponName; /** * 发送类型1.手动领取2.全部用户3.会员用户4非会员用户5自定义 * 发送类型1.手动领取2.指定发放 */ @TableField("send_type") private Integer sendType; /** * 发送对象2.全部用户3.会员用户4非会员用户5自定义 */ @TableField("send_target") private Integer sendTarget; /** * 发送时间类型1立即2定时 */ @TableField("send_time_type") ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
@@ -2,6 +2,7 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.system.api.domain.dto.AppEditUserDto; import com.ruoyi.system.api.domain.dto.MgtFrozenMemberDto; import com.ruoyi.system.api.domain.poji.sys.SysUser; import com.ruoyi.system.api.model.LoginUser; import com.ruoyi.system.api.model.QwH5LoginVo; @@ -71,7 +72,7 @@ } @Override public R frozenUser(Long userId) { public R frozenUser(MgtFrozenMemberDto mgtFrozenMemberDto) { return R.fail("冻结用户失败:" + throwable.getMessage()); }
@@ -4,6 +4,7 @@ import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.R; import com.ruoyi.system.api.domain.dto.AppEditUserDto; import com.ruoyi.system.api.domain.dto.MgtFrozenMemberDto; import com.ruoyi.system.api.domain.poji.sys.SysUser; import com.ruoyi.system.api.factory.RemoteUserFallbackFactory; import com.ruoyi.system.api.model.LoginUser; @@ -97,7 +98,7 @@ * @return R<Activeness> */ @PostMapping("/user/frozenUser") public R frozenUser(@RequestBody Long userId); public R frozenUser(@RequestBody MgtFrozenMemberDto mgtFrozenMemberDto); /** * @description 员工端登录 ruoyi-auth/src/main/resources/bootstrap.yml
@@ -14,12 +14,12 @@ nacos: discovery: # 服务注册地址 #server-addr: 47.109.78.184:5000 server-addr: 127.0.0.1:8848 server-addr: 47.109.78.184:5000 #server-addr: 127.0.0.1:8848 config: # 配置中心地址 #server-addr: 47.109.78.184:5000 server-addr: 127.0.0.1:8848 server-addr: 47.109.78.184:5000 #server-addr: 127.0.0.1:8848 # 配置文件格式 file-extension: yml # 共享配置 ruoyi-gateway/src/main/resources/bootstrap.yml
@@ -14,12 +14,12 @@ nacos: discovery: # 服务注册地址 #server-addr: 47.109.78.184:5000 server-addr: 127.0.0.1:8848 server-addr: 47.109.78.184:5000 #server-addr: 127.0.0.1:8848 config: # 配置中心地址 #server-addr: 47.109.78.184:5000 server-addr: 127.0.0.1:8848 server-addr: 47.109.78.184:5000 #server-addr: 127.0.0.1:8848 # 配置文件格式 file-extension: yml # 共享配置 @@ -35,8 +35,8 @@ datasource: ds1: nacos: #server-addr: 47.109.78.184:5000 server-addr: 127.0.0.1:8848 server-addr: 47.109.78.184:5000 #server-addr: 127.0.0.1:8848 dataId: sentinel-ruoyi-gateway groupId: DEFAULT_GROUP data-type: json ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml
@@ -19,12 +19,12 @@ nacos: discovery: # 服务注册地址 #server-addr: 47.109.78.184:5000 server-addr: 127.0.0.1:8848 server-addr: 47.109.78.184:5000 #server-addr: 127.0.0.1:8848 config: # 配置中心地址 #server-addr: 47.109.78.184:5000 server-addr: 127.0.0.1:8848 server-addr: 47.109.78.184:5000 #server-addr: 127.0.0.1:8848 # 配置文件格式 file-extension: yml # 共享配置 ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml
@@ -14,12 +14,12 @@ nacos: discovery: # 服务注册地址 #server-addr: 47.109.78.184:5000 server-addr: 127.0.0.1:8848 server-addr: 47.109.78.184:5000 #server-addr: 127.0.0.1:8848 config: # 配置中心地址 #server-addr: 47.109.78.184:5000 server-addr: 127.0.0.1:8848 server-addr: 47.109.78.184:5000 #server-addr: 127.0.0.1:8848 # 配置文件格式 file-extension: yml # 共享配置 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppGoodsController.java
@@ -114,6 +114,14 @@ return R.ok(); } @RequestMapping(value = "/countShoppingCart", method = RequestMethod.POST) @ApiOperation(value = "获取购物车数量") public R<Integer> countShoppingCart() { Long userId = SecurityUtils.getUserId(); Member member = memberService.getMember(userId).getData(); Long shopId = member.getRelationShopId(); Integer count = shoppingCartService.countShoppingCart(userId, shopId); return R.ok(count); } } ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/ShoppingCartService.java
@@ -50,4 +50,16 @@ * @return */ List<AppShoppingCartVo> listShoppingCartVo(Long userId, Long shopId); /** * @description 获取购物车数量 * @author jqs * @date 2023/7/24 15:07 * @param userId * @param shopId * @return Integer */ Integer countShoppingCart(Long userId, Long shopId); } ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/ShoppingCartServiceImpl.java
@@ -123,4 +123,20 @@ shoppingCartMapper.deleteByUserIdAndGoodsId(userId,goodsId); } /** * @description 获取购物车数量 * @author jqs * @date 2023/7/24 15:07 * @param userId * @param shopId * @return Integer */ @Override public Integer countShoppingCart(Long userId, Long shopId){ LambdaQueryWrapper<ShoppingCart> queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ShoppingCart::getDelFlag,0); queryWrapper.eq(ShoppingCart::getShopId,shopId); queryWrapper.eq(ShoppingCart::getUserId,userId); return this.count(queryWrapper); } } ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml
@@ -14,12 +14,12 @@ nacos: discovery: # 服务注册地址 #server-addr: 47.109.78.184:5000 server-addr: 127.0.0.1:8848 server-addr: 47.109.78.184:5000 #server-addr: 127.0.0.1:8848 config: # 配置中心地址 #server-addr: 47.109.78.184:5000 server-addr: 127.0.0.1:8848 server-addr: 47.109.78.184:5000 #server-addr: 127.0.0.1:8848 # 配置文件格式 file-extension: yml # 共享配置 ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsMapper.xml
@@ -353,10 +353,10 @@ AND tg.goods_class_id = #{param.goodsClassId} </if> <if test="param.createStartTime!=null and param.createStartTime != ''"> AND Date(ta.create_time) >= #{param.createStartTime} AND Date(tg.create_time) >= #{param.createStartTime} </if> <if test="param.createEndTime!=null and param.createEndTime != ''"> AND Date(ta.create_time) <= #{param.createEndTime} AND Date(tg.create_time) <= #{param.createEndTime} </if> <if test="param.goodsName != null and param.goodsName != ''"> AND tg.goods_name LIKE CONCAT('%',#{param.goodsName},'%') ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml
@@ -14,12 +14,12 @@ nacos: discovery: # 服务注册地址 #server-addr: 47.109.78.184:5000 server-addr: 127.0.0.1:8848 server-addr: 47.109.78.184:5000 #server-addr: 127.0.0.1:8848 config: # 配置中心地址 #server-addr: 47.109.78.184:5000 server-addr: 127.0.0.1:8848 server-addr: 47.109.78.184:5000 #server-addr: 127.0.0.1:8848 # 配置文件格式 file-extension: yml # 共享配置 ruoyi-modules/ruoyi-member/pom.xml
@@ -107,7 +107,7 @@ <dependency> <groupId>com.github.binarywang</groupId> <artifactId>weixin-java-miniapp</artifactId> <version>4.1.0</version> <version>4.5.0</version> </dependency> </dependencies>
@@ -10,6 +10,7 @@ import com.ruoyi.member.domain.vo.*; import com.ruoyi.member.service.member.*; import com.ruoyi.system.api.domain.dto.MgtBaseGetDto; import com.ruoyi.system.api.domain.dto.MgtFrozenMemberDto; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.RequestBody; @@ -244,10 +245,10 @@ @RequestMapping(value = "/mgtFrozenMember", method = RequestMethod.POST) @Log(title = "会员管理", businessType = BusinessType.UPDATE,operContent = "冻结会员") @ApiOperation(value = "冻结会员") public R mgtReplayMemberSuggest(@RequestBody MgtBaseGetDto mgtBaseGetDto) { public R mgtReplayMemberSuggest(@RequestBody MgtFrozenMemberDto mgtFrozenMemberDto) { Long userId = SecurityUtils.getUserId(); mgtBaseGetDto.setUserId(userId); memberService.mgtFrozenMember(mgtBaseGetDto); mgtFrozenMemberDto.setUserId(userId); memberService.mgtFrozenMember(mgtFrozenMemberDto); return R.ok(); } } ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppCouponController.java
@@ -49,12 +49,11 @@ public R<Page<AppGetAbleCouponPageVo>> pagePlatformMerCoupon(@RequestBody AppPageDto appPageDto) { Long userId = SecurityUtils.getUserId(); Member member = memberService.getByUserId(userId); Long shopId = member.getRelationShopId(); appPageDto.setUserId(userId); Page<AppGetAbleCouponPageVo> page = new Page<>(); page.setSize(appPageDto.getPageSize()); page.setCurrent(appPageDto.getPageNum()); List<AppGetAbleCouponPageVo> unGetCouponPageVoList = couponService.pageAppUserGetAbleCoupon(page,appPageDto,shopId); List<AppGetAbleCouponPageVo> unGetCouponPageVoList = couponService.pageAppUserGetAbleCoupon(page,appPageDto,member); return R.ok(page.setRecords(unGetCouponPageVoList)); }
@@ -27,9 +27,12 @@ @ApiModelProperty(value="优惠券名称") private String couponName; @ApiModelProperty(value = "发送类型1.手动领取2.全部用户3.会员用户4非会员用户5自定义") @ApiModelProperty(value = "发送类型1.手动领取2.指定发放") private Integer sendType; @ApiModelProperty(value = "发送对象2.全部用户3.会员用户4非会员用户5自定义") private Integer sendTarget; @ApiModelProperty(value="发送时间类型1立即2定时") private Integer sendTimeType;
@@ -54,10 +54,15 @@ @TableField("coupon_name") private String couponName; /** * 发送类型1.手动领取2.全部用户3.会员用户4非会员用户5自定义 * 发送类型1.手动领取2.指定发放 */ @TableField("send_type") private Integer sendType; /** * 发送对象2.全部用户3.会员用户4非会员用户5自定义 */ @TableField("send_target") private Integer sendTarget; /** * 发送时间类型1立即2定时 */ @@ -177,6 +182,9 @@ @TableField("send_flag") private Integer sendFlag; @TableField("rel_user_ids") private String relUserIds; @Override protected Serializable pkVal() { return this.couponId; ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtCouponGetVo.java
@@ -27,9 +27,12 @@ @ApiModelProperty(value="优惠券名称") private String couponName; @ApiModelProperty(value = "发送类型1.手动领取2.全部用户3.会员用户4非会员用户5自定义") @ApiModelProperty(value = "发送类型1.手动领取2.指定发放") private Integer sendType; @ApiModelProperty(value = "发送对象2.全部用户3.会员用户4非会员用户5自定义") private Integer sendTarget; @ApiModelProperty(value="发送时间类型1立即2定时") private Integer sendTimeType;
@@ -106,4 +106,7 @@ @ApiModelProperty(value = "头像") private String head; @ApiModelProperty(value = "冻结标记 1冻结 0解冻") private Integer frozenFlag; } ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/coupon/CouponMapper.java
@@ -93,6 +93,7 @@ */ List<String> listUserUnGetCoupon(@Param("userId")Long userId); /** * @description 可领取优惠券列表 * @author jqs @@ -102,5 +103,5 @@ * @param unGetList * @return List<AppGetAbleCouponPageVo> */ List<AppGetAbleCouponPageVo> getAbleCouponPageVoList(Page page, @Param("shopId") Long shopId, @Param("unGetList") List<String> unGetList); List<AppGetAbleCouponPageVo> getAbleCouponPageVoList(Page page, @Param("shopId") Long shopId, @Param("userId") Long userId, @Param("memberFlag") Integer memberFlag, @Param("unGetList") List<String> unGetList); } ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/coupon/CouponService.java
@@ -1,11 +1,12 @@ package com.ruoyi.member.service.coupon; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.member.domain.dto.*; import com.ruoyi.member.domain.pojo.coupon.Coupon; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.member.domain.vo.*; import com.ruoyi.system.api.domain.dto.*; import com.ruoyi.system.api.domain.poji.member.Member; import java.util.List; @@ -168,7 +169,7 @@ * @param appPageDto * @return List<AppUnGetCouponPageVo> */ List<AppGetAbleCouponPageVo> pageAppUserGetAbleCoupon(Page page, AppPageDto appPageDto, Long shopId); List<AppGetAbleCouponPageVo> pageAppUserGetAbleCoupon(Page page, AppPageDto appPageDto, Member member);
@@ -21,6 +21,7 @@ import com.ruoyi.system.api.domain.dto.*; import com.ruoyi.system.api.domain.poji.config.DelayTask; import com.ruoyi.system.api.domain.poji.goods.Goods; import com.ruoyi.system.api.domain.poji.member.Member; import com.ruoyi.system.api.domain.poji.member.MemberCoupon; import com.ruoyi.system.api.domain.poji.shop.Shop; import com.ruoyi.system.api.domain.vo.MerGoodsPriceListVo; @@ -36,6 +37,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.StringJoiner; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -187,7 +189,7 @@ } } //判断优惠券是否指定发放用户 if(coupon.getSendType()==5&&coupon.getRelationType()==1){ if(coupon.getSendTarget()==5&&coupon.getRelationType()==1){ //获取优惠券发放用户 List<MgtCouponMemberListVo> relUserList = couponRelUserService.listCouponMemberVo(coupon.getCouponId()); mgtCouponGetVo.setRelUserList(relUserList); @@ -207,10 +209,6 @@ MerCouponGetVo merCouponGetVo = new MerCouponGetVo(); Coupon coupon = this.getById(couponId); BeanUtils.copyProperties(coupon, merCouponGetVo); if(merCouponGetVo.getSendType()>1){ merCouponGetVo.setSendType(2); merCouponGetVo.setSendTarget(merCouponGetVo.getSendType()); } //判断优惠券是否为指定商品 if(coupon.getUseScope()==2){ String relGoodsIds = coupon.getRelGoodsIds(); @@ -223,7 +221,7 @@ } } //判断优惠券是否指定发放用户 if(coupon.getSendType()==5&&coupon.getRelationType()==1){ if(coupon.getSendTarget()==5&&coupon.getRelationType()==1){ //获取优惠券发放用户 List<MgtCouponMemberListVo> relUserList = couponRelUserService.listCouponMemberVo(coupon.getCouponId()); merCouponGetVo.setRelUserList(relUserList); @@ -274,6 +272,7 @@ coupon.setCouponType(mgtCouponEditDto.getCouponType()); coupon.setCouponName(mgtCouponEditDto.getCouponName()); coupon.setSendType(mgtCouponEditDto.getSendType()); coupon.setSendTarget(mgtCouponEditDto.getSendTarget()); coupon.setSendTimeType(mgtCouponEditDto.getSendTimeType()); coupon.setSendTime(mgtCouponEditDto.getSendTime()); coupon.setMoneyThreshold(mgtCouponEditDto.getMoneyThreshold()); @@ -307,18 +306,21 @@ } //判断是否指定用户 List<Long> relUserIdList = null; if(coupon.getSendType()==5&&coupon.getRelationType()==1&&!mgtCouponEditDto.getRelUserIdList().isEmpty()){ if(coupon.getSendTarget()==2&&coupon.getSendTarget()==5&&coupon.getRelationType()==1&&!mgtCouponEditDto.getRelUserIdList().isEmpty()){ relUserIdList = mgtCouponEditDto.getRelUserIdList(); List<CouponRelUser> couponRelUserList = relUserIdList.stream() .map(str -> { CouponRelUser couponRelUser = new CouponRelUser(); List<CouponRelUser> couponRelUserList = new ArrayList<>(); CouponRelUser couponRelUser; StringJoiner userIdSj = new StringJoiner(","); for(Long userId : relUserIdList){ couponRelUser = new CouponRelUser(); couponRelUser.setDelFlag(0); couponRelUser.setCouponId(coupon.getCouponId()); couponRelUser.setUserId(str); return couponRelUser; }) .collect(Collectors.toList()); couponRelUser.setUserId(userId); couponRelUserList.add(couponRelUser); userIdSj.add(userId.toString()); } couponRelUserService.saveBatch(couponRelUserList); coupon.setRelUserIds(userIdSj.toString()); } //处理优惠券发放 if(coupon.getSendTimeType()==1){ @@ -342,15 +344,15 @@ protected void sendCoupon(Coupon coupon, List<Long> relUserIdList){ //1.手动领取2.全部用户3.会员用户4非会员用户5自定义 Date nowTime = new Date(); Integer sendType = coupon.getSendType(); Integer sendTarget = coupon.getSendTarget(); List<Long> userIdList = new ArrayList<>(); Long shopId = null; if(coupon.getCouponFrom()==2 && sendType==3){ if(coupon.getCouponFrom()==2 && sendTarget==3){ shopId = coupon.getShopId(); } if(sendType >= 2 && sendType <= 4){ userIdList = memberService.listIdBySendType(sendType,shopId); }else if(sendType == 5){ if(sendTarget >= 2 && sendTarget <= 4){ userIdList = memberService.listIdBySendType(sendTarget,shopId); }else if(sendTarget == 5){ //关联类型1.用户管理筛选2.活动管理筛选 if(coupon.getRelationType()==2){ Integer relationActivityType = coupon.getRelationActivityType(); @@ -385,6 +387,7 @@ memberCoupon.setCouponStatus(coupon.getCouponStatus()); memberCoupon.setCouponName(coupon.getCouponName()); memberCoupon.setSendType(coupon.getSendType()); memberCoupon.setSendTarget(coupon.getSendTarget()); memberCoupon.setSendTimeType(coupon.getSendTimeType()); memberCoupon.setSendTime(coupon.getSendTime()); memberCoupon.setMoneyThreshold(coupon.getMoneyThreshold()); @@ -427,15 +430,15 @@ private void sendCouponNow(Coupon coupon, List<Long> relUserIdList){ //1.手动领取2.全部用户3.会员用户4非会员用户5自定义 Date nowTime = new Date(); Integer sendType = coupon.getSendType(); Integer sendTarget = coupon.getSendTarget(); List<Long> userIdList = new ArrayList<>(); Long shopId = null; if(coupon.getCouponFrom()==2 && sendType==3){ if(coupon.getCouponFrom()==2 && sendTarget==3){ shopId = coupon.getShopId(); } if(sendType >= 2 && sendType <= 4){ userIdList = memberService.listIdBySendType(sendType,shopId); }else if(sendType == 5){ if(sendTarget >= 2 && sendTarget <= 4){ userIdList = memberService.listIdBySendType(sendTarget,shopId); }else if(sendTarget == 5){ //关联类型1.用户管理筛选2.活动管理筛选 if(coupon.getRelationType()==2){ Integer relationActivityType = coupon.getRelationActivityType(); @@ -470,6 +473,7 @@ memberCoupon.setCouponStatus(coupon.getCouponStatus()); memberCoupon.setCouponName(coupon.getCouponName()); memberCoupon.setSendType(coupon.getSendType()); memberCoupon.setSendTarget(coupon.getSendTarget()); memberCoupon.setSendTimeType(coupon.getSendTimeType()); memberCoupon.setSendTime(coupon.getSendTime()); memberCoupon.setMoneyThreshold(coupon.getMoneyThreshold()); @@ -581,7 +585,7 @@ List<CouponRelUser> couponRelUserList; List<Long> userIdList = new ArrayList<>(); Coupon coupon = this.getById(couponId); if(coupon.getSendType()==5&&coupon.getRelationType()==1){ if(coupon.getSendTarget()==5&&coupon.getRelationType()==1){ couponRelUserList = couponRelUserService.list(new LambdaQueryWrapper<CouponRelUser>().eq(CouponRelUser::getDelFlag,0).eq(CouponRelUser::getCouponId,coupon.getCouponId())); if(couponRelUserList!=null&&!couponRelUserList.isEmpty()){ userIdList = couponRelUserList.stream() @@ -698,7 +702,7 @@ } } //判断优惠券是否指定发放用户 if(coupon.getSendType()==5&&coupon.getRelationType()==1){ if(coupon.getSendTarget()==5&&coupon.getRelationType()==1){ //获取优惠券发放用户 List<MgtCouponMemberListVo> relUserList = couponRelUserService.listCouponMemberVo(coupon.getCouponId()); mgtCouponAuditGetVo.setRelUserList(relUserList); @@ -901,9 +905,7 @@ coupon.setCouponType(merCouponEditDto.getCouponType()); coupon.setCouponName(merCouponEditDto.getCouponName()); coupon.setSendType(merCouponEditDto.getSendType()); if(merCouponEditDto.getSendType()!=1){ coupon.setSendType(merCouponEditDto.getSendTarget()); } coupon.setSendTarget(merCouponEditDto.getSendTarget()); coupon.setSendTimeType(merCouponEditDto.getSendTimeType()); coupon.setSendTime(merCouponEditDto.getSendTime()); coupon.setMoneyThreshold(merCouponEditDto.getMoneyThreshold()); @@ -935,18 +937,21 @@ } //判断是否指定用户 List<Long> relUserIdList = null; if(coupon.getSendType()==5&&coupon.getRelationType()==1&&!merCouponEditDto.getRelUserIdList().isEmpty()){ if(coupon.getSendTarget()==5&&coupon.getRelationType()==1&&!merCouponEditDto.getRelUserIdList().isEmpty()){ relUserIdList = merCouponEditDto.getRelUserIdList(); List<CouponRelUser> couponRelUserList = relUserIdList.stream() .map(str -> { CouponRelUser couponRelUser = new CouponRelUser(); List<CouponRelUser> couponRelUserList = new ArrayList<>(); CouponRelUser couponRelUser; StringJoiner userIdSj = new StringJoiner(","); for(Long userId : relUserIdList){ couponRelUser = new CouponRelUser(); couponRelUser.setDelFlag(0); couponRelUser.setCouponId(coupon.getCouponId()); couponRelUser.setUserId(str); return couponRelUser; }) .collect(Collectors.toList()); couponRelUser.setUserId(userId); couponRelUserList.add(couponRelUser); userIdSj.add(userId.toString()); } couponRelUserService.saveBatch(couponRelUserList); coupon.setRelUserIds(userIdSj.toString()); } this.saveOrUpdate(coupon); } @@ -999,6 +1004,7 @@ memberCoupon.setCouponStatus(coupon.getCouponStatus()); memberCoupon.setCouponName(coupon.getCouponName()); memberCoupon.setSendType(coupon.getSendType()); memberCoupon.setSendTarget(coupon.getSendTarget()); memberCoupon.setSendTimeType(coupon.getSendTimeType()); memberCoupon.setSendTime(coupon.getSendTime()); memberCoupon.setMoneyThreshold(coupon.getMoneyThreshold()); @@ -1034,10 +1040,10 @@ * @return List<AppUnGetCouponPageVo> */ @Override public List<AppGetAbleCouponPageVo> pageAppUserGetAbleCoupon(Page page, AppPageDto appPageDto, Long shopId){ public List<AppGetAbleCouponPageVo> pageAppUserGetAbleCoupon(Page page, AppPageDto appPageDto, Member member){ //获取当前已领取完优惠券 List<String> unGetList = couponMapper.listUserUnGetCoupon(appPageDto.getUserId()); List<AppGetAbleCouponPageVo> getAbleCouponPageVoList = couponMapper.getAbleCouponPageVoList(page, shopId, unGetList); List<AppGetAbleCouponPageVo> getAbleCouponPageVoList = couponMapper.getAbleCouponPageVoList(page, member.getRelationShopId(),member.getUserId(),member.getBindingFlag(), unGetList); //处理商品限制 if(!getAbleCouponPageVoList.isEmpty()){ String relGoodsIds; @@ -1106,6 +1112,7 @@ memberCoupon.setCouponStatus(coupon.getCouponStatus()); memberCoupon.setCouponName(coupon.getCouponName()); memberCoupon.setSendType(coupon.getSendType()); memberCoupon.setSendTarget(coupon.getSendTarget()); memberCoupon.setSendTimeType(coupon.getSendTimeType()); memberCoupon.setSendTime(coupon.getSendTime()); memberCoupon.setMoneyThreshold(coupon.getMoneyThreshold()); ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java
@@ -184,7 +184,9 @@ List<String> goodsLimitList = null; HashSet<Long> shopIdSet = new HashSet<>(); for(AppMemberCouponPageVo appGetAbleCouponPageVo : memberCouponPageVoList){ if(appGetAbleCouponPageVo.getShopId()!=null){ shopIdSet.add(appGetAbleCouponPageVo.getShopId()); } if(appGetAbleCouponPageVo.getCouponType()==4){ appGetAbleCouponPageVo.setVerifyCode("2-"+appGetAbleCouponPageVo.getMemberCouponId()); } ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
@@ -1714,12 +1714,15 @@ * @description * @author jqs * @date 2023/7/5 21:18 * @param mgtBaseGetDto * @param mgtFrozenMemberDto * @return void */ @Override public void mgtFrozenMember(MgtBaseGetDto mgtBaseGetDto){ sysUserService.frozenUser(Long.valueOf(mgtBaseGetDto.getId())); public void mgtFrozenMember(MgtFrozenMemberDto mgtFrozenMemberDto){ Long userId = mgtFrozenMemberDto.getId(); Member member = this.getByUserId(userId); member.setFrozenFlag(mgtFrozenMemberDto.getFrozenFlag()); sysUserService.frozenUser(mgtFrozenMemberDto); } /** ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberService.java
@@ -329,7 +329,7 @@ * @param mgtBaseGetDto * @return void */ void mgtFrozenMember(MgtBaseGetDto mgtBaseGetDto); void mgtFrozenMember(MgtFrozenMemberDto mgtFrozenMemberDto); /** * @description 获取用户任务列表 ruoyi-modules/ruoyi-member/src/main/resources/bootstrap.yml
@@ -14,12 +14,12 @@ nacos: discovery: # 服务注册地址 #server-addr: 47.109.78.184:5000 server-addr: 127.0.0.1:8848 server-addr: 47.109.78.184:5000 #server-addr: 127.0.0.1:8848 config: # 配置中心地址 #server-addr: 47.109.78.184:5000 server-addr: 127.0.0.1:8848 server-addr: 47.109.78.184:5000 #server-addr: 127.0.0.1:8848 # 配置文件格式 file-extension: yml # 共享配置 ruoyi-modules/ruoyi-member/src/main/resources/mapper/coupon/CouponMapper.xml
@@ -164,7 +164,7 @@ WHEN 1 THEN '手动获取' ELSE '指定发放' END sendType, CASE tc.send_type CASE tc.send_target WHEN 2 THEN '全部用户' WHEN 3 THEN '会员用户' WHEN 4 THEN '非会员用户' @@ -224,7 +224,7 @@ WHEN 1 THEN '手动获取' ELSE '指定发放' END sendType, CASE tc.send_type CASE tc.send_target WHEN 2 THEN '全部用户' WHEN 3 THEN '会员用户' WHEN 4 THEN '非会员用户' @@ -341,6 +341,7 @@ WHERE tc.del_flag = 0 AND tc.coupon_status = 1 AND tc.audit_status=2 AND tc.send_type = 1 AND tmcr.limit_flag = 1 </select> <select id="getAbleCouponPageVoList" resultType="com.ruoyi.member.domain.vo.AppGetAbleCouponPageVo"> SELECT tc.coupon_id couponId, @@ -352,6 +353,15 @@ tc.rel_goods_ids relGoodsIds FROM t_coupon tc WHERE tc.del_flag = 0 AND tc.coupon_status = 1 AND tc.send_type = 1 AND (tc.coupon_from = 1 OR (tc.coupon_from = 2 AND tc.shop_id = #{shopId})) AND (tc.send_target = 2 <if test="memberFlag != null and memberFlag = 1"> OR tc.send_target = 3 </if> <if test="memberFlag != null and memberFlag = 0"> OR tc.send_target = 4 </if> OR (tc.send_target = 5 AND FIND_IN_SET(#{userId},tc.rel_user_ids) > 0) ) <if test="unGetList != null and unGetList.size()>0"> AND tc.coupon_id NOT IN <foreach collection="unGetList" item="item" open="(" separator="," close=")"> ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml
@@ -242,7 +242,8 @@ tm.customer_source memberFrom, tmt.total_pay_money totalPayMoney, tmt.total_activity_count activityTotal, tm.avatar head tm.avatar head, tm.frozen_flag frozenFlag FROM t_member tm LEFT JOIN t_member_total tmt ON tm.member_id = tmt.member_id WHERE tm.del_flag = 0 ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberSuggestMapper.xml
@@ -77,7 +77,7 @@ AND tms.suggest_type = #{param.suggestType} </if> <if test="param.shopIds!=null and param.shopIds!=''"> AND tms.shop_id IN CONCAT('(',#{param.shopIds},')') AND tms.shop_id IN (#{param.shopIds}) </if> </select> </mapper> ruoyi-modules/ruoyi-order/pom.xml
@@ -101,11 +101,7 @@ <artifactId>mybatis-plus-generate</artifactId> <version>2.3.3</version> </dependency> <dependency> <groupId>com.github.wechatpay-apiv3</groupId> <artifactId>wechatpay-java</artifactId> <version>0.2.8</version> </dependency> <!-- 微信支付分提供的工具包，用于生成公用的http-client客户端 --> <dependency> @@ -120,18 +116,17 @@ <version>0.2.10</version> </dependency> <!-- 爬虫工具，抓取和解析html https://mvnrepository.com/artifact/org.jsoup/jsoup --> <dependency> <groupId>org.jsoup</groupId> <artifactId>jsoup</artifactId> <version>1.14.2</version> <groupId>com.github.binarywang</groupId> <artifactId>weixin-java-miniapp</artifactId> <version>4.5.0</version> </dependency> <dependency> <groupId>com.github.binarywang</groupId> <artifactId>weixin-java-pay</artifactId> <version>4.5.0</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpmime</artifactId> <version>4.5.12</version> </dependency> </dependencies>
New file @@ -0,0 +1,55 @@ package com.ruoyi.order.config; import com.github.binarywang.wxpay.config.WxPayConfig; import com.github.binarywang.wxpay.service.WxPayService; import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; /** * @author jqs34 * @ClassName WxPayConfig * @description: TODO * @date 2023年03月06日 * @version: 1.0 */ @Configuration @ConditionalOnClass(WxPayService.class) public class MyWxPayConfig { //微信API private static final String APP_ID = ""; //微信商户号 private static final String MAC_ID = ""; //微信商户密钥 private static final String MCH_KEY = ""; //微信证书API private static final String KEY_PATH = ""; private static final String PRIVATE_KEY_PATH = ""; private static final String PRIVATE_CERT_PATH = ""; private static final String API_V3_KEY = ""; @Bean @ConditionalOnMissingBean public WxPayService wxService() { WxPayConfig payConfig = new WxPayConfig(); payConfig.setAppId(APP_ID); payConfig.setMchId(MAC_ID); payConfig.setMchKey(MCH_KEY); payConfig.setKeyPath(KEY_PATH); payConfig.setPrivateKeyPath(PRIVATE_KEY_PATH); payConfig.setPrivateCertPath(PRIVATE_CERT_PATH); payConfig.setApiV3Key(API_V3_KEY); // 可以指定是否使用沙箱环境 payConfig.setUseSandboxEnv(false); WxPayService wxPayService = new WxPayServiceImpl(); wxPayService.setConfig(payConfig); return wxPayService; } }
@@ -2,7 +2,10 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.order.domain.vo.*; import com.ruoyi.order.domain.vo.MgtPlTotalActivityTotalVo; import com.ruoyi.order.domain.vo.MgtTotalActivityTotalVo; import com.ruoyi.order.domain.vo.MgtTotalDataTotalVo; import com.ruoyi.order.domain.vo.MgtTotalOrderTotalVo; import com.ruoyi.order.service.order.OrderService; import com.ruoyi.system.api.domain.dto.MgtActivityAgeDto; import com.ruoyi.system.api.domain.dto.MgtBasePlatformDto; @@ -30,12 +33,14 @@ @RequestMapping("/mgt/total") public class MgtTotalController { @Resource private OrderService orderService; @RequestMapping(value = "/getTotalOrderTotal", method = RequestMethod.POST) @ApiOperation(value = "获取商户订单统计") public R<MgtTotalOrderTotalVo> getTotalOrderTotal(@RequestBody MgtBaseShopDto mgtBaseShopDto) { Long userId = SecurityUtils.getUserId(); mgtBaseShopDto.setUserId(userId); MgtTotalOrderTotalVo totalOrderTotalVo = orderService.getTotalOrderTotal(mgtBaseShopDto); ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java
@@ -10,10 +10,12 @@ import com.ruoyi.order.domain.pojo.order.Order; import com.ruoyi.order.domain.vo.*; import com.ruoyi.order.service.order.OrderService; import com.ruoyi.system.api.constant.DelayTaskEnum; import com.ruoyi.system.api.constant.SecurityConstant; import com.ruoyi.system.api.domain.dto.AppBaseGetDto; import com.ruoyi.system.api.domain.dto.AppMemberBindingDto; import com.ruoyi.system.api.domain.poji.member.Member; import com.ruoyi.system.api.service.RemoteConfigService; import com.ruoyi.system.api.service.RemoteMemberService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -45,6 +47,9 @@ @Resource private RedisService redisService; @Resource private RemoteConfigService remoteConfigService; @RequestMapping(value = "/buyGoods", method = RequestMethod.POST) @@ -170,6 +175,8 @@ Long userId = SecurityUtils.getUserId(); AppPlaceOrderVo appPlaceOrderVo = new AppPlaceOrderVo(); Order order = orderService.getById(appBaseGetDto.getId()); order.setOrderStatus(2); orderService.saveOrUpdate(order); appPlaceOrderVo.setOrderId(order.getOrderId()); appPlaceOrderVo.setOrderNo(order.getOrderNo()); appPlaceOrderVo.setPayType(order.getPayType()); @@ -178,7 +185,9 @@ if(redisService.hasKey(SecurityConstant.AUTO_CANCEL_ORDER_TIME)){ delayTime = redisService.getCacheObject(SecurityConstant.AUTO_CANCEL_ORDER_TIME); } appPlaceOrderVo.setPayDeadlineTime(DateUtils.addMinutes(order.getCreateTime(),delayTime)); redisService.deleteObject(DelayTaskEnum.ORDER_AUTOMATIC_CANCEL.getCode() + "-" + order.getOrderId()); remoteConfigService.deleteDelayTask(DelayTaskEnum.ORDER_AUTOMATIC_CANCEL.getCode() + "-" + order.getOrderId()); appPlaceOrderVo.setEndTime(DateUtils.addMinutes(order.getCreateTime(),delayTime)); return R.ok(appPlaceOrderVo); }
@@ -35,7 +35,7 @@ @ApiModelProperty(value = "支付截止时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date payDeadlineTime; private Date endTime; @ApiModelProperty(value = "appId") private String appId; @@ -61,4 +61,6 @@ @ApiModelProperty(value = "预支付回话标识") private String prepayId; } ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java
@@ -28,6 +28,7 @@ import com.ruoyi.system.api.service.RemoteMemberService; import com.ruoyi.system.api.service.RemoteShopService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.*; @@ -93,6 +94,7 @@ * @param merSureConsumerGoodsDto */ @Override @Transactional public void sureMerConsumerGoods(MerSureConsumerGoodsDto merSureConsumerGoodsDto){ List<MerSureConsumerGoodsListDto> merSureConsumerGoodsListDtoList = merSureConsumerGoodsDto.getMerSureConsumerGoodsListDtoList(); if(merSureConsumerGoodsListDtoList!=null && !merSureConsumerGoodsListDtoList.isEmpty()){ @@ -162,6 +164,7 @@ * @param merSureConsumerGoodsDto */ @Override @Transactional public void useMerConsumerGoods(MerSureConsumerGoodsDto merSureConsumerGoodsDto){ List<MerSureConsumerGoodsListDto> goodsList = merSureConsumerGoodsDto.getMerSureConsumerGoodsListDtoList(); if (goodsList != null && !goodsList.isEmpty()) { @@ -183,7 +186,7 @@ Integer experienceService = 0; Integer experiencePerson = 0; //获取会员商品总数 MerMemberConsumerGoodsTotalVo memberGoodsTotal = this.getMemberConsumerGoodsTotalVo(merSureConsumerGoodsDto.getUserId(), merSureConsumerGoodsDto.getShopId()); MerMemberConsumerGoodsTotalVo memberGoodsTotal = this.getMemberConsumerGoodsTotalVo(merSureConsumerGoodsDto.getMemberUserId(), merSureConsumerGoodsDto.getShopId()); for (MerSureConsumerGoodsListDto goodsDto : goodsList) { goods = this.getById(goodsDto.getConsumerGoodsId()); serviceNum = goods.getServiceNum(); @@ -254,7 +257,7 @@ userServiceRecordService.saveOrUpdate(serviceRecord); //更新商户和会员服务统计 MemberTotalChangeDto memberTotalChange = new MemberTotalChangeDto(); memberTotalChange.setUserId(merSureConsumerGoodsDto.getUserId()); memberTotalChange.setUserId(merSureConsumerGoodsDto.getMemberUserId()); memberTotalChange.setTypeService(2); memberTotalChange.setServiceCount(serviceCount); remoteMemberService.changeMemberTotal(memberTotalChange); @@ -393,13 +396,19 @@ //处理商品服务次数 switch (consumerGoods.getGoodsType()) { case 1: if(consumerGoods.getServiceNum()!=null){ cycleService = cycleService + consumerGoods.getServiceNum(); } break; case 2: if(consumerGoods.getServiceNum()!=null){ serviceService = serviceService + consumerGoods.getServiceNum(); } break; case 3: if(consumerGoods.getServiceNum()!=null) { experienceService = experienceService + consumerGoods.getServiceNum(); } break; default: break; ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -24,8 +24,6 @@ import com.ruoyi.order.service.order.OrderGoodsService; import com.ruoyi.order.service.order.OrderService; import com.ruoyi.order.service.order.UserServiceRecordService; import com.ruoyi.order.tools.request.ecommerce.profitsharing.ProfitSharingApplyRequest; import com.ruoyi.order.tools.service.ProfitsSharingService; import com.ruoyi.system.api.constant.AppErrorConstant; import com.ruoyi.system.api.constant.DelayTaskEnum; import com.ruoyi.system.api.constant.SecurityConstant; @@ -41,15 +39,12 @@ import com.ruoyi.system.api.domain.poji.sys.SysUser; import com.ruoyi.system.api.domain.vo.*; import com.ruoyi.system.api.service.*; import com.wechat.pay.java.core.Config; import com.wechat.pay.java.core.RSAConfig; import com.wechat.pay.java.service.partnerpayments.jsapi.model.Transaction; import com.wechat.pay.java.service.payments.jsapi.JsapiServiceExtension; import com.wechat.pay.java.service.payments.jsapi.model.*; import org.redisson.api.RLock; import org.redisson.api.RedissonClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.math.BigDecimal; @@ -110,8 +105,9 @@ @Resource private RedisService redisService; @Resource private ProfitsSharingService profitsSharingService; //@Resource //@Qualifier("profitsSharingServiceImpl") //private ProfitsSharingService profitsSharingService; @Autowired private RedissonClient redissonClient; @@ -304,7 +300,7 @@ if(entity.getCouponType()!=1){ appGoodsMemberCouponVoList.add(entity); }else{ if(entity.getMoneyThreshold().compareTo(sureOrderGoodsVo.getGoodsTotalPrice())>0){ if(entity.getMoneyThreshold().compareTo(sureOrderGoodsVo.getGoodsTotalPrice())<0){ appGoodsMemberCouponVoList.add(entity); } } @@ -466,6 +462,7 @@ * @return */ @Override @Transactional public AppPlaceOrderVo placeOrder(AppPlaceOrderDto appPlaceOrderDto) { // 获取用户ID Long userId = appPlaceOrderDto.getUserId(); @@ -706,7 +703,7 @@ profitsSharingService.combineTransactions(request);*/ //构建预下单支付对象 PrepayRequest request = new PrepayRequest(); /*PrepayRequest request = new PrepayRequest(); Amount amount = new Amount(); amount.setTotal(Integer.parseInt(order.getPayMoney().multiply(new BigDecimal(100)).toString())); request.setAmount(amount); @@ -717,7 +714,7 @@ request.setOutTradeNo(order.getOrderId()); Payer payer = new Payer(); payer.setOpenid("oLTPCuN5a-nBD4rAL_fa********"); request.setPayer(payer); request.setPayer(payer);*/ //返回前端唤醒支付结果信息 /*PrepayWithRequestPaymentResponse res = this.getJsApIResponse(request); appPlaceOrderVo.setAppId(this.appId); @@ -744,80 +741,8 @@ delayTask.setEndTime(DateUtils.addMinutes(new Date(),delayTime)); delayTask.setRedisKey(DelayTaskEnum.ORDER_AUTOMATIC_CANCEL.getCode() + "-" + orderId); remoteConfigService.addDelayTask(delayTask); appPlaceOrderVo.setPayDeadlineTime(DateUtils.addMinutes(order.getCreateTime(),delayTime)); appPlaceOrderVo.setEndTime(DateUtils.addMinutes(order.getCreateTime(),delayTime)); return appPlaceOrderVo; } /** * * 功能描述: 预下单，返回支付数据prePayId * * 构建对象参考 * PrepayRequest request = new PrepayRequest(); * Amount amount = new Amount(); * amount.setTotal(100); * request.setAmount(amount); * request.setAppid("wxa9d9651ae******"); * request.setMchid("190000****"); * request.setDescription("测试商品标题"); * request.setNotifyUrl("https://notify_url"); * request.setOutTradeNo("out_trade_no_001"); * Payer payer = new Payer(); * payer.setOpenid("oLTPCuN5a-nBD4rAL_fa********"); * request.setPayer(payer); * * @auther: linqingsong * @date: 2023/7/22 16:13 */ /*public String getPrePayId(PrepayRequest request) { Config config = new RSAConfig.Builder() .merchantId(merchantId) .privateKeyFromPath(privateKeyPath) .merchantSerialNumber(merchantSerialNumber) .wechatPayCertificatesFromPath(wechatPayCertificatePath) .build(); JsapiService service = new JsapiService.Builder().config(config).build(); PrepayResponse response = service.prepay(request); return response.getPrepayId(); }*/ /** * * 功能描述: 预下单，并返回前端需要换起支付的字符串 * * 构建对象参考 * * PrepayRequest request = new PrepayRequest(); * * Amount amount = new Amount(); * * amount.setTotal(100); * * request.setAmount(amount); * * request.setAppid("wxa9d9651ae******"); * * request.setMchid("190000****"); * * request.setDescription("测试商品标题"); * * request.setNotifyUrl("https://notify_url"); * * request.setOutTradeNo("out_trade_no_001"); * * Payer payer = new Payer(); * * payer.setOpenid("oLTPCuN5a-nBD4rAL_fa********"); * * request.setPayer(payer); * * * @auther: linqingsong * @date: 2023/7/22 16:53 */ public PrepayWithRequestPaymentResponse getJsApIResponse(PrepayRequest request){ Config config = new RSAConfig.Builder() .merchantId(merchantId) .privateKeyFromPath(privateKeyPath) .merchantSerialNumber(merchantSerialNumber) .wechatPayCertificatesFromPath(wechatPayCertificatePath) .build(); JsapiServiceExtension service = new JsapiServiceExtension.Builder().config(config).build(); PrepayWithRequestPaymentResponse response = service.prepayWithRequestPayment(request); return response; } @@ -829,6 +754,7 @@ * @date 2023/7/6 17:59 */ @Override @Transactional public AppPlaceOrderVo placeActivityOrder(AppPlaceActivityDto appPlaceActivityDto) { Long userId = appPlaceActivityDto.getUserId(); // 创建订单对象 @@ -1041,7 +967,7 @@ agStockChangeDto.setUserId(order.getUserId()); remoteActivityService.changeActivityStock(agStockChangeDto); // 调用支付 PrepayRequest request = new PrepayRequest(); /*PrepayRequest request = new PrepayRequest(); Amount amount = new Amount(); amount.setTotal(Integer.parseInt(order.getPayMoney().multiply(new BigDecimal(100)).toString())); request.setAmount(amount); @@ -1054,14 +980,14 @@ // TODO 获取openID payer.setOpenid("oLTPCuN5a-nBD4rAL_fa********"); request.setPayer(payer); request.setPayer(payer);*/ //设置订单允许分账 秒杀活动才允许分账 if(order.getOrderFrom()==2){ /*if(order.getOrderFrom()==2){ SettleInfo settleInfo=new SettleInfo(); settleInfo.setProfitSharing(true); request.setSettleInfo(settleInfo); } }*/ //返回前端唤醒支付结果信息 @@ -1087,7 +1013,7 @@ delayTask.setEndTime(DateUtils.addMinutes(new Date(),delayTime)); delayTask.setRedisKey(DelayTaskEnum.ORDER_AUTOMATIC_CANCEL.getCode() + "-" + orderId); remoteConfigService.addDelayTask(delayTask); appPlaceOrderVo.setPayDeadlineTime(DateUtils.addMinutes(order.getCreateTime(),delayTime)); appPlaceOrderVo.setEndTime(DateUtils.addMinutes(order.getCreateTime(),delayTime)); return appPlaceOrderVo; } @@ -1273,6 +1199,7 @@ * @return */ @Override @Transactional public MerVerifyOrderVo sureVerifyOrder(MerVerifyOrderDto merVerifyOrderDto) { String orderId = merVerifyOrderDto.getOrderId(); BigDecimal relReceiveMoney = merVerifyOrderDto.getRelReceiveMoney(); @@ -1371,6 +1298,7 @@ * @date 2023/6/28 11:26 */ @Override @Transactional public MerVerifyCouponVo sureVerifyCoupon(MerVerifyCouponDto merVerifyCouponDto) { MerVerifyCouponGetVo verifyCouponGetVo = remoteCouponService.getVerifyCoupon(merVerifyCouponDto.getMemberCouponId()).getData(); ShopRelUserVo shopRelUserVo = remoteShopService.getShopByUserId(merVerifyCouponDto.getUserId()).getData(); @@ -1464,6 +1392,7 @@ * @return MerVerifyAwardVo */ @Override @Transactional public MerVerifyAwardVo sureVerifyPrize(MerVerifyPrizeDto merVerifyPrizeDto){ MerVerifyAwardVo merVerifyAwardVo = new MerVerifyAwardVo(); MemberGiftRecord memberGiftRecord = remoteMemberService.getVerifyPrize(merVerifyPrizeDto.getPrizeId()).getData(); @@ -3217,6 +3146,7 @@ * @return void */ @Override @Transactional public void autoCancelOrder(String orderId){ //更新订单信息 Order order = this.getById(orderId); @@ -3271,10 +3201,11 @@ * @description 订单支付回调 * @author jqs * @date 2023/7/13 17:57 * @param Transaction * @param transaction * @return void */ @Override @Transactional public void payBack(Transaction transaction) { // 更新订单状态 String orderId=transaction.getOutTradeNo(); @@ -3387,11 +3318,11 @@ //活动订单进行分账 ProfitSharingApplyRequest request=new ProfitSharingApplyRequest(); /*ProfitSharingApplyRequest request=new ProfitSharingApplyRequest(); request.setAppid(this.appId); request.setSubMchid(""); request.setTransactionId(transaction.getTransactionId()); profitsSharingService.applyProfitSharing(request); profitsSharingService.applyProfitSharing(request);*/ } //生成支付记录 OrderPayment orderPayment = new OrderPayment(); @@ -3410,6 +3341,7 @@ * @return void */ @Override @Transactional public void refundOrder(String orderId){ //更新订单信息 Order order = this.getById(orderId); ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/auth/AutoUpdateInCloudCertificatesVerifier.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/auth/CacheService.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/auth/CloudCertificatesVerifier.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/config/ProfitsSharingConfig.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/constant/AccountType.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/GetPath.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/amount/AmountDayEndOfPlatformRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/amount/AmountDayEndOfSubMchRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/amount/AmountOnlineOfPlatformRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/amount/AmountOnlineOfSubMchRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/applyments/ApplymentsModifySettlementRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/applyments/ApplymentsRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/applyments/ApplymentsSettlementStatusRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/applyments/ApplymentsStatusRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/applyments/ApplymentsStatusRequest1.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/fund/WithdrawExceptionLogRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/fund/WithdrawForPlatformRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/fund/WithdrawForSubMchRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/fund/WithdrawStatusForPlatformRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/fund/WithdrawStatusForPlatformRequest1.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/fund/WithdrawStatusForSubMchRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/fund/WithdrawStatusForSubMchRequest1.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/profitsharing/ProfitSharingAddReceiverRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/profitsharing/ProfitSharingApplyRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/profitsharing/ProfitSharingFinishRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/profitsharing/ProfitSharingNotifyRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/profitsharing/ProfitSharingNotifyRequest1.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/profitsharing/ProfitSharingQueryApplyRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/profitsharing/ProfitSharingQueryRefundRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/profitsharing/ProfitSharingRefundRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/profitsharing/ProfitSharingRemoveReceiverRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/refunds/RefundApplyRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/refunds/RefundNotifyRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/refunds/RefundNotifyRequest1.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/refunds/RefundQueryStatusRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/refunds/RefundQueryStatusRequest1.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/subsidies/SubsidiesCancelRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/subsidies/SubsidiesCreateRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/ecommerce/subsidies/SubsidiesRefundRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/pay/bill/BillOfFundFlowRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/pay/bill/BillOfTradeRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/pay/combine/CombineTransactionsAppRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/pay/combine/CombineTransactionsCloseRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/pay/combine/CombineTransactionsDetailRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/pay/combine/CombineTransactionsJsRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/pay/combine/CombineTransactionsNotifyRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/pay/combine/CombineTransactionsNotifyRequest1.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/pay/combine/CombineTransactionsStatusRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/request/tool/ImageUploadRequest.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/AbstractResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/ecommerce/amount/AmountDayEndOfPlatformResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/ecommerce/amount/AmountDayEndOfSubMchResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/ecommerce/amount/AmountOnlineOfPlatformResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/ecommerce/amount/AmountOnlineOfSubMchResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/ecommerce/applyments/ApplymentsDownCertificatesResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/ecommerce/applyments/ApplymentsModifySettlementResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/ecommerce/applyments/ApplymentsResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/ecommerce/applyments/ApplymentsSettlementStatusResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/ecommerce/applyments/ApplymentsStatusResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/ecommerce/fund/WithdrawExceptionLogResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/ecommerce/fund/WithdrawForPlatformResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/ecommerce/fund/WithdrawForSubMchResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/ecommerce/fund/WithdrawStatusForPlatformResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/ecommerce/fund/WithdrawStatusForSubMchResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/ecommerce/profitsharing/ProfitSharingAddReceiverResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/ecommerce/profitsharing/ProfitSharingApplyResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/ecommerce/profitsharing/ProfitSharingFinishResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/ecommerce/profitsharing/ProfitSharingNotifyResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/ecommerce/profitsharing/ProfitSharingQueryApplyResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/ecommerce/profitsharing/ProfitSharingQueryRefundResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/ecommerce/profitsharing/ProfitSharingRefundResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/ecommerce/profitsharing/ProfitSharingRemoveReceiverResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/ecommerce/refunds/RefundApplyResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/ecommerce/refunds/RefundNotifyResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/ecommerce/refunds/RefundQueryStatusResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/ecommerce/subsidies/SubsidiesCancelResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/ecommerce/subsidies/SubsidiesCreateResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/ecommerce/subsidies/SubsidiesRefundResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/pay/bill/BillOfFundFlowResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/pay/bill/BillOfTradeResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/pay/combine/CombineTransactionsAppResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/pay/combine/CombineTransactionsCloseResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/pay/combine/CombineTransactionsJsResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/pay/combine/CombineTransactionsNotifyResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/pay/combine/CombineTransactionsStatusResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/response/tool/ImageUploadResponse.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/service/ProfitsSharingService.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/service/ProfitsSharingServiceEmptyImpl.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/service/ProfitsSharingServiceImpl.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/utils/BuilderDTOUtils.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/utils/DateFormatUtils.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/utils/HttpUtils.java
File was deleted ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/tools/utils/JsonUtils.java
File was deleted ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml
@@ -14,12 +14,12 @@ nacos: discovery: # 服务注册地址 #server-addr: 47.109.78.184:5000 server-addr: 127.0.0.1:8848 server-addr: 47.109.78.184:5000 #server-addr: 127.0.0.1:8848 config: # 配置中心地址 #server-addr: 47.109.78.184:5000 server-addr: 127.0.0.1:8848 server-addr: 47.109.78.184:5000 #server-addr: 127.0.0.1:8848 # 配置文件格式 file-extension: yml # 共享配置 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopInfoVo.java
@@ -49,15 +49,24 @@ @ApiModelProperty(value="签约区域") private String signAreaCode; @ApiModelProperty(value="签约区域全称") private String signAreaName; @ApiModelProperty(value="商户服务电话") private String shopServicePhone; @ApiModelProperty(value="管辖员工") private Long belongUserId; @ApiModelProperty(value="管辖员工") private String belongUserName; @ApiModelProperty(value="所属经销商") private Long belongShopId; @ApiModelProperty(value="所属经销商") private String belongShopName; @ApiModelProperty(value="扶持能力1.有2.没有") private Integer supportingCapacityFlag;
@@ -558,6 +558,14 @@ } mgtShopInfoVo.setShopTagIds(shopTagJs.toString()); } if(mgtShopInfoVo.getBelongUserId()!=null){ SysUser sysUser = sysUserService.getSysUser(mgtShopInfoVo.getBelongUserId()).getData(); mgtShopInfoVo.setBelongUserName(sysUser.getNickName()); } if(mgtShopInfoVo.getBelongShopId()!=null){ Shop belongShop = this.getByShopId(mgtShopInfoVo.getBelongShopId()); mgtShopInfoVo.setBelongShopName(belongShop.getShopName()); } //商户关联用户 List<ShopRelUser> shopRelUserList = shopRelUserService.listByShopId(shopId); if(shopRelUserList!=null&&!shopRelUserList.isEmpty()){ ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java
@@ -63,9 +63,17 @@ AgencyTask agencyTask = new AgencyTask(); String taskId = IdUtils.simpleUUID(); String nowTimeStr = DateUtils.getDate(); agencyTask.setTaskId(taskId); agencyTask.setDelFlag(0); int i = merCreateAgencyTaskDto.getTaskDate().compareTo(nowTimeStr); if(i>0){ agencyTask.setTaskStatus(0); }else if(i==0){ agencyTask.setTaskStatus(1); }else{ agencyTask.setTaskStatus(3); } agencyTask.setShopId(merCreateAgencyTaskDto.getShopId()); agencyTask.setAgencyId(merCreateAgencyTaskDto.getAgencyId()); agencyTask.setTaskDate(merCreateAgencyTaskDto.getTaskDate()); ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskServiceImpl.java
@@ -81,9 +81,18 @@ public void createMemberTask(MerCreateMemberTaskDto merCreateMemberTaskDto){ MemberTask memberTask = new MemberTask(); String taskId = IdUtils.simpleUUID(); String nowTimeStr = DateUtils.getDate(); memberTask.setTaskId(taskId); memberTask.setDelFlag(0); memberTask.setTaskStatus(0); int i = merCreateMemberTaskDto.getTaskDate().compareTo(nowTimeStr); if(i>0){ memberTask.setTaskStatus(0); }else if(i==0){ memberTask.setTaskStatus(1); }else{ memberTask.setTaskStatus(3); } memberTask.setShopId(merCreateMemberTaskDto.getShopId()); memberTask.setUserId(merCreateMemberTaskDto.getMemberUserId()); memberTask.setTaskDate(merCreateMemberTaskDto.getTaskDate()); ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml
@@ -14,12 +14,12 @@ nacos: discovery: # 服务注册地址 #server-addr: 47.109.78.184:5000 server-addr: 127.0.0.1:8848 server-addr: 47.109.78.184:5000 #server-addr: 127.0.0.1:8848 config: # 配置中心地址 #server-addr: 47.109.78.184:5000 server-addr: 127.0.0.1:8848 server-addr: 47.109.78.184:5000 #server-addr: 127.0.0.1:8848 # 配置文件格式 file-extension: yml # 共享配置 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
@@ -14,6 +14,7 @@ import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.api.constant.AppErrorConstant; import com.ruoyi.system.api.domain.dto.AppEditUserDto; import com.ruoyi.system.api.domain.dto.MgtFrozenMemberDto; import com.ruoyi.system.api.domain.poji.sys.SysDept; import com.ruoyi.system.api.domain.poji.sys.SysRole; import com.ruoyi.system.api.domain.poji.sys.SysUser; @@ -417,13 +418,13 @@ * @description 冻结用户 * @author jqs * @date 2023/6/29 17:20 * @param userId * @param mgtFrozenMemberDto * @return R<Activeness> */ @PostMapping("/frozenUser") public R frozenUser(@RequestBody Long userId) public R frozenUser(@RequestBody MgtFrozenMemberDto mgtFrozenMemberDto) { userService.frozenUser(userId); userService.frozenUser(mgtFrozenMemberDto); return R.ok(); }
@@ -11,6 +11,7 @@ import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.api.domain.dto.AppEditUserDto; import com.ruoyi.system.api.domain.dto.MgtBaseBathDto; import com.ruoyi.system.api.domain.dto.MgtFrozenMemberDto; import com.ruoyi.system.api.domain.dto.MgtUserIdByDept; import com.ruoyi.system.api.domain.poji.sys.SysRole; import com.ruoyi.system.api.domain.poji.sys.SysUser; @@ -712,15 +713,18 @@ * @description * @author jqs * @date 2023/7/5 21:24 * @param userId * @param mgtFrozenMemberDto * @return void */ @Override public void frozenUser(Long userId){ public void frozenUser(MgtFrozenMemberDto mgtFrozenMemberDto){ Long userId = mgtFrozenMemberDto.getUserId(); SysUser sysUser = this.selectUserById(userId); if(mgtFrozenMemberDto.getFrozenFlag()==1){ sysUser.setStatus("1"); }else{ sysUser.setStatus("0"); } userMapper.updateUser(sysUser); } } ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysUserService.java
@@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.system.api.domain.dto.AppEditUserDto; import com.ruoyi.system.api.domain.dto.MgtBaseBathDto; import com.ruoyi.system.api.domain.dto.MgtFrozenMemberDto; import com.ruoyi.system.api.domain.dto.MgtUserIdByDept; import com.ruoyi.system.api.domain.poji.sys.SysUser; import com.ruoyi.system.api.domain.vo.MgtSysSimpleUserVo; @@ -279,8 +280,8 @@ * @description 冻结用户 * @author jqs * @date 2023/7/5 21:24 * @param userId * @param mgtFrozenMemberDto * @return void */ void frozenUser(Long userId); void frozenUser(MgtFrozenMemberDto mgtFrozenMemberDto); } ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
@@ -14,12 +14,12 @@ nacos: discovery: # 服务注册地址 #server-addr: 47.109.78.184:5000 server-addr: 127.0.0.1:8848 server-addr: 47.109.78.184:5000 #server-addr: 127.0.0.1:8848 config: # 配置中心地址 #server-addr: 47.109.78.184:5000 server-addr: 127.0.0.1:8848 server-addr: 47.109.78.184:5000 #server-addr: 127.0.0.1:8848 # 配置文件格式 file-extension: yml # 共享配置 ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml
@@ -14,12 +14,12 @@ nacos: discovery: # 服务注册地址 #server-addr: 47.109.78.184:5000 server-addr: 127.0.0.1:8848 server-addr: 47.109.78.184:5000 #server-addr: 127.0.0.1:8848 config: # 配置中心地址 #server-addr: 47.109.78.184:5000 server-addr: 127.0.0.1:8848 server-addr: 47.109.78.184:5000 #server-addr: 127.0.0.1:8848 # 配置文件格式 file-extension: yml # 共享配置
