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-05 10:26:55 +08:00
parent 11e250dd21
commit b8ed54ed4d
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderInfoVo.java
View File

@ -1,7 +1,12 @@
package com.bonus.zlpt.common.core.domain.order.vo; package com.bonus.zlpt.common.core.domain.order.vo;
import com.bonus.zlpt.common.core.domain.order.OrderInfo; import com.bonus.zlpt.common.core.domain.order.OrderInfo;
import lombok.Data;
import lombok.ToString;
@Data
@ToString
public class OrderInfoVo extends OrderInfo { public class OrderInfoVo extends OrderInfo {
/* 装备类别 grandpa */ /* 装备类别 grandpa */
private String typeName; private String typeName;

19
zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderInfoController.java
View File

@ -1,6 +1,7 @@
package com.bonus.zlpt.order.controller; package com.bonus.zlpt.order.controller;
import java.util.List; import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo; import com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo;
@ -23,6 +24,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.bonus.zlpt.common.core.domain.order.OrderInfo; import com.bonus.zlpt.common.core.domain.order.OrderInfo;
import com.bonus.zlpt.order.service.IOrderInfoService; import com.bonus.zlpt.order.service.IOrderInfoService;
import static com.bonus.zlpt.common.core.web.domain.AjaxResult.DATA_TAG;
/** /**
* 订单信息Controller * 订单信息Controller
* *
@ -47,6 +51,21 @@ public class OrderInfoController extends BaseController
{ {
startPage(); startPage();
List<OrderInfoVo> list = orderInfoService.selectOrderInfoList(orderInfo); List<OrderInfoVo> list = orderInfoService.selectOrderInfoList(orderInfo);
for (OrderInfoVo orderInfoVo : list) {
Map map1 = (Map) equipClient.getInfo(orderInfoVo.getMaId());
if (map1 != null) {
Map map2 = (Map) map1.get(DATA_TAG);
if (map2 != null) {
String typeName = (String) map2.get("typeName");
String groupName = (String) map2.get("groupName");
String modelName = (String) map2.get("modelName");
String deviceName = (String) map2.get("deviceName");
orderInfoVo.setTypeName(typeName);
orderInfoVo.setGroupName(groupName);
orderInfoVo.setDeviceName(modelName + deviceName);
}
}
}
return getDataTable(list); return getDataTable(list);
} }