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:
荒
2025-09-05 18:56:34 +08:00
parent 9a40f44eda
commit 37c557df4f
6 changed files with 49 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/JDOrderController.java
View File

@@ -8,12 +8,15 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.http.HttpUtils;
import com.ruoyi.jarvis.domain.JDOrder;
import com.ruoyi.jarvis.domain.OrderRows;
import com.ruoyi.jarvis.service.IJDOrderService;
import com.ruoyi.jarvis.service.IOrderRowsService;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
/**
@@ -26,11 +29,16 @@ import java.util.Map;
@RequestMapping("/jarvis/jdorder")
public class JDOrderController extends BaseController {
private final IJDOrderService jdOrderService;
private final IOrderRowsService orderRowsService;
public JDOrderController(IJDOrderService jdOrderService) {
public JDOrderController(IJDOrderService jdOrderService, IOrderRowsService orderRowsService) {
this.jdOrderService = jdOrderService;
this.orderRowsService = orderRowsService;
}
private final static String skey = "2192057370ef8140c201079969c956a3";
private final static String requestUrl = "http://192.168.8.88:6666/jd/";
/**
* 列表查询（分页）
*/
@@ -38,11 +46,20 @@ public class JDOrderController extends BaseController {
public TableDataInfo list(JDOrder query) {
startPage();
java.util.List<JDOrder> list = jdOrderService.selectJDOrderList(query);
return getDataTable(list);
}
private final static String skey = "2192057370ef8140c201079969c956a3";
private final static String requestUrl = "http://192.168.8.88:6666/jd/";
TableDataInfo dataTable = getDataTable(list);
List<JDOrder> rows = (List<JDOrder>) dataTable.getRows();
for (JDOrder jdOrder : rows) {
OrderRows orderRows = orderRowsService.selectOrderRowsByOrderId(jdOrder.getOrderId());
if (orderRows != null) {
jdOrder.setProPriceAmount(orderRows.getProPriceAmount());
jdOrder.setFinishTime(orderRows.getFinishTime());
} else {
jdOrder.setProPriceAmount(0.0);
}
}
return dataTable;
}
@PostMapping("/generatePromotionContent")