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

工圈子问题修复

This commit is contained in:
kuang.yife 2023-03-18 23:51:51 +08:00
parent f0600e4b81
commit d175b69f93
4 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java
View File

@ -277,6 +277,15 @@ public class GoodsController extends BaseController {
try {
Goods result = goodsService.selectById(goods.getGoodsId());
// 补全商品类目及父级类目信息
GoodsCategory goodsCategory = goodsCategoryService.selectById(result.getDeptGoodsCategoryId());
result.setDeptGoodsCategoryName(goodsCategory.getGoodsCategoryName());
if (goodsCategory.getParentCategoryId() != null) {
GoodsCategory parGoodsCategory = goodsCategoryService.selectById(goodsCategory.getParentCategoryId());
result.setParGoodsCategoryId(parGoodsCategory.getGoodsCategoryId());
result.setParGoodsCategoryName(parGoodsCategory.getGoodsCategoryName());
}
// 补全商品图片信息
List<GoodsImgs> goodsImgs = goodsImgsService.selectByGoodsId(result.getGoodsId());
Map<Integer, List<GoodsImgs>> listMap = new HashMap<>();

11
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
View File

@ -15,8 +15,10 @@ import com.ghy.common.utils.poi.ExcelUtil;
import com.ghy.customer.domain.CustomerAddress;
import com.ghy.customer.service.CustomerAddressService;
import com.ghy.goods.domain.Goods;
import com.ghy.goods.domain.GoodsArea;
import com.ghy.goods.domain.GoodsImgs;
import com.ghy.goods.domain.GoodsStandard;
import com.ghy.goods.service.GoodsAreaService;
import com.ghy.goods.service.GoodsImgsService;
import com.ghy.goods.service.GoodsService;
import com.ghy.goods.service.GoodsStandardService;
@ -49,6 +51,7 @@ import com.ghy.worker.service.WorkerService;
import com.huifu.adapay.core.exception.BaseAdaPayException;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.validation.annotation.Validated;
@ -74,6 +77,10 @@ public class OrderMasterController extends BaseController {
@Resource
private OrderMasterService orderMasterService;
@Autowired
private GoodsAreaService goodsAreaService;
@Resource
private WorkerService workerService;
@Resource
@ -529,6 +536,9 @@ public class OrderMasterController extends BaseController {
GoodsStandard goodsStandard = goodsStandardService.selectById(orderStandardList.get(0).getGoodsStandardId());
Goods goods = goodsService.selectById(goodsStandard.getGoodsId());
// 补全商品服务区域
List<GoodsArea> goodsAreas = goodsAreaService.selectByGoodsId(goods.getGoodsId());
goods.setGoodsAreaList(goodsAreas);
// 地址信息
CustomerAddress customerAddress = addressService.selectByCustomerAddressId(orderMaster.getAddressId());
@ -593,6 +603,7 @@ public class OrderMasterController extends BaseController {
orderListResponse.setOrderStandardDetailList(orderStandardDetails);
orderListResponse.setOrderTimeoutRecords(timeoutRecords);
orderListResponse.setFinalRecvMoney(finalRecvMoney);
orderListResponse.setGoodsAreaList(goods.getGoodsAreaList());
return AjaxResult.success(orderListResponse);
} catch (Exception e) {

3
ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
View File

@ -2,6 +2,7 @@ package com.ghy.web.pojo.vo;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ghy.goods.domain.GoodsArea;
import com.ghy.order.domain.AfterServiceRecord;
import com.ghy.payment.domain.FinancialChangeRecord;
import com.ghy.payment.domain.OrderTimeoutRecord;
@ -111,4 +112,6 @@ public class OrderListResponse {
private Integer ledgerAccountStatus;
private List<FinancialChangeRecord> financialChangeRecords;
private List<GoodsArea> goodsAreaList;
}

1
ghy-goods/src/main/java/com/ghy/goods/service/impl/DeptGoodsCategoryServiceImpl.java
View File

@ -152,6 +152,7 @@ public class DeptGoodsCategoryServiceImpl implements DeptGoodsCategoryService {
private void fillChild(List<DeptGoodsCategory> goodsCategoryList) {
List<DeptGoodsCategory> childList;
for (DeptGoodsCategory deptGoodsCategory : goodsCategoryList) {
deptGoodsCategory.setDeptGoodsCategoryId(null);
childList = deptGoodsCategoryMapper.appList(deptGoodsCategory);
if (childList.size() > 0) {
deptGoodsCategory.setChild(childList);