clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

问题修复

This commit is contained in:
donqi 2022-06-18 01:59:48 +08:00
parent 10af3b417c
commit cf6fa31464
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
View File

@ -160,7 +160,7 @@ public class OrderDetailController extends BaseController {
@PostMapping("/app/list") @PostMapping("/app/list")
@ResponseBody @ResponseBody
public TableDataInfo appList(OrderDetail orderDetail){ public TableDataInfo appList(@RequestBody OrderDetail orderDetail){
startPage(); startPage();
List<OrderListResponse> orderListResponses = new ArrayList<>(); List<OrderListResponse> orderListResponses = new ArrayList<>();

1
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
View File

@ -184,6 +184,7 @@ public class OrderMasterController extends BaseController {
orderStandardDetail.setWorkFinishTime(orderDetail.getWorkFinishTime()); orderStandardDetail.setWorkFinishTime(orderDetail.getWorkFinishTime());
orderStandardDetail.setWorkerName(detailWorker.getName()); orderStandardDetail.setWorkerName(detailWorker.getName());
orderStandardDetail.setWorkerPhone(detailWorker.getPhone()); orderStandardDetail.setWorkerPhone(detailWorker.getPhone());
orderStandardDetail.setRevTime(orderDetail.getRevTime());
orderStandardDetail.setOrderStandardList(standardList); orderStandardDetail.setOrderStandardList(standardList);
orderStandardDetails.add(orderStandardDetail); orderStandardDetails.add(orderStandardDetail);

2
ghy-admin/src/main/java/com/ghy/web/controller/pay/WxPayController.java
View File

@ -77,7 +77,7 @@ public class WxPayController extends BaseController {
List<DivMember> divMembers = new ArrayList<>(); List<DivMember> divMembers = new ArrayList<>();
divMembers.add(new DivMember("C7D101", String.valueOf(financialMaster.getPayMoney()), true)); divMembers.add(new DivMember("C7D101", String.valueOf(financialMaster.getPayMoney()), true));
// TODO 订单里需要补充支付金额、tittle、简要描述、分账信息、description // TODO 订单里需要补充支付金额、tittle、简要描述、分账信息、description
PayParam payParam = new PayParam(orderMaster.getCode(), PayParam payParam = new PayParam(orderMaster.getCode() + "_" + System.currentTimeMillis(),
"0.01", "工圈子居家设备", "工圈子居家设备购买付费"); "0.01", "工圈子居家设备", "工圈子居家设备购买付费");
map = adapayService.wxLitePay(orderMaster.getDeptId(), payParam, expend, null, null); map = adapayService.wxLitePay(orderMaster.getDeptId(), payParam, expend, null, null);
} catch (BaseAdaPayException e) { } catch (BaseAdaPayException e) {

2
ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java
View File

@ -16,6 +16,8 @@ public class OrderStandardDetail {
private String workerPhone; private String workerPhone;
private Date revTime;
private Date workBeginTime; private Date workBeginTime;
private Date workFinishTime; private Date workFinishTime;