diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java index ca18dfdd..2be302c2 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java @@ -160,7 +160,7 @@ public class OrderDetailController extends BaseController { @PostMapping("/app/list") @ResponseBody - public TableDataInfo appList(OrderDetail orderDetail){ + public TableDataInfo appList(@RequestBody OrderDetail orderDetail){ startPage(); List orderListResponses = new ArrayList<>(); diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index db99e31e..b3263481 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -184,6 +184,7 @@ public class OrderMasterController extends BaseController { orderStandardDetail.setWorkFinishTime(orderDetail.getWorkFinishTime()); orderStandardDetail.setWorkerName(detailWorker.getName()); orderStandardDetail.setWorkerPhone(detailWorker.getPhone()); + orderStandardDetail.setRevTime(orderDetail.getRevTime()); orderStandardDetail.setOrderStandardList(standardList); orderStandardDetails.add(orderStandardDetail); diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/pay/WxPayController.java b/ghy-admin/src/main/java/com/ghy/web/controller/pay/WxPayController.java index 82f761e1..9baaeab5 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/pay/WxPayController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/pay/WxPayController.java @@ -77,7 +77,7 @@ public class WxPayController extends BaseController { List divMembers = new ArrayList<>(); divMembers.add(new DivMember("C7D101", String.valueOf(financialMaster.getPayMoney()), true)); // TODO 订单里需要补充支付金额、tittle、简要描述、分账信息、description - PayParam payParam = new PayParam(orderMaster.getCode(), + PayParam payParam = new PayParam(orderMaster.getCode() + "_" + System.currentTimeMillis(), "0.01", "工圈子居家设备", "工圈子居家设备购买付费"); map = adapayService.wxLitePay(orderMaster.getDeptId(), payParam, expend, null, null); } catch (BaseAdaPayException e) { diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java index a21225e8..43901e7f 100644 --- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java @@ -16,6 +16,8 @@ public class OrderStandardDetail { private String workerPhone; + private Date revTime; + private Date workBeginTime; private Date workFinishTime;