CC/ruoyi-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
van
2026-06-22 14:28:31 +08:00
parent 546cd8eb04
commit 2558b91250
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/OrderRowsController.java
View File

@@ -15,6 +15,7 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.jarvis.domain.OrderRows;
import com.ruoyi.jarvis.service.IGoodsInfoService;
import com.ruoyi.jarvis.service.IOrderRowsService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
@@ -32,6 +33,9 @@ public class OrderRowsController extends BaseController
@Autowired
private IOrderRowsService orderRowsService;
@Autowired
private IGoodsInfoService goodsInfoService;
@Autowired
private SuperAdminService superAdminService;
@@ -127,7 +131,11 @@ public class OrderRowsController extends BaseController
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id)
{
return success(orderRowsService.selectOrderRowsById(id));
OrderRows orderRows = orderRowsService.selectOrderRowsById(id);
if (orderRows != null && orderRows.getGoodsInfoId() != null) {
orderRows.setGoodsInfo(goodsInfoService.selectGoodsInfoById(orderRows.getGoodsInfoId()));
}
return success(orderRows);
}
/**

1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/publicapi/PublicPromoterOrderController.java
View File

@@ -128,7 +128,6 @@ public class PublicPromoterOrderController {
Double proPrice = row.getProPriceAmount();
if (proPrice != null && proPrice > 0) {
vo.setProPriceAmount(String.format("%.2f", proPrice));
vo.setProPriceTime(formatDate(row.getModifyTime()));
} else {
vo.setProPriceAmount("0.00");
}