From 7caf7eae18a7f35535e5f52e59fe39f116aba31d Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Sun, 21 May 2023 02:30:53 +0800 Subject: [PATCH] =?UTF-8?q?PC=E4=B8=8B=E5=8D=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/order/OrderController.java | 17 ++++++++++------- .../order/request/SysOrderAssignRequest.java | 10 +++++----- 2 files changed, 15 insertions(+), 12 deletions(-) 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 aa432c5e..53292f79 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 @@ -43,6 +43,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; +import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -146,7 +147,7 @@ public class OrderController extends BaseController { // 判断是否有客户 SysUser sysUser = getSysUser(); - Long deptId = sysUser.getDeptId(); + Long deptId = sysUser.getDept().getParentId(); String loginName = sysUser.getLoginName(); Customer customer = customerService.selectByAccount("sys_" + loginName); if (customer == null) { @@ -157,18 +158,18 @@ public class OrderController extends BaseController { } // 判断是否有客户地址 - if (request.getProvinceId() == null || request.getCityId() == null || request.getCountryId() == null || StringUtils.isBlank(request.getAddress())) { + if (request.getProvinceId() == null || request.getCityId() == null || request.getDistrictId() == null || StringUtils.isBlank(request.getFullAddress())) { return AjaxResult.error("请填写地址"); } CustomerAddress customerAddress = customerAddressService.selectByCustomerAndAddress(customer.getCustomerId(), - request.getProvinceId(), request.getCityId(), request.getCountryId(), request.getAddress()); + request.getProvinceId(), request.getCityId(), request.getDistrictId(), request.getFullAddress()); if (customerAddress == null) { customerAddress = new CustomerAddress(); customerAddress.setCustomerId(customer.getCustomerId()); customerAddress.setProvinceId(request.getProvinceId()); customerAddress.setCityId(request.getCityId()); - customerAddress.setCountryId(request.getCountryId()); - customerAddress.setAddress(request.getAddress()); + customerAddress.setCountryId(request.getDistrictId()); + customerAddress.setAddress(request.getFullAddress()); customerAddress.setIsDefault(0); customerAddressService.insertCustomerAddress(customerAddress); } @@ -189,14 +190,14 @@ public class OrderController extends BaseController { goods.setGoodsName(request.getGoodsBrand()); goods.setGoodsImgUrl(request.getImageUrl()); goods.setGoodsVideoUrl(request.getVideoUrl()); - goods.setDeptGoodsCategoryId(request.getCategory2()); + goods.setDeptGoodsCategoryId(request.getCategoryId3()); goods.setStatus(1); goodsService.insertGoods(goods); List goodsStandards = new ArrayList<>(); // 生成规格 request.getOrderGoodsStandards().forEach(list->{ - DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.selectOneByGoodsCategoryId(list.getDeptCategoryId()); + DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(list.getDeptCategoryId()); GoodsStandard standard = new GoodsStandard(); standard.setGoodsStandardName(deptGoodsCategory.getGoodsCategoryName()); standard.setDeptGoodsCategoryId(deptGoodsCategory.getDeptGoodsCategoryId()); @@ -208,6 +209,8 @@ public class OrderController extends BaseController { standard.setSaleNum(0); goodsStandards.add(standard); }); + + goodsStandardService.batchInsert(goodsStandards); // 生成主单 OrderMaster orderMaster = new OrderMaster(); 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 d8ceb339..d3538c97 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 @@ -9,9 +9,9 @@ import java.util.List; @Data public class SysOrderAssignRequest { - private Long category1; - private Long category2; - private Long category3; + private Long categoryId1; + private Long categoryId2; + private Long categoryId3; private List orderGoodsStandards; @@ -35,8 +35,8 @@ public class SysOrderAssignRequest { private Long cityId; - private Long countryId; + private Long districtId; // 详细地址 - private String address; + private String fullAddress; }