ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppCouponClient.java
@@ -9,6 +9,7 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.web.page.PageInfo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -25,15 +26,15 @@ * 管理后台远程调用 根据优惠券ids 查询对应的发放数量 * @return 优惠券ids 查询每个优惠券的发放数量 */ @PostMapping("/t-app-coupon/getCountByCouponIds") public R<List<Integer>> getCountByCouponIds(String couponIds); @PostMapping("/t-app-coupon/getCountByCouponIds/{couponIds}") public R<List<Integer>> getCountByCouponIds(@PathVariable("couponIds") String couponIds); /** * 管理后台远程调用 根据优惠券id 查询对应的使用数量 * @param couponId * @return */ @PostMapping("/t-app-coupon/getUseCountByCouponId") public R<Integer> getUseCountByCouponId(Integer couponId); @PostMapping("/t-app-coupon/getUseCountByCouponId/{couponId}") public R<Integer> getUseCountByCouponId(@PathVariable("couponId")Integer couponId); /** * 后台远程调用 根据优惠券id 查询领取记录 * @param couponId ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/ChargingPileFallbackFactory.java
@@ -41,6 +41,11 @@ public R<SiteInfoVO> getSiteInfoByNumber(String number) { return R.fail("通过桩编号获取电站信息失败:"+throwable.getMessage()); } @Override public R<TChargingPile> getChargingPileById(Integer id) { return R.fail(throwable.getMessage()); } }; } } ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TRoleSite.java
@@ -24,7 +24,7 @@ @EqualsAndHashCode(callSuper = false) @TableName("t_role_site") @ApiModel(value="TRoleSite对象", description="") public class TRoleSite extends BasePojo { public class TRoleSite { private static final long serialVersionUID = 1L;
@@ -24,7 +24,7 @@ @EqualsAndHashCode(callSuper = false) @TableName("t_user_site") @ApiModel(value="TUserSite对象", description="") public class TUserSite extends BasePojo { public class TUserSite { private static final long serialVersionUID = 1L;
@@ -76,5 +76,5 @@ */ public static final int PASSWORD_MIN_LENGTH = 5; public static final int PASSWORD_MAX_LENGTH = 20; public static final int PASSWORD_MAX_LENGTH = 40; } ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -25,6 +25,7 @@ import com.ruoyi.system.domain.vo.CompanyUserVo; import com.ruoyi.system.domain.vo.TCompanyToUserVo; import com.ruoyi.system.query.GetSysUserList; import com.ruoyi.system.query.ShopUserStart; import com.ruoyi.system.service.*; import io.seata.spring.annotation.GlobalTransactional; import io.swagger.annotations.Api; @@ -292,14 +293,14 @@ @PostMapping("/shopUserStart") @ApiOperation(value = "账号管理--禁用/启用", tags = {"管理后台-系统用户管理"}) public AjaxResult shopUserStart(@RequestParam("userId") Long userId, @RequestParam("remark") String remark) { if (userId == null) { public AjaxResult shopUserStart(@RequestBody ShopUserStart shopUserStart) { if (shopUserStart.getUserId() == null) { return AjaxResult.error("userId不能为空"); } SysUser sysUser = userService.selectUserById(userId); SysUser sysUser = userService.selectUserById(shopUserStart.getUserId()); if (sysUser.getStatus().equals("0")) { sysUser.setStatus("1"); sysUser.setRemark(remark); sysUser.setRemark(shopUserStart.getRemark()); } else { sysUser.setStatus("0"); sysUser.setRemark(""); ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -21,6 +21,7 @@ import com.ruoyi.system.domain.SysUserRole; import com.ruoyi.system.query.GetSysUserList; import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysUserRoleService; import com.ruoyi.system.service.ISysUserService; import org.slf4j.Logger; @@ -86,6 +87,9 @@ @Resource private SiteClient siteClient; @Resource private ISysRoleService sysRoleService; @@ -578,18 +582,30 @@ for (SysUser sysUser : list) { List<SysUserRole> list1 = sysUserRoleService.list(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, sysUser.getUserId())); List<Integer> data1 = userSiteClient.getSiteIds(sysUser.getUserId()).getData(); if(null == data1){ data1 = new ArrayList<>(); } for (SysUserRole sysUserRole : list1) { List<Integer> data = roleSiteClient.getSiteIds(sysUserRole.getRoleId()).getData(); if (null == data){ continue; } data1.addAll(data); } Set<Integer> siteIds = new HashSet<>(data1); sysUser.setSiteIds(siteIds.stream().collect(Collectors.toList())); List<Site> data = siteClient.getSiteByIds(siteIds.stream().collect(Collectors.toList())).getData(); List<String> siteNames = data.stream().map(Site::getName).collect(Collectors.toList()); sysUser.setSiteNames(siteNames); Set<Long> collect = list1.stream().map(SysUserRole::getRoleId).collect(Collectors.toSet()); List<SysRole> sysRoles = roleMapper.selectBatchIds(collect); List<String> roleNames = sysRoles.stream().map(SysRole::getRoleName).collect(Collectors.toList()); if(null != data){ List<String> siteNames = data.stream().map(Site::getName).collect(Collectors.toList()); sysUser.setSiteNames(siteNames); } List<String> roleNames = new ArrayList<>(); for (SysUserRole sysUserRole : list1) { SysRole sysRole = sysRoleService.selectRoleById(sysUserRole.getRoleId()); roleNames.add(sysRole.getRoleName()); } Long[] roleIds = new Long[]{}; sysUser.setRoleIds(list1.stream().map(SysUserRole::getRoleId).collect(Collectors.toList()).toArray(roleIds)); sysUser.setRoleNames(roleNames); } return pageInfo.setRecords(list); ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
@@ -144,8 +144,8 @@ * 管理后台远程调用 根据优惠券ids 查询对应的发放数量 * @return 优惠券ids 查询每个优惠券的发放数量 */ @PostMapping("/getCountByCouponIds") public R<List<Integer>> getCountByCouponIds( String couponIds) { @PostMapping("/getCountByCouponIds/{couponIds}") public R<List<Integer>> getCountByCouponIds(@PathVariable("couponIds")String couponIds) { // 最终结果 和优惠券id一一对应 List<Integer> res = new ArrayList<>(); String[] split = couponIds.split(","); @@ -164,8 +164,8 @@ * @param couponId * @return */ @PostMapping("/getUseCountByCouponId") public R<Integer> getUseCountByCouponId(Integer couponId){ @PostMapping("/getUseCountByCouponId/{couponId}") public R<Integer> getUseCountByCouponId(@PathVariable("couponId") Integer couponId){ return R.ok(tAppCouponService.list(new QueryWrapper<TAppCoupon>() .eq("coupon_id", couponId) .eq("status",2)).size()); ruoyi-service/ruoyi-account/src/main/resources/mapper/account/TAppCouponMapper.xml
@@ -43,13 +43,13 @@ AND t2.phone LIKE concat('%',#{req.phone}, '%') </if> <if test="req.status != null and req.status = 1"> AND t1.status =1 and t1.endTime >= now() AND t1.status =1 and t1.end_time >= now() </if> <if test="req.status != null and req.status = 2"> AND t1.status =2 </if> <if test="req.status != null and req.status = 3"> AND t1.status =1 and t1.endTime <= now() and t1.del_flag = 0 AND t1.status =1 and t1.end_time <= now() and t1.del_flag = 0 </if> <if test="req.status != null and req.status = 4"> AND t1.del_flag = 0 ruoyi-service/ruoyi-account/src/main/resources/mybatis-config.xml
@@ -10,7 +10,7 @@ <setting name="cacheEnabled" value="true"/> <!-- 延迟加载的全局开关。当开启时，所有关联对象都会延迟加载。默认 false --> <!-- <setting name="lazyLoadingEnabled" value="true"/> --> <setting name="mapUnderscoreToCamelCase" value="false"/><!--是否将map下划线方式转为驼峰式命名--> <setting name="mapUnderscoreToCamelCase" value="true"/><!--是否将map下划线方式转为驼峰式命名--> <!-- 当开启时，任何方法的调用都会加载该对象的所有属性。默认 false，可通过select标签的 fetchType来覆盖--> <!-- <setting name="aggressiveLazyLoading" value="false"/>--> <!-- Mybatis 创建具有延迟加载能力的对象所用到的代理工具，默认JAVASSIST --> ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
@@ -69,7 +69,7 @@ @ApiOperation(tags = {"后台-申请表单-申请建桩"},value = "导出") @PostMapping(value = "/export") @PutMapping(value = "/export") public R export() { return R.ok(); } ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java
@@ -132,7 +132,7 @@ /** * 根据id获取商品信息 * @param id * @return * @return1 */ @PostMapping("/getGoodsById/{id}") public R<TGoods> getGoodsById(@PathVariable Integer id){ ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TCouponServiceImpl.java
@@ -35,13 +35,15 @@ for (TCoupon tCoupon : list) { couponIds.append(tCoupon.getId()).append(","); } if (StringUtils.hasLength(couponIds)){ // 去除最后一个字符 couponIds.deleteCharAt(couponIds.length()-1); } List<Integer> data = appCouponClient.getCountByCouponIds(couponIds.toString()).getData(); for (int i = 0; i < list.size(); i++) { list.get(i).setCount(data.get(i)); if (!list.isEmpty()){ if (StringUtils.hasLength(couponIds)){ // 去除最后一个字符 couponIds.deleteCharAt(couponIds.length()-1); } List<Integer> data = appCouponClient.getCountByCouponIds(couponIds.toString()).getData(); for (int i = 0; i < list.size(); i++) { list.get(i).setCount(data.get(i)); } } pageInfo.setRecords(list); return pageInfo;
