优化订单数量小数点问题

blade-service/blade-factory/src/main/java/org/springblade/factory/api/controller/SalesOrderController.java

@@ -196,6 +196,20 @@ public class SalesOrderController {
 
 
 	/**
+	 * 获取访问人自己的订单列表
+	 * @param pcBladeOrder
+	 * @return
+	 */
+	@GetMapping("/getOrderList")
+	public R<List<PcBladeOrder>> getOrderList(PcBladeOrder pcBladeOrder) {
+		Long userId = AuthUtil.getUserId();
+		pcBladeOrder.setCustomerId(userId);
+		List<PcBladeOrder> pcBladeOrderList = orderService.selectPcBladeOrderListPro(pcBladeOrder);
+		return R.data(pcBladeOrderList);
+	}
+
+
+	/**
 	 * 根据订单编号查询订单及明细
 	 */
 	@GetMapping("/getByCode")

blade-service/blade-factory/src/main/java/org/springblade/factory/service/PcBladeOrderService.java

@@ -65,5 +65,11 @@ public interface PcBladeOrderService extends BaseService<PcBladeOrder> {
 	boolean updateOrderWithItems(PcBladeOrder pcBladeOrder);
 
 
+	/**
+	 * 获取带订单明细的接口
+	 * @param pcBladeOrder
+	 * @return
+	 */
+	List<PcBladeOrder> selectPcBladeOrderListPro(PcBladeOrder pcBladeOrder);
 
 }

blade-service/blade-factory/src/main/java/org/springblade/factory/service/impl/PcBladeOrderServiceImpl.java

@@ -26,7 +26,7 @@ public class PcBladeOrderServiceImpl extends BaseServiceImpl<PcBladeOrderMapper,
 
 	private final GeneratedNumberUitls generatedNumberUitls;
 
-
+	private final PcBladeOrderItemService pcBladeOrderItemService;
 
 
 	@Override
@@ -262,4 +262,56 @@ public class PcBladeOrderServiceImpl extends BaseServiceImpl<PcBladeOrderMapper,
 		// 5. 执行更新
 		return this.updateById(pcBladeOrder);
 	}
+
+	@Override
+	public List<PcBladeOrder> selectPcBladeOrderListPro(PcBladeOrder pcBladeOrder) {
+		QueryWrapper<PcBladeOrder> queryWrapper = new QueryWrapper<>();
+
+		// 订单编号模糊查询
+		if (StringUtils.isNotBlank(pcBladeOrder.getOrderCode())) {
+			queryWrapper.like("order_code", pcBladeOrder.getOrderCode());
+		}
+
+		// 收货人姓名模糊查询
+		if (StringUtils.isNotBlank(pcBladeOrder.getReceiverName())) {
+			queryWrapper.like("receiver_name", pcBladeOrder.getReceiverName());
+		}
+
+		// 收货人手机号模糊查询
+		if (StringUtils.isNotBlank(pcBladeOrder.getReceiverPhone())) {
+			queryWrapper.like("receiver_phone", pcBladeOrder.getReceiverPhone());
+		}
+
+		// 收货人地址模糊查询
+		if (StringUtils.isNotBlank(pcBladeOrder.getReceiverAddress())) {
+			queryWrapper.like("receiver_address", pcBladeOrder.getReceiverAddress());
+		}
+
+		// 精确查询状态
+		if (pcBladeOrder.getStatus() != null) {
+			queryWrapper.eq("status", pcBladeOrder.getStatus());
+		}
+
+		// 时间范围查询
+		if (pcBladeOrder.getCreateTime() != null) {
+			queryWrapper.ge("create_time", pcBladeOrder.getCreateTime());
+		}
+
+		// 排序
+		queryWrapper.orderByDesc("create_time");
+
+		List<PcBladeOrder> pcBladeOrderList = this.list(queryWrapper);
+
+		for (PcBladeOrder item : pcBladeOrderList) {
+			PcBladeOrderItem pcBladeOrderItem = new PcBladeOrderItem();
+			pcBladeOrderItem.setOrderId(item.getId());
+			List<PcBladeOrderItem> pcBladeOrderItemList = pcBladeOrderItemService.selectPcBladeOrderItemList(pcBladeOrderItem);
+			item.setPcBladeOrderItemList(pcBladeOrderItemList);
+		}
+		return pcBladeOrderList;
+	}
+
+
+
+
 }