java/qijisheng.git

			@@ -302,6 +302,7 @@
			Long userid = tokenService.getLoginUser().getUserid();
			SysUser sysUser = sysUserClient.getSysUser(userid).getData();
			List<Order> orderList = orderService.list(new LambdaQueryWrapper<Order>()
			.ne(Order::getOrderStatus,5)
			.eq(sysUser.getRoleType() == 2, Order::getShopId, sysUser.getObjectId())
			.between(Order::getCreateTime, LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
			.orderByAsc(Order::getCreateTime));

			@@ -100,12 +100,10 @@
			SUM( CASE WHEN tor.order_type = 2 THEN tor.total_amount ELSE 0 END ) as singleTotalMoney
			FROM
			t_order tor where 1 = 1
			<if test="startTime != null and '' != startTime and endTime != null and '' != endTime">
			and tor.create_time between #{startTime} and #{endTime}
			</if>
			<if test="null != shopId">
			and tor.shop_id = #{shopId}
			</if>
			and tor.order_status!=5
			</select>

	ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史