Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/chuanghai/repair/controller/AutoSendOrderCentroller.java
#	src/main/java/com/chuanghai/repair/controller/OrderController.java
#	src/main/java/com/chuanghai/repair/utils/CreateTokenUtil.java

src/main/java/com/chuanghai/repair/controller/WorkController.java

@@ -52,7 +52,7 @@ public class WorkController {
         try {
             if (!workName.equals("") && !workPhone.equals("")) {
                 RepairsWork testWork = repairsWorkService.queryByWorkNamePhone(workName, workPhone);
-                RepairsWork repairsWork = new RepairsWork(null, workName, workPassword, workPhone, "1", "0", workCampus);
+                RepairsWork repairsWork = new RepairsWork(null, workName, workPassword, workPhone, "1", "0", workCampus,null);
                 if (testWork == null) {
                     //匹配数据库中同名同手机的用户，相同则表示用户已存在注册失败，不同则用户继续注册
                     repairsWorkService.insertWork(repairsWork);

src/main/java/com/chuanghai/repair/controller/WxController.java

@@ -167,7 +167,7 @@ public class WxController {
 
 
     /**
-     * 微校授权回调地址
+     * 微校授权回调地址  微校pos机器签约设置
      *
      * @param wxcode 微校code
      * @param state  透传数据

src/main/java/com/chuanghai/repair/entity/RepairsOrder.java

@@ -35,6 +35,14 @@ public class RepairsOrder {
     private String orderImages;
 
     /**
+     * 维修完成图片
+     */
+    @ApiModelProperty(value = "维修完成图片")
+    @Column(name = "repair_image")
+    private String repairImage;
+
+
+    /**
      * 订单备注
      */
     @ApiModelProperty(value = "订单备注")
@@ -68,6 +76,14 @@ public class RepairsOrder {
     private Date orderCommitTime;
 
     /**
+     * 派单时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @ApiModelProperty(value = "派单时间")
+    @Column(name = "order_repair_time")
+    private Date orderRepairTime;
+
+    /**
      * 订单退回时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")

src/main/java/com/chuanghai/repair/entity/RepairsWork.java

@@ -75,4 +75,10 @@ public class RepairsWork {
     @Column(name = "work_campus")
     private String workCampus;
 
+    /**
+     * 微校号
+       */
+    @ApiModelProperty(value ="微校号" )
+    private String cardNumber;
+
 }

src/main/java/com/chuanghai/repair/service/ServiceImpl/RepairsBuildFloorRoomServiceImpl.java

@@ -21,10 +21,10 @@ import java.util.List;
 @Service("repairsBuildFloorRoomService")
 public class RepairsBuildFloorRoomServiceImpl implements RepairsBuildFloorRoomService {
 
-    @Resource
-    private RepairsBuildMapper repairsBuildMapper;
+        @Resource
+        private RepairsBuildMapper repairsBuildMapper;
 
-    @Resource
+        @Resource
     private RepairsFloorMapper repairsFloorMapper;
 
     @Resource

src/main/java/com/chuanghai/repair/service/ServiceImpl/RepairsOrderServiceImpl.java

@@ -3,6 +3,7 @@ package com.chuanghai.repair.service.ServiceImpl;
 import com.chuanghai.repair.entity.RepairsOrder;
 import com.chuanghai.repair.entity.RepairsWork;
 import com.chuanghai.repair.mapper.RepairsOrderMapper;
+import com.chuanghai.repair.mapper.RepairsWorkMapper;
 import com.chuanghai.repair.service.RepairsOrderService;
 import com.chuanghai.repair.utils.ListUtil;
 import com.chuanghai.repair.utils.MyPageInfo;
@@ -27,6 +28,7 @@ public class RepairsOrderServiceImpl implements RepairsOrderService {
 
     @Resource
     private RepairsOrderMapper repairsOrderMapper;
+ 
 
     /**
      * 通过查询订单  1  2 3 4

src/main/resources/mapper/RepairsOrderMapper.xml

@@ -12,6 +12,7 @@
         <result column="order_complete_time" property="orderCompleteTime" jdbcType="TIMESTAMP"/>
         <result column="order_commit_time" property="orderCommitTime" jdbcType="TIMESTAMP"/>
         <result column="order_back_time" property="orderBackTime" jdbcType="TIMESTAMP"/>
+        <result column="order_repair_time" property="orderRepairTime" jdbcType="TIMESTAMP"/>
         <result column="order_advice" property="orderAdvice" jdbcType="VARCHAR"/>
         <result column="order_status" property="orderStatus" jdbcType="VARCHAR"/>
         <result column="order_price" property="orderPrice" jdbcType="DECIMAL"/>
@@ -188,11 +189,13 @@
     <resultMap id="queryByOrderIdMap" type="com.chuanghai.repair.entity.RepairsOrder">
         <id column="order_id" property="orderId" jdbcType="VARCHAR"/>
         <result column="order_images" property="orderImages" jdbcType="VARCHAR"/>
+        <result column="repair_image" property="repairImage" jdbcType="VARCHAR"/>
         <result column="order_advice" property="orderAdvice" jdbcType="VARCHAR"/>
         <result column="order_status" property="orderStatus" jdbcType="VARCHAR"/>
         <result column="order_expected_time" property="orderExpectedTime" jdbcType="VARCHAR"/>
         <result column="order_commit_time" property="orderCommitTime" jdbcType="TIMESTAMP"/>
         <result column="order_complete_time" property="orderCompleteTime" jdbcType="TIMESTAMP"/>
+        <result column="order_repair_time" property="orderRepairTime" jdbcType="TIMESTAMP"/>
         <result column="order_back_time" property="orderBackTime" jdbcType="TIMESTAMP"/>
 
         <result column="order_back" property="orderBack" jdbcType="VARCHAR"/>

src/main/resources/mapper/RepairsWorkMapper.xml

@@ -12,6 +12,7 @@
         <result column="work_status" property="workStatus" jdbcType="VARCHAR"/>
         <result column="work_type" property="workType" jdbcType="VARCHAR"/>
         <result column="work_campus" property="workCampus" jdbcType="VARCHAR"/>
+        <result column="card_number" property="cardNumber" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!--维修工登录-->