diff --git a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderDetailsVo.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderDetailsVo.java new file mode 100644 index 0000000..fa8f29d --- /dev/null +++ b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderDetailsVo.java @@ -0,0 +1,14 @@ +package com.bonus.zlpt.common.core.domain.order.vo; + +import com.bonus.zlpt.common.core.domain.order.OrderDetails; +import lombok.Data; +import lombok.ToString; + +@Data +@ToString +public class OrderDetailsVo extends OrderDetails { + /** 装备类型 */ + private String typeName; + /** 装备名称 */ + private String equipName; +} diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java index 2d8b5b9..df5a125 100644 --- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java @@ -3,7 +3,7 @@ package com.bonus.zlpt.order.controller; import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletResponse; -import com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo; +import com.bonus.zlpt.common.core.domain.order.vo.OrderDetailsVo; import com.bonus.zlpt.common.core.utils.poi.ExcelUtil; import com.bonus.zlpt.common.core.web.controller.BaseController; import com.bonus.zlpt.common.core.web.domain.AjaxResult; @@ -12,6 +12,7 @@ import com.bonus.zlpt.common.log.annotation.Log; import com.bonus.zlpt.common.log.enums.BusinessType; import com.bonus.zlpt.common.security.annotation.RequiresPermissions; import com.bonus.zlpt.order.feign.EquipClient; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -73,10 +74,15 @@ public class OrderDetailsController extends BaseController public AjaxResult getInfo(@PathVariable("id") Long id) { OrderDetails orderDetails = orderDetailsService.selectOrderDetailsById(id); - AjaxResult o = equipClient.getInfo(orderDetails.getMaId()); - Map map = (Map) o.get(DATA_TAG); - String modelName = (String) map.get("modelName"); - return success(orderDetails); + Map map1 = (Map) equipClient.getInfo(orderDetails.getMaId()); + Map map2 = (Map) map1.get(DATA_TAG); + String modelName = (String) map2.get("modelName"); + String typeName = (String) map2.get("typeName"); + OrderDetailsVo orderDetailsVo = new OrderDetailsVo(); + BeanUtils.copyProperties(orderDetails, orderDetailsVo); + orderDetailsVo.setTypeName(typeName); + orderDetailsVo.setEquipName(modelName+typeName); + return success(orderDetailsVo); } /**