修改字段

blade-service/blade-client/src/main/java/org/springblade/client/goods/feign/GoodsDescClient.java

@@ -10,6 +10,7 @@ import org.springblade.client.goods.service.IGoodsDescService;
 import org.springblade.client.vo.GoodsDescVO;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
@@ -50,6 +51,8 @@ public class GoodsDescClient implements IGoodsDescClient {
 	public R<List<GoodsDescVO>> selectGoodsBasic() {
 		List<GoodsDesc> goodsDescList = goodsDescService.list(Wrappers.<GoodsDesc>lambdaQuery()
 			.select(GoodsDesc::getId, GoodsDesc::getCname, GoodsDesc::getCode, GoodsDesc::getTypeno, GoodsDesc::getBrand));
-		return R.data(goodsDescList.stream().map(goodsDescMapstructMapper::toVo).collect(Collectors.toList()));
+		// todo::1
+//		return R.data(goodsDescList.stream().map(goodsDescMapstructMapper::toVo).collect(Collectors.toList()));
+		return R.data(BeanUtil.copy(goodsDescList, GoodsDescVO.class));
 	}
 }

blade-service/trade-purchase/src/main/java/com/trade/purchase/PurchaseApplication.java

@@ -16,7 +16,7 @@ import org.springframework.context.annotation.ComponentScan;
 @SpringCloudApplication
 @EnableFeignClients({"org.springblade", "com.trade"})
 @ComponentScan(value = {"com.trade.purchase.*"})
-@MapperScan({"com.trade.purchase.**.mapper.**", "com.trade.purchase.**.assemble.mapstruct.**"})
+@MapperScan({"com.trade.purchase.**.mapper.**"})
 // @SeataCloudApplication
 public class PurchaseApplication {
 

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/controller/DomesticOrderController.java

@@ -4,8 +4,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.trade.purchase.order.dto.OrderSubmitDto;
 import com.trade.purchase.order.entity.Order;
+import com.trade.purchase.order.entity.OrderFees;
+import com.trade.purchase.order.entity.OrderFiles;
 import com.trade.purchase.order.entity.OrderItems;
 import com.trade.purchase.order.enums.OrderTypeEnum;
+import com.trade.purchase.order.service.IOrderFeesService;
+import com.trade.purchase.order.service.IOrderFilesService;
 import com.trade.purchase.order.service.IOrderItemsService;
 import com.trade.purchase.order.service.IOrderService;
 import com.trade.purchase.order.vo.OrderVO;
@@ -37,8 +41,13 @@ public class DomesticOrderController extends BladeController {
 
 	private final IOrderService orderService;
 
+	private final IOrderFeesService orderFeesService;
+
+	private final IOrderFilesService orderFilesService;
+
 	private final IOrderItemsService orderItemsService;
 
+	private final String ERROR_MSG = "缺少查询信息";
 
 	/**
 	 * 详情
@@ -55,7 +64,7 @@ public class DomesticOrderController extends BladeController {
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "分页", notes = "传入order")
+	@ApiOperation(value = "查询所有", notes = "传入order")
 	public R<IPage<Order>> list(Order order, Query query) {
 		order.setIsDeleted(0);
 		order.setTenantId(AuthUtil.getTenantId());
@@ -98,9 +107,9 @@ public class DomesticOrderController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入order")
-	public R update(@Valid @RequestBody Order order) {
+	public R<String> update(@Valid @RequestBody Order order) {
 		if (order.getId() == null) {
-			return R.fail(500, "请选择要删除的数据");
+			return R.fail(ERROR_MSG);
 		}
 		order.setIsDeleted(1);
 		return R.status(orderService.updateById(order));
@@ -123,8 +132,8 @@ public class DomesticOrderController extends BladeController {
 	 */
 	@PostMapping("/removeByItem")
 	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "修改", notes = "传入order")
-	public R update(@Valid @RequestBody OrderItems order) {
+	@ApiOperation(value = "删除明细信息", notes = "传入order")
+	public R<String> update(@Valid @RequestBody OrderItems order) {
 		if (order.getId() == null) {
 			return R.fail(500, "请选择要删除的数据");
 		}
@@ -138,9 +147,40 @@ public class DomesticOrderController extends BladeController {
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "删除", notes = "传入ids")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+	public R<String> remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(orderService.removeByIds(Func.toLongList(ids)));
 	}
 
 
+	/**
+	 * 删除费用信息
+	 */
+	@PostMapping("/removeByFees")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除费用信息", notes = "传入order")
+	public R<String> update(@Valid @RequestBody OrderFees order) {
+		if (order.getId() == null) {
+			return R.fail(ERROR_MSG);
+		}
+		order.setIsDeleted(1);
+		return R.status(orderFeesService.updateById(order));
+	}
+
+	/**
+	 * 删除订单文件信息
+	 *
+	 * @param order
+	 * @return
+	 */
+	@PostMapping("/removeByFiles")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "删除文件信息", notes = "传入order")
+	public R<String> update(@Valid @RequestBody OrderFiles order) {
+		if (order.getId() == null) {
+			return R.fail(ERROR_MSG);
+		}
+		order.setIsDeleted(1);
+		return R.status(orderFilesService.updateById(order));
+	}
+
 }

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/controller/ExportOrderController.java

