问题修复

ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java

@@ -600,6 +600,8 @@ public class OrderController extends BaseController {
             orderListResponse.setServerTime(master.getRevTime());
             orderListResponse.setExpectTimeStart(master.getExpectTimeStart());
             orderListResponse.setExpectTimeEnd(master.getExpectTimeEnd());
+            orderListResponse.setExpectTimeStartFront(master.getExpectTimeStart());
+            orderListResponse.setExpectTimeEndFront(master.getExpectTimeEnd());
             orderListResponse.setOrderStatus(master.getOrderStatus());
             orderListResponse.setPayStatus(master.getPayStatus());
             orderListResponse.setPayType(master.getPayType());
@@ -688,6 +690,8 @@ public class OrderController extends BaseController {
             orderListResponse.setServerTime(detail.getRevTime());
             orderListResponse.setExpectTimeStart(detail.getExpectTimeStart());
             orderListResponse.setExpectTimeEnd(detail.getExpectTimeEnd());
+            orderListResponse.setExpectTimeStartFront(detail.getExpectTimeStart());
+            orderListResponse.setExpectTimeEndFront(detail.getExpectTimeEnd());
             orderListResponse.setWorkBeginTime(detail.getWorkBeginTime());
             orderListResponse.setWorkFinishTime(detail.getWorkFinishTime());
             orderListResponse.setClockInLocation(detail.getClockInLocation());

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

@@ -232,6 +232,8 @@ public class OrderDetailController extends BaseController {
             orderListResponse.setServerTime(detail.getRevTime());
             orderListResponse.setExpectTimeStart(detail.getExpectTimeStart());
             orderListResponse.setExpectTimeEnd(detail.getExpectTimeEnd());
+            orderListResponse.setExpectTimeStartFront(detail.getExpectTimeStart());
+            orderListResponse.setExpectTimeEndFront(detail.getExpectTimeEnd());
             orderListResponse.setCreateTime(detail.getCreateTime());
             orderListResponse.setWorkBeginTime(detail.getWorkBeginTime());
             orderListResponse.setWorkFinishTime(detail.getWorkFinishTime());
@@ -346,6 +348,8 @@ public class OrderDetailController extends BaseController {
             orderListResponse.setServerTime(detail.getRevTime());
             orderListResponse.setExpectTimeStart(detail.getExpectTimeStart());
             orderListResponse.setExpectTimeEnd(detail.getExpectTimeEnd());
+            orderListResponse.setExpectTimeStartFront(detail.getExpectTimeStart());
+            orderListResponse.setExpectTimeEndFront(detail.getExpectTimeEnd());
             orderListResponse.setWorkBeginTime(detail.getWorkBeginTime());
             orderListResponse.setWorkFinishTime(detail.getWorkFinishTime());
             orderListResponse.setClockInLocation(detail.getClockInLocation());
@@ -362,7 +366,6 @@ public class OrderDetailController extends BaseController {
     @PostMapping("/after/list")
     @ResponseBody
     public TableDataInfo afterServiceList(@RequestBody OrderDetail orderDetail) {
-        FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(orderDetail.getOrderMasterId());
         AfterServiceRecord afterServiceRecord = new AfterServiceRecord();
         afterServiceRecord.setExcludeAfterServiceFinished(Boolean.TRUE);
         List<AfterServiceRecord> afterServiceRecordList = afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecord);
@@ -442,6 +445,7 @@ public class OrderDetailController extends BaseController {
             Boolean isOverTime = orderTimeoutRecord == null ? false : true;
 
             if(this.checkIsOnlyServer(orderMaster.getId(), detail.getWorkerId())){
+                FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(detail.getOrderMasterId());
                 BigDecimal workerFee = financialMaster.getPayMoney();
                 List<FinancialDetail> financialDetailList = financialDetailService.selectByFinancialMasterId(financialMaster.getId());
                 for (FinancialDetail param : financialDetailList) {
@@ -476,6 +480,8 @@ public class OrderDetailController extends BaseController {
             orderListResponse.setServerTime(detail.getRevTime());
             orderListResponse.setExpectTimeStart(detail.getExpectTimeStart());
             orderListResponse.setExpectTimeEnd(detail.getExpectTimeEnd());
+            orderListResponse.setExpectTimeStartFront(detail.getExpectTimeStart());
+            orderListResponse.setExpectTimeEndFront(detail.getExpectTimeEnd());
             orderListResponse.setWorkBeginTime(detail.getWorkBeginTime());
             orderListResponse.setWorkFinishTime(detail.getWorkFinishTime());
             orderListResponse.setRemark(goods.getRemark());

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

@@ -191,6 +191,8 @@ public class OrderMasterController extends BaseController {
             orderListResponse.setServerTime(master.getRevTime());
             orderListResponse.setExpectTimeStart(master.getExpectTimeStart());
             orderListResponse.setExpectTimeEnd(master.getExpectTimeEnd());
+            orderListResponse.setExpectTimeStartFront(master.getExpectTimeStart());
+            orderListResponse.setExpectTimeEndFront(master.getExpectTimeEnd());
             orderListResponse.setOrderStatus(master.getOrderStatus());
             orderListResponse.setPayStatus(financialMaster.getPayStatus());
             orderListResponse.setPayType(master.getPayType());
@@ -334,6 +336,8 @@ public class OrderMasterController extends BaseController {
             orderListResponse.setServerTime(master.getRevTime());
             orderListResponse.setExpectTimeStart(master.getExpectTimeStart());
             orderListResponse.setExpectTimeEnd(master.getExpectTimeEnd());
+            orderListResponse.setExpectTimeStartFront(master.getExpectTimeStart());
+            orderListResponse.setExpectTimeEndFront(master.getExpectTimeEnd());
             orderListResponse.setOrderStatus(master.getOrderStatus());
             orderListResponse.setPayStatus(master.getPayStatus());
             orderListResponse.setPayType(master.getPayType());
@@ -428,6 +432,8 @@ public class OrderMasterController extends BaseController {
                 orderStandardDetail.setRevTime(orderDetail.getRevTime());
                 orderStandardDetail.setExpectTimeStart(orderDetail.getExpectTimeStart());
                 orderStandardDetail.setExpectTimeEnd(orderDetail.getExpectTimeEnd());
+                orderStandardDetail.setExpectTimeStartFront(orderDetail.getExpectTimeStart());
+                orderStandardDetail.setExpectTimeEndFront(orderDetail.getExpectTimeEnd());
                 orderStandardDetail.setOrderStandardList(standardList);
                 orderStandardDetail.setFinishImgList(finishImgList);
                 orderStandardDetail.setRemark(orderDetail.getRemark());
@@ -503,6 +509,8 @@ public class OrderMasterController extends BaseController {
             orderListResponse.setServerTime(orderMaster.getRevTime());
             orderListResponse.setExpectTimeStart(orderMaster.getExpectTimeStart());
             orderListResponse.setExpectTimeEnd(orderMaster.getExpectTimeEnd());
+            orderListResponse.setExpectTimeStartFront(orderMaster.getExpectTimeStart());
+            orderListResponse.setExpectTimeEndFront(orderMaster.getExpectTimeEnd());
             orderListResponse.setCreateTime(orderMaster.getCreateTime());
             orderListResponse.setRemark(goods.getRemark());
             orderListResponse.setCustomerRemark(orderMaster.getRemark());

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

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

ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java

@@ -40,9 +40,13 @@ public class OrderListResponse {
     private Date serverTime;
 
     @JsonFormat(pattern = "YYYY-MM-dd HH:mm")
-    private Date expectTimeStart;
+    private Date expectTimeStartFront;
 
     @JsonFormat(pattern = "HH:mm")
+    private Date expectTimeEndFront;
+
+    private Date expectTimeStart;
+
     private Date expectTimeEnd;
 
     private Date workBeginTime;

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

@@ -23,9 +23,13 @@ public class OrderStandardDetail {
     private Date revTime;
 
     @JsonFormat(pattern = "YYYY-MM-dd HH:mm")
-    private Date expectTimeStart;
+    private Date expectTimeStartFront;
 
     @JsonFormat(pattern = "HH:mm")
+    private Date expectTimeEndFront;
+
+    private Date expectTimeStart;
+
     private Date expectTimeEnd;
 
     private Date workBeginTime;

ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java

@@ -72,4 +72,5 @@ public class OrderDetail extends BaseEntity {
 
     private String orderDetailIds;
 
+    private Boolean useTimeNotRange;
 }

ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java

@@ -83,4 +83,6 @@ public class OrderMaster extends BaseEntity {
     private Boolean isOverTime;
 
     private String orderMasterIds;
+
+    private Boolean useTimeNotRange;
 }

ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml

@@ -204,6 +204,7 @@
             <if test="revTime != null">rev_time = #{revTime},</if>
             <if test="expectTimeStart != null">expect_time_start = #{expectTimeStart},</if>
             <if test="expectTimeEnd != null">expect_time_end = #{expectTimeEnd},</if>
+            <if test="useTimeNotRange">expect_time_end = null,</if>
             <if test="workBeginTime != null">work_begin_time = #{workBeginTime},</if>
             <if test="workFinishTime != null">work_finish_time = #{workFinishTime},</if>
             <if test="clockInLocation != null and clockInLocation != ''">clock_in_location = #{clockInLocation},</if>

ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml

@@ -211,6 +211,7 @@
             <if test="revTime != null">rev_time = #{revTime},</if>
             <if test="expectTimeStart != null">expect_time_start = #{expectTimeStart},</if>
             <if test="expectTimeEnd != null">expect_time_end = #{expectTimeEnd},</if>
+            <if test="useTimeNotRange">expect_time_end = null,</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             update_time = SYSDATE()
         </set>