bonus
/
Zlpt-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

This commit is contained in:
sxu 2023-12-04 16:56:34 +08:00
parent 129961336c
commit 45251006e7
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderDetailsVo.java Normal file
View File

@ -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;
}

16
zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java
View File

@ -3,7 +3,7 @@ package com.bonus.zlpt.order.controller;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletResponse; 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.utils.poi.ExcelUtil;
import com.bonus.zlpt.common.core.web.controller.BaseController; import com.bonus.zlpt.common.core.web.controller.BaseController;
import com.bonus.zlpt.common.core.web.domain.AjaxResult; 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.log.enums.BusinessType;
import com.bonus.zlpt.common.security.annotation.RequiresPermissions; import com.bonus.zlpt.common.security.annotation.RequiresPermissions;
import com.bonus.zlpt.order.feign.EquipClient; import com.bonus.zlpt.order.feign.EquipClient;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@ -73,10 +74,15 @@ public class OrderDetailsController extends BaseController
public AjaxResult getInfo(@PathVariable("id") Long id) public AjaxResult getInfo(@PathVariable("id") Long id)
{ {
OrderDetails orderDetails = orderDetailsService.selectOrderDetailsById(id); OrderDetails orderDetails = orderDetailsService.selectOrderDetailsById(id);
AjaxResult o = equipClient.getInfo(orderDetails.getMaId()); Map map1 = (Map) equipClient.getInfo(orderDetails.getMaId());
Map map = (Map) o.get(DATA_TAG); Map map2 = (Map) map1.get(DATA_TAG);
String modelName = (String) map.get("modelName"); String modelName = (String) map2.get("modelName");
return success(orderDetails); String typeName = (String) map2.get("typeName");
OrderDetailsVo orderDetailsVo = new OrderDetailsVo();
BeanUtils.copyProperties(orderDetails, orderDetailsVo);
orderDetailsVo.setTypeName(typeName);
orderDetailsVo.setEquipName(modelName+typeName);
return success(orderDetailsVo);
} }
/** /**