ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteMemberFallbackFactory.java
@@ -80,7 +80,7 @@ } @Override public R<List<MgtSimpleMemberVo>> listSimpleVoByIds(MgtBaseBathDto mgtBaseBathDto) { public R<List<MgtSimpleMemberVo>> listSimpleVoByIds(String userIds) { return R.fail("获取用户列表失败:" + throwable.getMessage()); }
@@ -105,7 +105,7 @@ * @date 2023/6/16 11:05 */ @PostMapping("/member/listSimpleVoByIds") public R<List<MgtSimpleMemberVo>> listSimpleVoByIds(@RequestBody MgtBaseBathDto mgtBaseBathDto); public R<List<MgtSimpleMemberVo>> listSimpleVoByIds(@RequestBody String userIds); /** * @param mgtUserIdByKeywordDto ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
@@ -284,11 +284,15 @@ if (R.FAIL == userResult.getCode()) { throw new ServiceException(userResult.getMsg()); } // ShopRelUserVo shopInfo = shopResult.getData(); // if(null == shopInfo){ // throw new ServiceException("未查询到商户信息"); // } // userInfo.setShopId(shopInfo.getShopId()); ShopRelUserVo shopInfo = shopResult.getData(); if(null == shopInfo){ throw new ServiceException("未查询到商户信息"); if(null != shopInfo){ userInfo.setShopId(shopInfo.getShopId()); } userInfo.setShopId(shopInfo.getShopId()); recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功",Constants.FROM_SHOP); return userInfo; } ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
@@ -509,7 +509,7 @@ MgtBaseBathDto mgtBaseBathDto = new MgtBaseBathDto(); mgtBaseBathDto = new MgtBaseBathDto(); mgtBaseBathDto.setIds(userJoinedString); List<MgtSimpleMemberVo> simpleMemberVoList = remoteMemberService.listSimpleVoByIds(mgtBaseBathDto).getData(); List<MgtSimpleMemberVo> simpleMemberVoList = remoteMemberService.listSimpleVoByIds(userJoinedString).getData(); Map<Long, MgtSimpleMemberVo> userMap = simpleMemberVoList.stream() .collect(Collectors.toMap(MgtSimpleMemberVo::getUserId, Function.identity())); for (MgtActivityRecordPageVo mgtActivityRecordPageVo : activityRecordPageVoList) { ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java
@@ -167,9 +167,8 @@ * @return R<List<MgtSimpleMemberVo>> */ @PostMapping("/listSimpleVoByIds") public R<List<MgtSimpleMemberVo>> listSimpleVoByIds(@RequestBody MgtBaseBathDto mgtBaseBathDto) { List<MgtSimpleMemberVo> simpleMemberVoList = memberService.listSimpleVoByIds(mgtBaseBathDto.getIds()); public R<List<MgtSimpleMemberVo>> listSimpleVoByIds(@RequestBody String userIds) {List<MgtSimpleMemberVo> simpleMemberVoList = memberService.listSimpleVoByIds(userIds); return R.ok(simpleMemberVoList); }
@@ -20,6 +20,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.math.BigInteger; import java.util.List; import java.util.stream.Collectors; @@ -117,13 +118,15 @@ Long userId = SecurityUtils.getUserId(); mgtShopOrderPageDto.setUserId(userId); Page<MgtActivityOrderPageVo> page = new Page<>(); if(mgtShopOrderPageDto.getPageSize() > 5000){ page.setSize(5000); page.setCurrent(1); }else{ page.setSize(mgtShopOrderPageDto.getPageSize()); page.setCurrent(mgtShopOrderPageDto.getPageNum()); } // if(mgtShopOrderPageDto.getPageSize() > 5000){ // page.setSize(5000); // page.setCurrent(1); // }else{ // page.setSize(mgtShopOrderPageDto.getPageSize()); // page.setCurrent(mgtShopOrderPageDto.getPageNum()); // } page.setSize(Integer.MAX_VALUE); page.setCurrent(1); List<MgtActivityOrderPageVo> mgtActivityOrderPageVos = orderService.pageMgtActivityOrder(page,mgtShopOrderPageDto); ExcelUtil<MgtActivityOrderPageVo> util = new ExcelUtil<MgtActivityOrderPageVo>(MgtActivityOrderPageVo.class); util.exportExcel(response, mgtActivityOrderPageVos, "秒杀订单列表"); @@ -147,13 +150,8 @@ Long userId = SecurityUtils.getUserId(); mgtShopOrderPageDto.setUserId(userId); Page<MgtShopOrderPageVo> page = new Page<>(); if(mgtShopOrderPageDto.getPageSize() > 5000){ page.setSize(5000); page.setCurrent(1); }else{ page.setSize(mgtShopOrderPageDto.getPageSize()); page.setCurrent(mgtShopOrderPageDto.getPageNum()); } page.setSize(Integer.MAX_VALUE); page.setCurrent(1); List<MgtShopOrderPageVo> shopOrderPageVoList = orderService.pageMgtShopOrder(page,mgtShopOrderPageDto); ExcelUtil<MgtShopOrderPageVo> util = new ExcelUtil<MgtShopOrderPageVo>(MgtShopOrderPageVo.class); util.exportExcel(response, shopOrderPageVoList, "门店订单列表"); ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -2890,7 +2890,7 @@ // 根据用户ID列表获取用户信息 MgtBaseBathDto mgtBaseBathDto = new MgtBaseBathDto(); mgtBaseBathDto.setIds(userIdSj.toString()); List<MgtSimpleMemberVo> simpleMemberVoList = remoteMemberService.listSimpleVoByIds(mgtBaseBathDto).getData(); List<MgtSimpleMemberVo> simpleMemberVoList = remoteMemberService.listSimpleVoByIds(userIdSj.toString()).getData(); Map<Long, MgtSimpleMemberVo> userMap = simpleMemberVoList.stream() .collect(Collectors.toMap(MgtSimpleMemberVo::getUserId, Function.identity())); // 遍历订单列表，设置用户信息 @@ -3050,13 +3050,14 @@ .collect(Collectors.toMap(MgtSimpleShopVo::getShopId, Function.identity())); mgtBaseBathDto = new MgtBaseBathDto(); mgtBaseBathDto.setIds(userJoinedString); List<MgtSimpleMemberVo> simpleMemberVoList = remoteMemberService.listSimpleVoByIds(mgtBaseBathDto).getData(); List<MgtSimpleMemberVo> simpleMemberVoList = remoteMemberService.listSimpleVoByIds(userJoinedString).getData(); Map<Long, MgtSimpleMemberVo> userMap = simpleMemberVoList.stream() .collect(Collectors.toMap(MgtSimpleMemberVo::getUserId, Function.identity())); // 遍历列表，设置店铺名称、用户名称和未支付金额 for (MgtActivityOrderPageVo mgtActivityOrderPageVo : activityOrderPageVoList) { if(mgtActivityOrderPageVo.getShopId()!=null){ mgtActivityOrderPageVo.setShopName(shopMap.get(mgtActivityOrderPageVo.getShopId()).getShopName()); MgtSimpleShopVo mgtSimpleShopVo = shopMap.get(mgtActivityOrderPageVo.getShopId()); mgtActivityOrderPageVo.setShopName(null == mgtSimpleShopVo ? "" : mgtSimpleShopVo.getShopName()); } if (userMap.get(mgtActivityOrderPageVo.getUserId()) != null) { @@ -3175,7 +3176,7 @@ String userJoinedString = String.join(",", userIdSet.stream().map(Object::toString).collect(Collectors.toList())); MgtBaseBathDto mgtBaseBathDto = new MgtBaseBathDto(); mgtBaseBathDto.setIds(userJoinedString); List<MgtSimpleMemberVo> simpleMemberVoList = remoteMemberService.listSimpleVoByIds(mgtBaseBathDto).getData(); List<MgtSimpleMemberVo> simpleMemberVoList = remoteMemberService.listSimpleVoByIds(userJoinedString).getData(); userMap = simpleMemberVoList.stream() .collect(Collectors.toMap(MgtSimpleMemberVo::getUserId, Function.identity())); } @@ -3918,7 +3919,7 @@ mgtTotalOrderTotalVo.setOrderTotal(totalOrderTotalVo.getOrderTotal()); mgtTotalOrderTotalVo.setOnlineTotal(totalOrderTotalVo.getOnlineTotal()); mgtTotalOrderTotalVo.setOfflineTotal(totalOrderTotalVo.getOfflineTotal()); mgtTotalOrderTotalVo.setActivityTotal(0); mgtTotalOrderTotalVo.setActivityTotal(totalOrderTotalVo.getActivityTotal()); mgtTotalOrderTotalVo.setOrderMoney(totalOrderTotalVo.getOrderMoney()); mgtTotalOrderTotalVo.setOnlineMoney(totalOrderTotalVo.getOnlineMoney()); mgtTotalOrderTotalVo.setOfflineMoney(totalOrderTotalVo.getOfflineMoney()); @@ -5053,7 +5054,7 @@ String userJoinedString = String.join(",", userIdSet.stream().map(Object::toString).collect(Collectors.toList())); MgtBaseBathDto mgtBaseBathDto = new MgtBaseBathDto(); mgtBaseBathDto.setIds(userJoinedString); List<MgtSimpleMemberVo> simpleMemberVoList = remoteMemberService.listSimpleVoByIds(mgtBaseBathDto).getData(); List<MgtSimpleMemberVo> simpleMemberVoList = remoteMemberService.listSimpleVoByIds(userJoinedString).getData(); userMap = simpleMemberVoList.stream() .collect(Collectors.toMap(MgtSimpleMemberVo::getUserId, Function.identity())); } @@ -5113,6 +5114,9 @@ try { redissonLock.lock(30, TimeUnit.SECONDS); Integer surpNum = redisService.getCacheObject(SecurityConstant.ACTIVITY_GOODS + "-" + order.getActivityId() + "-" + orderGoods.getGoodsId()); if(null == surpNum){ surpNum = 0; } redisService.setCacheObject(SecurityConstant.ACTIVITY_GOODS + "-" + order.getActivityId() + "-" + orderGoods.getGoodsId(), surpNum + orderGoods.getBuyNum()); } finally { redissonLock.unlock(); @@ -5374,6 +5378,9 @@ try { redissonLock.lock(30, TimeUnit.SECONDS); Integer surpNum = redisService.getCacheObject(SecurityConstant.ACTIVITY_GOODS + "-" + order.getActivityId() + "-" + orderGoods.getGoodsId()); if(null == surpNum){ surpNum = 0; } redisService.setCacheObject(SecurityConstant.ACTIVITY_GOODS + "-" + order.getActivityId() + "-" + orderGoods.getGoodsId(), surpNum + orderGoods.getBuyNum()); } finally { redissonLock.unlock(); @@ -6107,6 +6114,9 @@ try { redissonLock.lock(30, TimeUnit.SECONDS); Integer surpNum = redisService.getCacheObject(SecurityConstant.ACTIVITY_GOODS + "-" + order.getActivityId() + "-" + orderGoods.getGoodsId()); if(null == surpNum){ surpNum = 0; } redisService.setCacheObject(SecurityConstant.ACTIVITY_GOODS + "-" + order.getActivityId() + "-" + orderGoods.getGoodsId(), surpNum + orderGoods.getBuyNum()); } finally { redissonLock.unlock(); @@ -6186,7 +6196,7 @@ // 获取用户列表 MgtBaseBathDto mgtBaseBathDto = new MgtBaseBathDto(); mgtBaseBathDto.setIds(userIdSj.toString()); List<MgtSimpleMemberVo> simpleMemberVoList = remoteMemberService.listSimpleVoByIds(mgtBaseBathDto).getData(); List<MgtSimpleMemberVo> simpleMemberVoList = remoteMemberService.listSimpleVoByIds(userIdSj.toString()).getData(); // 将用户列表转换为Map，以便根据用户ID快速查找用户信息 Map<Long, MgtSimpleMemberVo> userMap = simpleMemberVoList.stream() .collect(Collectors.toMap(MgtSimpleMemberVo::getUserId, Function.identity())); ruoyi-modules/ruoyi-order/src/test/java/com/ruoyi/order/orderTest.java
@@ -1,7 +1,11 @@ //package com.ruoyi.order; // //import com.baomidou.mybatisplus.extension.plugins.pagination.Page; //import com.ruoyi.common.security.utils.SecurityUtils; //import com.ruoyi.order.domain.dto.MerVerifyOrderDto; //import com.ruoyi.order.domain.dto.MgtShopOrderPageDto; //import com.ruoyi.order.domain.vo.MerVerifyOrderVo; //import com.ruoyi.order.domain.vo.MgtActivityOrderPageVo; //import com.ruoyi.order.service.order.OrderService; //import com.ruoyi.system.api.domain.dto.MgtBaseShopDto; //import org.junit.Test; @@ -11,6 +15,7 @@ // //import javax.annotation.Resource; //import java.math.BigDecimal; //import java.util.List; // ///** // * @ClassName orderTest @@ -29,13 +34,13 @@ // // @Test // public void main() { // MerVerifyOrderDto merVerifyOrderDto = new MerVerifyOrderDto(); // merVerifyOrderDto.setOrderId("ca505a758e0743af83a34a17481a093f"); // merVerifyOrderDto.setShopId(52L); // merVerifyOrderDto.setRelReceiveMoney(new BigDecimal(0.100000000001)); // merVerifyOrderDto.setRelPayMoney(new BigDecimal(0)); // merVerifyOrderDto.setUserId(164L); // MerVerifyOrderVo merVerifyOrderVo = orderService.sureVerifyOrder(merVerifyOrderDto); // MgtShopOrderPageDto mgtShopOrderPageDto = new MgtShopOrderPageDto(); // Long userId = SecurityUtils.getUserId(); // mgtShopOrderPageDto.setUserId(userId); // Page<MgtActivityOrderPageVo> page = new Page<>(); // page.setSize(Integer.MAX_VALUE); // page.setCurrent(1); // List<MgtActivityOrderPageVo> mgtActivityOrderPageVos = orderService.pageMgtActivityOrder(page,mgtShopOrderPageDto); // // } // ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
@@ -336,7 +336,7 @@ @RequestMapping(value = "/mgtShopHFTXAuth", method = RequestMethod.POST) @Log(title = "商户进件管理", businessType = BusinessType.UPDATE,operContent = "商户进件") @ApiOperation(value = "平台商户进件（汇付天下）") public R mgtShopHFTXAuth(@Validated @RequestBody MgtShopHFTXAuthDto mgtShopHFTXAuthDto) { public R mgtShopHFTXAuth(@RequestBody MgtShopHFTXAuthDto mgtShopHFTXAuthDto) { Long userId = SecurityUtils.getUserId(); mgtShopHFTXAuthDto.setUserId(userId); shopService.mgtShopHFTXAuth(mgtShopHFTXAuthDto); ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
@@ -905,21 +905,9 @@ } } //分别查询 StaffHomeShopTotalVo staffHomeShopTotalVo = new StaffHomeShopTotalVo(); if(userIds!=null&&!userIds.isEmpty()){ staffHomeShopTotalVo = shopMapper.getStaffHomeTotal(userIds); }else{ staffHomeShopTotalVo.setShopTotal(0); staffHomeShopTotalVo.setAgencyTotal(0); staffHomeShopTotalVo.setDealerTotal(0); } Integer shopTaskCount = 0; if(shopIds!=null&&!shopIds.isEmpty()){ shopTaskCount = shopTaskService.getShopIngTotal(shopIds); } StaffHomeShopTotalVo staffHomeShopTotalVo = shopMapper.getStaffHomeTotal(userIds); Integer shopTaskCount = shopTaskService.getShopIngTotal(shopIds); staffHomeShopTotalVo.setFollowMember(0); staffHomeShopTotalVo.setNewMember(0); staffHomeShopTotalVo.setShopTask(shopTaskCount); @@ -1172,15 +1160,12 @@ shopAuthenticationHftx = new ShopAuthenticationHftx(); shopAuthenticationHftx.setIsDelete(0); shopAuthenticationHftx.setInsertTime(new Date()); shopAuthenticationHftx.setAuditStatus("U"); } String auditStatus = shopAuthenticationHftx.getAuditStatus(); BeanUtils.copyProperties(mgtShopHFTXAuthDto, shopAuthenticationHftx); shopAuthenticationHftx.setReqSeqId(IdUtils.simpleUUID()); if(Arrays.asList("N", "F").contains(shopAuthenticationHftx.getAuditStatus())){ shopAuthenticationHftx.setAuditStatus(""); shopAuthenticationHftx.setAuditDesc(""); } shopAuthenticationHftx.setAuditStatus(""); shopAuthenticationHftx.setAuditDesc(""); /** * 开始调起进件接口 */ @@ -1517,12 +1502,11 @@ userIdList.add(userId); } StaffShopSimpleTotalVo shopTotal = shopMapper.getStaffSimpleTotal(1,userIdList); StaffShopSimpleTotalVo agencyTotal = shopMapper.getStaffSimpleTotal(2,userIdList); shopTotal.setAgencyTotal(agencyTotal.getShopTotal()); shopTotal.setOpenAgencyTotal(agencyTotal.getOpenShopTotal()); shopTotal.setCloseAgencyTotal(agencyTotal.getCloseAgencyTotal()); shopTotal.setCloseAgencyTotal(agencyTotal.getCloseShopTotal()); return shopTotal; }
@@ -944,10 +944,12 @@ SUM(CASE shop_status WHEN 1 THEN 1 ELSE 0 END) openShopTotal FROM t_shop ts WHERE ts.del_flag = 0 AND ts.shop_type = #{shopType} AND ts.belong_user_id IN <foreach item="id" collection="userIdList" open="(" separator="," close=")"> #{id} </foreach> <if test="null != userIdList"> AND ts.belong_user_id IN <foreach item="id" collection="userIdList" open="(" separator="," close=")"> #{id} </foreach> </if> </select> <select id="getStaffHomeTotal" resultType="com.ruoyi.shop.domain.vo.StaffHomeShopTotalVo"> @@ -957,10 +959,12 @@ SUM(CASE shop_type WHEN 2 THEN 1 ELSE 0 END) agencyTotal FROM t_shop ts WHERE ts.del_flag = 0 AND ts.belong_user_id IN <foreach item="id" collection="userIdList" open="(" separator="," close=")"> #{id} </foreach> <if test="null != userIdList"> AND ts.belong_user_id IN <foreach item="id" collection="userIdList" open="(" separator="," close=")"> #{id} </foreach> </if> </select> <update id="updateExtendContacts">