@@ -4,8 +4,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.trade.purchase.order.dto.OrderSubmitDto;
 import com.trade.purchase.order.entity.Order;
+import com.trade.purchase.order.entity.OrderFees;
+import com.trade.purchase.order.entity.OrderFiles;
 import com.trade.purchase.order.entity.OrderItems;
 import com.trade.purchase.order.enums.OrderTypeEnum;
+import com.trade.purchase.order.service.IOrderFeesService;
+import com.trade.purchase.order.service.IOrderFilesService;
 import com.trade.purchase.order.service.IOrderItemsService;
 import com.trade.purchase.order.service.IOrderService;
 import com.trade.purchase.order.vo.OrderVO;
@@ -37,8 +41,14 @@ public class ExportOrderController extends BladeController {
 
 	private final IOrderService orderService;
 
+	private final IOrderFeesService orderFeesService;
+
+	private final IOrderFilesService orderFilesService;
+
 	private final IOrderItemsService orderItemsService;
 
+	private final String ERROR_MSG = "缺少查询信息";
+
 	/**
 	 * 详情
 	 */
@@ -54,7 +64,7 @@ public class ExportOrderController extends BladeController {
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "分页", notes = "传入order")
+	@ApiOperation(value = "查询所有", notes = "传入order")
 	public R<IPage<Order>> list(Order order, Query query) {
 		order.setIsDeleted(0);
 		order.setTenantId(AuthUtil.getTenantId());
@@ -97,9 +107,9 @@ public class ExportOrderController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入order")
-	public R update(@Valid @RequestBody Order order) {
+	public R<String> update(@Valid @RequestBody Order order) {
 		if (order.getId() == null) {
-			return R.fail(500, "请选择要删除的数据");
+			return R.fail(ERROR_MSG);
 		}
 		order.setIsDeleted(1);
 		return R.status(orderService.updateById(order));
@@ -118,28 +128,44 @@ public class ExportOrderController extends BladeController {
 	}
 
 	/**
-	 * 采购订单表
+	 * 删除 销售或采购订单表
 	 */
-	@PostMapping("/removeByItem")
-	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "修改", notes = "传入order")
-	public R update(@Valid @RequestBody OrderItems order) {
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R<String> remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(orderService.removeByIds(Func.toLongList(ids)));
+	}
+
+	/**
+	 * 删除费用信息
+	 */
+	@PostMapping("/removeByFees")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除费用信息", notes = "传入order")
+	public R<String> update(@Valid @RequestBody OrderFees order) {
 		if (order.getId() == null) {
-			return R.fail(500, "请选择要删除的数据");
+			return R.fail(ERROR_MSG);
 		}
 		order.setIsDeleted(1);
-		return R.status(orderItemsService.updateById(order));
+		return R.status(orderFeesService.updateById(order));
 	}
 
 	/**
-	 * 删除 销售或采购订单表
+	 * 删除订单文件信息
+	 *
+	 * @param order
+	 * @return
 	 */
-	@PostMapping("/remove")
-	@ApiOperationSupport(order = 8)
-	@ApiOperation(value = "删除", notes = "传入ids")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(orderService.removeByIds(Func.toLongList(ids)));
+	@PostMapping("/removeByFiles")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "删除文件信息", notes = "传入order")
+	public R<String> update(@Valid @RequestBody OrderFiles order) {
+		if (order.getId() == null) {
+			return R.fail(ERROR_MSG);
+		}
+		order.setIsDeleted(1);
+		return R.status(orderFilesService.updateById(order));
 	}
 
-
 }

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/controller/ImportOrderController.java

@@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.trade.purchase.order.dto.OrderSubmitDto;
 import com.trade.purchase.order.entity.Order;
-import com.trade.purchase.order.entity.OrderItems;
+import com.trade.purchase.order.entity.OrderFees;
+import com.trade.purchase.order.entity.OrderFiles;
 import com.trade.purchase.order.enums.OrderTypeEnum;
+import com.trade.purchase.order.service.IOrderFeesService;
+import com.trade.purchase.order.service.IOrderFilesService;
 import com.trade.purchase.order.service.IOrderItemsService;
 import com.trade.purchase.order.service.IOrderService;
 import com.trade.purchase.order.vo.OrderVO;
@@ -37,8 +40,15 @@ public class ImportOrderController extends BladeController {
 
 	private final IOrderService orderService;
 
+	private final IOrderFeesService orderFeesService;
+
+	private final IOrderFilesService orderFilesService;
+
 	private final IOrderItemsService orderItemsService;
 
+	private final String ERROR_MSG = "缺少查询信息";
+
+
 	/**
 	 * 详情
 	 */
@@ -54,7 +64,7 @@ public class ImportOrderController extends BladeController {
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "分页", notes = "传入order")
+	@ApiOperation(value = "查询所有", notes = "传入order")
 	public R<IPage<Order>> list(Order order, Query query) {
 		order.setIsDeleted(0);
 		order.setTenantId(AuthUtil.getTenantId());
@@ -97,9 +107,9 @@ public class ImportOrderController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入order")
-	public R update(@Valid @RequestBody Order order) {
+	public R<String> update(@Valid @RequestBody Order order) {
 		if (order.getId() == null) {
-			return R.fail(500, "请选择要删除的数据");
+			return R.fail(ERROR_MSG);
 		}
 		order.setIsDeleted(1);
 		return R.status(orderService.updateById(order));
@@ -118,28 +128,44 @@ public class ImportOrderController extends BladeController {
 	}
 
 	/**
-	 * 采购订单表
+	 * 删除 销售或采购订单表
 	 */
-	@PostMapping("/removeByItem")
-	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "修改", notes = "传入order")
-	public R update(@Valid @RequestBody OrderItems order) {
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R<String> remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(orderService.removeByIds(Func.toLongList(ids)));
+	}
+
+	/**
+	 * 删除费用信息
+	 */
+	@PostMapping("/removeByFees")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除费用信息", notes = "传入order")
+	public R<String> update(@Valid @RequestBody OrderFees order) {
 		if (order.getId() == null) {
-			return R.fail(500, "请选择要删除的数据");
+			return R.fail(ERROR_MSG);
 		}
 		order.setIsDeleted(1);
-		return R.status(orderItemsService.updateById(order));
+		return R.status(orderFeesService.updateById(order));
 	}
 
 	/**
-	 * 删除 销售或采购订单表
+	 * 删除订单文件信息
+	 *
+	 * @param order
+	 * @return
 	 */
-	@PostMapping("/remove")
-	@ApiOperationSupport(order = 8)
-	@ApiOperation(value = "删除", notes = "传入ids")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(orderService.removeByIds(Func.toLongList(ids)));
+	@PostMapping("/removeByFiles")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "删除文件信息", notes = "传入order")
+	public R<String> update(@Valid @RequestBody OrderFiles order) {
+		if (order.getId() == null) {
+			return R.fail(ERROR_MSG);
+		}
+		order.setIsDeleted(1);
+		return R.status(orderFilesService.updateById(order));
 	}
 
-
 }

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/impl/OrderServiceImpl.java

@@ -60,8 +60,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	private final IOrderSave orderSave;
 
-	private final OrderMapstructMapper orderMapstructMapper;
-
 	private final OrderItemMapstructMapper orderItemMapstructMapper;
 
 
@@ -85,8 +83,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				Optional<CorpsDescVO> first = listR.getData().stream().filter(corp -> Objects.equals(corp.getId(), li.getCorpId())).findFirst();
 				first.ifPresent(corpsDescVO -> li.setCorpName(corpsDescVO.getCname()));
 			});*/
-			// todo:: 整理好map 在改
-//			List<OrderVO> orderVOList = orderPage.getRecords().stream().map().collect(Collectors.toList());
+			List<OrderVO> orderVOList = records.stream().map(OrderMapstructMapper.INSTANCE::toVo).collect(Collectors.toList());
 			page.setRecords(copy);
 		}
 		page.setTotal(orderPage.getTotal());
@@ -164,11 +161,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		if (Objects.isNull(orderMessage)) {
 			throw new OrderException("未找到订单信息");
 		}
-		OrderVO vo = orderMapstructMapper.toVo(orderMessage);
+		OrderVO vo = OrderMapstructMapper.INSTANCE.toVo(orderMessage);
 		//获取创建人中文名
 		R<User> createUser = userClient.userInfoById(vo.getCreateUser());
 
-
 		if (createUser.isSuccess()) {
 			vo.setCreateUserName(createUser.getData().getName());
 		}