ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java
@@ -61,7 +61,7 @@ ShopGoods shopGoods = shopGoodsService.getByShopIdAndGoodsId(merGoodsPageDto.getShopId(), merGoodsPageVo.getGoodsId()); //经销商不限制修改价格权限 if(1 == shop.getShopType()){ merGoodsPageVo.setModifyPricePermission(1); merGoodsPageVo.setModifyPricePermission(shop.getModifyPricePermission()); merGoodsPageVo.setIsUnifiedPrice(0); if (null != shopGoods) { merGoodsPageVo.setIsUnifiedPrice(1); @@ -69,15 +69,21 @@ merGoodsPageVo.setUnifiedServerNum(shopGoods.getServiceNum()); } }else{ //后台开启经销商统一售价，且经销商设置了统一售价，加盟商不能修改价格 if (1 == shop.getModifyPricePermission() && null != shopGoods) { Shop shop1 = remoteShopService.getShop(shop.getBelongShopId()).getData(); ShopGoods shopGoods1 = shopGoodsService.getByShopIdAndGoodsId(shop1.getShopId(), merGoodsPageVo.getGoodsId()); //经销商设置了统一售价 if(null != shopGoods1){ merGoodsPageVo.setModifyPricePermission(0); merGoodsPageVo.setIsUnifiedPrice(1); merGoodsPageVo.setUnifiedPrice(shopGoods.getSalesPrice()); merGoodsPageVo.setUnifiedServerNum(shopGoods.getServiceNum()); } else { merGoodsPageVo.setUnifiedPrice(shopGoods1.getSalesPrice()); merGoodsPageVo.setUnifiedServerNum(shopGoods1.getServiceNum()); }else{ merGoodsPageVo.setModifyPricePermission(1); merGoodsPageVo.setIsUnifiedPrice(0); if(null != shopGoods){ merGoodsPageVo.setUnifiedPrice(shopGoods.getSalesPrice()); merGoodsPageVo.setUnifiedServerNum(shopGoods.getServiceNum()); } } }
@@ -56,13 +56,13 @@ shopId = member.getRelationShopId(); } } Page<AppActivityPageVo> page = new Page<>(); if(shopId==null){ throw new ServiceException(AppErrorConstant.NO_POSITION); return R.ok(page); } // if(member!=null&&member.getBindingFlag()==0){ // shopId = null; // } Page<AppActivityPageVo> page = new Page<>(); page.setSize(appPageDto.getPageSize()); page.setCurrent(appPageDto.getPageNum()); List<AppActivityPageVo> activityPageVoList = activityService.pageAppActivity(page,shopId); ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java
@@ -473,7 +473,7 @@ * @param shopId * @return MerHomeShopTotalVo */ MerHomeShopTotalVo getMerHomeShopServiceTotalVo(Long shopId); MerHomeShopTotalVo getMerHomeShopServiceTotalVo(@Param("shopId") Long shopId, @Param("userIds") List<Long> userIds);
@@ -1768,7 +1768,13 @@ //获取待处理订单和营业额 merHomeShopTotalVo = orderMapper.getMerHomeShopTotalVo(shopId); //获取服务统计 MerHomeShopTotalVo serviceTotalVo = orderMapper.getMerHomeShopServiceTotalVo(shopId); List<Long> userIds = remoteMemberService.listUserIdByShopId(Collections.singletonList(shopId)).getData(); if(userIds.isEmpty()){ userIds.add(0L); } log.info("查询首页数据参数：" + userIds.toString()); MerHomeShopTotalVo serviceTotalVo = orderMapper.getMerHomeShopServiceTotalVo(shopId, userIds); log.info("查询首页数据：" + serviceTotalVo.toString()); merHomeShopTotalVo.setTodayShop(todayShop.size()); merHomeShopTotalVo.setCycleSurp(serviceTotalVo.getCycleSurp()); merHomeShopTotalVo.setExplorationSurp(serviceTotalVo.getExplorationSurp()); @@ -7254,7 +7260,11 @@ */ @Override public MerHomeShopTotalVo getShopServiceTotal(Long shopId){ MerHomeShopTotalVo serviceTotalVo = orderMapper.getMerHomeShopServiceTotalVo(shopId); List<Long> userIds = remoteMemberService.listUserIdByShopId(Arrays.asList(shopId)).getData(); if(userIds.isEmpty()){ userIds.add(0L); } MerHomeShopTotalVo serviceTotalVo = orderMapper.getMerHomeShopServiceTotalVo(shopId, userIds); return serviceTotalVo; }
@@ -1703,7 +1703,10 @@ COUNT(DISTINCT CASE WHEN goods_type = 1 THEN user_id END) cycleSurp, COUNT(DISTINCT CASE WHEN goods_type = 3 THEN user_id END) explorationSurp FROM t_consumer_goods WHERE del_flag = 0 AND shop_id = #{shopId} AND cycle_num_flag = 1 AND service_status = 1 WHERE del_flag = 0 AND shop_id = #{shopId} AND cycle_num_flag = 1 AND (ifnull(service_num, 0) - used_num) > 0 and user_id in <foreach collection="userIds" item="item" index="index" open="(" separator="," close=")"> #{item} </foreach> </select> <select id="getMerHomeShopsTotalVo" resultType="com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo"> ruoyi-modules/ruoyi-order/src/test/java/com/ruoyi/order/orderTest.java
@@ -9,9 +9,11 @@ //import com.ruoyi.order.domain.vo.AppSureOrderVo; //import com.ruoyi.order.domain.vo.MerVerifyOrderVo; //import com.ruoyi.order.domain.vo.MgtActivityOrderPageVo; //import com.ruoyi.order.mapper.order.OrderMapper; //import com.ruoyi.order.service.order.OrderService; //import com.ruoyi.system.api.domain.dto.MgtBaseShopDto; //import com.ruoyi.system.api.domain.poji.member.Member; //import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo; //import com.ruoyi.system.api.service.RemoteMemberService; //import org.junit.Test; //import org.junit.runner.RunWith; @@ -21,6 +23,7 @@ //import javax.annotation.Resource; //import java.math.BigDecimal; //import java.util.ArrayList; //import java.util.Collections; //import java.util.List; // ///** @@ -34,33 +37,21 @@ //@SpringBootTest(classes = RuoYiOrderApplication.class) //public class orderTest { // // @Resource // private OrderMapper orderMapper; // // @Resource // private OrderService orderService; // // @Resource // private RemoteMemberService memberService; // private RemoteMemberService remoteMemberService; // // @Test // public void main() { // AppSureOrderDto appSureOrderDto = new AppSureOrderDto(); // Long userId = 1496L; // if (userId != null) { // Member member = memberService.getMember(userId).getData(); // appSureOrderDto.setUserId(userId); // if (member != null && member.getRelationShopId() != null) { // appSureOrderDto.setShopId(member.getRelationShopId()); // } // } // List<AppBuyGoodsDto> appBuyGoodsDtoList = new ArrayList<>(); // AppBuyGoodsDto appBuyGoodsDto = new AppBuyGoodsDto(); // appBuyGoodsDto.setBuyNum(1); // appBuyGoodsDto.setGoodsId("4476c539ccc54f95a1416f79a067073a"); // appBuyGoodsDto.setMemberCouponId(1766020668811378689L); // appBuyGoodsDtoList.add(appBuyGoodsDto); // appSureOrderDto.setAppBuyGoodsDtoList(appBuyGoodsDtoList); // AppSureOrderVo appSureOrderVo = orderService.buyGoods(appSureOrderDto); // // //获取服务统计 // List<Long> userIds = remoteMemberService.listUserIdByShopId(Collections.singletonList(32L)).getData(); // if(userIds.isEmpty()){ // userIds.add(0L); // } // MerHomeShopTotalVo serviceTotalVo = orderMapper.getMerHomeShopServiceTotalVo(32L, userIds); // System.err.println(serviceTotalVo); // } // // ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
@@ -306,9 +306,6 @@ if (e.getIsDefault()==1){ shop.setIsDefault(true); } if(null != shop && 1 == shop.getShopType()){ shop.setModifyPricePermission(1); } return shop; }).collect(Collectors.toList()); return R.ok(collect); ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
@@ -904,6 +904,9 @@ //员工端数据权限（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限） //2/4暂未使用 String dataScopeEmployee = sysUser.getData().getDataScopeEmployee(); if(StringUtils.isEmpty(dataScopeEmployee)){ dataScopeEmployee = "3"; } if(dataScopeEmployee.equals("1")){ userIds = null; shopIds = null; ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/util/map/MapUtil.java
@@ -24,7 +24,7 @@ private static Logger logger = LoggerFactory.getLogger(MapUtil.class); private static final String tencentKey = "XBVBZ-2H2RZ-UP6XE-ZF2UM-PNADS-D4BFQ"; private static final String tencentKey = "FATBZ-V3AWH-7IJDS-WC7NC-QXY3Q-TQFDJ"; /**
