|
|
@@ -16,7 +16,9 @@ import io.swagger.annotations.ApiOperation;
|
|
|
import io.swagger.annotations.ApiParam;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import org.springblade.common.constant.CommonConstant;
|
|
|
-import org.springblade.common.enums.*;
|
|
|
+import org.springblade.common.enums.AuditStatusEnum;
|
|
|
+import org.springblade.common.enums.GoodsStateEnum;
|
|
|
+import org.springblade.common.enums.YesOrNoEnum;
|
|
|
import org.springblade.core.boot.ctrl.BladeController;
|
|
|
import org.springblade.core.mp.support.Condition;
|
|
|
import org.springblade.core.mp.support.Query;
|
|
|
@@ -29,13 +31,14 @@ import org.springblade.modules.mall.entity.CategoryInfo;
|
|
|
import org.springblade.modules.mall.entity.GoodsInfo;
|
|
|
import org.springblade.modules.mall.service.ICategoryInfoService;
|
|
|
import org.springblade.modules.mall.service.IGoodsInfoService;
|
|
|
-import org.springblade.modules.mall.service.IGoodsParamsService;
|
|
|
import org.springblade.modules.mall.vo.GoodsInfoVO;
|
|
|
import org.springblade.modules.mall.wrapper.GoodsInfoWrapper;
|
|
|
import org.springframework.util.Assert;
|
|
|
-import org.springframework.web.bind.annotation.*;
|
|
|
+import org.springframework.web.bind.annotation.GetMapping;
|
|
|
+import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
+import org.springframework.web.bind.annotation.RequestParam;
|
|
|
+import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
-import javax.annotation.Resource;
|
|
|
import java.util.List;
|
|
|
|
|
|
/**
|
|
|
@@ -116,7 +119,10 @@ public class ApiGoodsController extends BladeController {
|
|
|
FacilityCargoWay cargoWay = iFacilityCargoWayService.getById(goodsInfo.getCargoWayId());
|
|
|
Assert.notNull(cargoWay, "未查询到货道信息");
|
|
|
detail.setSalePrice(cargoWay.getSalePrice());
|
|
|
- return R.data(GoodsInfoWrapper.build().entityVO(detail));
|
|
|
+ GoodsInfoVO goodsInfoVO = GoodsInfoWrapper.build().entityVO(detail);
|
|
|
+ goodsInfoVO.setCargoWayId(cargoWay.getId());
|
|
|
+ goodsInfoVO.setCargoWayNo(cargoWay.getCargoNo());
|
|
|
+ return R.data(goodsInfoVO);
|
|
|
}
|
|
|
|
|
|
}
|
LuoDLeo