fix:bug 上次的体现记录,增加订单时间节点

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TOrderController.java

@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -159,6 +160,7 @@ public class TOrderController {
             LambdaQueryWrapper<TOrder> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(TOrder::getcId,order.getcId()).eq(TOrder::getnStatus,OrderStatusEnum.RECEIVED_ORDER.getCode());
             order.setnStatus(OrderStatusEnum.ARRIVED.getCode());
+            order.setReachTime(LocalDateTime.now());
             return R.ok(orderService.update(order,wrapper));
         } catch (ServiceException s) {
             log.error(s.toString());
@@ -178,6 +180,7 @@ public class TOrderController {
             LambdaQueryWrapper<TOrder> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(TOrder::getcId,order.getcId()).eq(TOrder::getnStatus,OrderStatusEnum.ARRIVED.getCode());
             order.setnStatus(OrderStatusEnum.SERVICE.getCode());
+            order.setStartTime(LocalDateTime.now());
             return R.ok(orderService.update(order,wrapper));
         } catch (ServiceException s) {
             log.error(s.toString());

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TTxRecordController.java

@@ -50,6 +50,22 @@ public class TTxRecordController {
             return R.fail("系统异常");
         }
     }
+    @ApiOperation("查询上次提现记录")
+    @RequestMapping(value = "wx/last", method = RequestMethod.POST)
+    public R<TTxRecord> last(@RequestBody TTxRecord record) {
+        try {
+            LambdaQueryWrapper<TTxRecord> tTxRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            tTxRecordLambdaQueryWrapper.eq(TTxRecord::getcOpenId,record.getcOpenId()).orderByDesc(TTxRecord::getcId).last("LIMIT 1");;
+            return R.ok(recordService.getOne(tTxRecordLambdaQueryWrapper));
+        } catch (ServiceException s) {
+            log.error(s.getMessage());
+            return R.fail(s.getMessage());
+        } catch (Exception e) {
+            StackTraceElement stackTraceElement= e.getStackTrace()[0];
+            log.error("系统出错，错误信息:"+ e +" at "+stackTraceElement.getClassName()+"."+stackTraceElement.getMethodName()+":"+stackTraceElement.getLineNumber());
+            return R.fail("系统异常");
+        }
+    }
 
     @ApiOperation("审核通过/驳回")
     @RequestMapping(value = "wx/auditing", method = RequestMethod.POST)

nightFragrance-massage/src/main/java/com/ylx/massage/domain/TOrder.java

@@ -98,6 +98,21 @@ public class TOrder implements Serializable {
     @ApiModelProperty("地址name")
     private String name;
 
+    @ApiModelProperty("接单时间")
+    private LocalDateTime acceptanceTime;
+
+    @ApiModelProperty("到达时间")
+    private LocalDateTime reachTime;
+
+    @ApiModelProperty("开始服务时间")
+    private LocalDateTime startTime;
+
+    @ApiModelProperty("结束时间")
+    private LocalDateTime endTime;
+
+    @ApiModelProperty("拒接原因")
+    private String reasonRefusal;
+
     /**
      * 领取优惠卷id
      */

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/TOrderServiceImpl.java

@@ -372,6 +372,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         TOrder orderParam = new TOrder();
         orderParam.setcId(orderNew.getcId());
         orderParam.setnStatus(OrderStatusEnum.REFUSE.getCode());
+        orderParam.setReasonRefusal(order.getReasonRefusal());
         updateJs(orderNew);
         return updateById(orderParam);
     }
@@ -437,6 +438,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         }
         // 更新订单
         orderNew.setnStatus(OrderStatusEnum.WAIT_EVALUATE.getCode());
+        orderNew.setEndTime(LocalDateTime.now());
         return updateById(orderNew);
     }
 
@@ -566,6 +568,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         TOrder orderParam = new TOrder();
         orderParam.setcId(order.getcId());
         orderParam.setnStatus(OrderStatusEnum.RECEIVED_ORDER.getCode());
+        orderParam.setAcceptanceTime(LocalDateTime.now());
         this.updateById(orderParam);
     }
 

nightFragrance-massage/src/main/resources/mapper/massage/TOrderMapper.xml

@@ -31,6 +31,12 @@
         <result column="latitude" property="latitude"/>
         <result column="c_tj_open_id" property="cTjOpenId"/>
         <result column="dt_create_time" property="dtCreateTime"/>
+        <result column="acceptance_time" property="acceptanceTime"/>
+        <result column="reach_time" property="reachTime"/>
+        <result column="start_time" property="startTime"/>
+        <result column="end_time" property="endTime"/>
+        <result column="reason_refusal" property="reasonRefusal"/>
+
         <association property="js" javaType="com.ylx.massage.domain.TJs">
             <id column="jsc_id" property="cOpenId"/>
             <result column="jsc_bh_list" property="cBhList"/>
@@ -86,6 +92,11 @@
                t_order.address,
                t_order.c_tj_open_id,
                t_order.dt_create_time,
+               t_order.acceptance_time,
+               t_order.reach_time,
+               t_order.start_time,
+               t_order.end_time,
+               t_order.reason_refusal,
                t_js.c_open_id        as jsc_open_id,
                t_js.c_bh_list        as jsc_bh_list,
                t_js.c_img_list       as jsc_img_list,