clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

PC下单接口

This commit is contained in:
kuang.yife 2023-05-21 02:30:53 +08:00
parent f574bfed24
commit 7caf7eae18
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
View File

@ -43,6 +43,7 @@ import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@ -146,7 +147,7 @@ public class OrderController extends BaseController {
// 判断是否有客户 // 判断是否有客户
SysUser sysUser = getSysUser(); SysUser sysUser = getSysUser();
Long deptId = sysUser.getDeptId(); Long deptId = sysUser.getDept().getParentId();
String loginName = sysUser.getLoginName(); String loginName = sysUser.getLoginName();
Customer customer = customerService.selectByAccount("sys_" + loginName); Customer customer = customerService.selectByAccount("sys_" + loginName);
if (customer == null) { 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("请填写地址"); return AjaxResult.error("请填写地址");
} }
CustomerAddress customerAddress = customerAddressService.selectByCustomerAndAddress(customer.getCustomerId(), 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) { if (customerAddress == null) {
customerAddress = new CustomerAddress(); customerAddress = new CustomerAddress();
customerAddress.setCustomerId(customer.getCustomerId()); customerAddress.setCustomerId(customer.getCustomerId());
customerAddress.setProvinceId(request.getProvinceId()); customerAddress.setProvinceId(request.getProvinceId());
customerAddress.setCityId(request.getCityId()); customerAddress.setCityId(request.getCityId());
customerAddress.setCountryId(request.getCountryId()); customerAddress.setCountryId(request.getDistrictId());
customerAddress.setAddress(request.getAddress()); customerAddress.setAddress(request.getFullAddress());
customerAddress.setIsDefault(0); customerAddress.setIsDefault(0);
customerAddressService.insertCustomerAddress(customerAddress); customerAddressService.insertCustomerAddress(customerAddress);
} }
@ -189,14 +190,14 @@ public class OrderController extends BaseController {
goods.setGoodsName(request.getGoodsBrand()); goods.setGoodsName(request.getGoodsBrand());
goods.setGoodsImgUrl(request.getImageUrl()); goods.setGoodsImgUrl(request.getImageUrl());
goods.setGoodsVideoUrl(request.getVideoUrl()); goods.setGoodsVideoUrl(request.getVideoUrl());
goods.setDeptGoodsCategoryId(request.getCategory2()); goods.setDeptGoodsCategoryId(request.getCategoryId3());
goods.setStatus(1); goods.setStatus(1);
goodsService.insertGoods(goods); goodsService.insertGoods(goods);
List<GoodsStandard> goodsStandards = new ArrayList<>(); List<GoodsStandard> goodsStandards = new ArrayList<>();
// 生成规格 // 生成规格
request.getOrderGoodsStandards().forEach(list->{ request.getOrderGoodsStandards().forEach(list->{
DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.selectOneByGoodsCategoryId(list.getDeptCategoryId()); DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(list.getDeptCategoryId());
GoodsStandard standard = new GoodsStandard(); GoodsStandard standard = new GoodsStandard();
standard.setGoodsStandardName(deptGoodsCategory.getGoodsCategoryName()); standard.setGoodsStandardName(deptGoodsCategory.getGoodsCategoryName());
standard.setDeptGoodsCategoryId(deptGoodsCategory.getDeptGoodsCategoryId()); standard.setDeptGoodsCategoryId(deptGoodsCategory.getDeptGoodsCategoryId());
@ -208,6 +209,8 @@ public class OrderController extends BaseController {
standard.setSaleNum(0); standard.setSaleNum(0);
goodsStandards.add(standard); goodsStandards.add(standard);
}); });
goodsStandardService.batchInsert(goodsStandards);
// 生成主单 // 生成主单
OrderMaster orderMaster = new OrderMaster(); OrderMaster orderMaster = new OrderMaster();

10
ghy-order/src/main/java/com/ghy/order/request/SysOrderAssignRequest.java
View File

@ -9,9 +9,9 @@ import java.util.List;
@Data @Data
public class SysOrderAssignRequest { public class SysOrderAssignRequest {
private Long category1; private Long categoryId1;
private Long category2; private Long categoryId2;
private Long category3; private Long categoryId3;
private List<SysOrderGoodsStandards> orderGoodsStandards; private List<SysOrderGoodsStandards> orderGoodsStandards;
@ -35,8 +35,8 @@ public class SysOrderAssignRequest {
private Long cityId; private Long cityId;
private Long countryId; private Long districtId;
// 详细地址 // 详细地址
private String address; private String fullAddress;
} }