diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java index e41a3818..94c1d3bb 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java @@ -144,6 +144,13 @@ public class OrderController extends BaseController { @ResponseBody @Transactional(rollbackFor = Exception.class) public AjaxResult sysOrder(@RequestBody SysOrderAssignRequest request) { + request.setGoodsDeptCategoryId(request.getCategory4()); + DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.selectOneByGoodsCategoryId(request.getGoodsDeptCategoryId()); + OrderTemplateGoods orderTemplateGoods = new OrderTemplateGoods(); + orderTemplateGoods.setGoodsName(request.getGoodsBrand() + " " + deptGoodsCategory.getGoodsCategoryName()); + orderTemplateGoods.setDeptGoodsCategoryIds(Arrays.asList(request.getGoodsDeptCategoryId())); + orderTemplateGoods.setDeptGoodsCategoryNames(Arrays.asList(orderTemplateGoods.getGoodsName())); + request.setGoods(Arrays.asList(orderTemplateGoods)); String goodsBrand = request.getGoodsBrand(); Long deptId = getSysUser().getDeptId(); List goodsList = request.getGoods(); diff --git a/ghy-order/src/main/java/com/ghy/order/request/SysOrderAssignRequest.java b/ghy-order/src/main/java/com/ghy/order/request/SysOrderAssignRequest.java index 925526b2..9e11fbf1 100644 --- a/ghy-order/src/main/java/com/ghy/order/request/SysOrderAssignRequest.java +++ b/ghy-order/src/main/java/com/ghy/order/request/SysOrderAssignRequest.java @@ -11,6 +11,7 @@ public class SysOrderAssignRequest { // 商品 private List goods; + private Long category4; // 商品品牌 private String goodsBrand; // 商品规格