Merge remote-tracking branch 'origin/dev' into dev

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/WalletDetailListDTO.java

@@ -58,4 +58,10 @@ public class WalletDetailListDTO {
     @ApiModelProperty(value = "操作时间", hidden = true )
     private Long crtTime;
 
+    @ApiModelProperty(value = "订单号")
+    private String orderNo;
+
+    @ApiModelProperty(value = "来源人")
+    private String sourceUserName;
+
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/WalletDetailAdminVo.java

@@ -49,6 +49,13 @@ public class WalletDetailAdminVo {
     @ApiModelProperty(value = "操作时间", hidden = true )
     private Long crtTime;
 
+    @ApiModelProperty(value = "来源")
     private String sourceName;
 
+    @ApiModelProperty(value = "订单号")
+    private String orderNo;
+
+    @ApiModelProperty(value = "来源人")
+    private String sourceUserName;
+
 }

ace-modules/ace-admin/src/main/resources/mapper/MyWalletDetailMapper.xml

@@ -18,7 +18,9 @@
 	ausw.price,
 	ausw.extract,
 	ausw.waiting,
-	ausw.title
+	ausw.title,
+	ausw.order_no,
+	ausw.sourceUserName
 FROM
 	(select id,user_id,source,amount,cono,itype,activity_id,activity_name,`crt_time` FROM `my_wallet_detail` <if test="sourceType != null">
 		WHERE `source`=#{sourceType}
@@ -29,7 +31,7 @@ FROM
 		INNER JOIN (SELECT userid,nickname,realname FROM `app_user_detail`<if test="userName != null and userName != ''">
 		WHERE `nickname`=#{userName} OR `realname`=#{userName}
 	</if>) AS `aud` ON aud.userid = aul.id
-	LEFT JOIN (SELECT DISTINCT order_id,id,price,extract,waiting,title FROM `app_user_selling_water`) AS `ausw` ON ausw.order_id = wd.cono
+	LEFT JOIN (SELECT DISTINCT order_id,au.id,order_no,IFNULL(d.realname,d.nickname) AS `sourceUserName`,price,extract,waiting,title FROM `app_user_selling_water` AS `au` INNER JOIN `app_user_detail` AS `d` ON d.userid=au.source_id) AS `ausw` ON ausw.order_id = wd.cono
 		 ORDER	BY `crtTime` DESC
     </select>
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleCountRecordBiz.java

@@ -196,7 +196,7 @@ public class VehicleCountRecordBiz extends BaseBiz<VehicleCountRecordMapper, Veh
                 tourCountRecord.setActualArrivalNum(tourArrivalList.size());
             }
             //内部用车应还车数量
-            List<VehicleBookRecordVo> vehicleArrivalBookRecordList = vehicleBookRecordBiz.selectAllBookRecord(startTime, endTime, 1).getData();
+            List<VehicleBookRecordVo> vehicleArrivalBookRecordList = vehicleBookRecordBiz.selectAllBookRecord(startTime, endTime, 2).getData();
             if (vehicleArrivalBookRecordList != null && vehicleArrivalBookRecordList.size() > 0) {
                 innerCountRecord.setArrivalNum(vehicleArrivalBookRecordList.size());
                 Map<Integer, Integer> map = getDeparture(vehicleDepartureBookRecordList, 2);
@@ -325,7 +325,7 @@ public class VehicleCountRecordBiz extends BaseBiz<VehicleCountRecordMapper, Veh
             tourCountRecord.setActualArrivalNum(tourArrivalList.size());
         }
         //内部用车应还车数量
-        List<VehicleBookRecordVo> vehicleArrivalBookRecordList = vehicleBookRecordBiz.selectAllBookRecord(startTime, endTime, 1).getData();
+        List<VehicleBookRecordVo> vehicleArrivalBookRecordList = vehicleBookRecordBiz.selectAllBookRecord(startTime, endTime, 2).getData();
         if (vehicleArrivalBookRecordList != null && vehicleArrivalBookRecordList.size() > 0) {
             innerCountRecord.setArrivalNum(vehicleArrivalBookRecordList.size());
             Map<Integer, Integer> map = getDeparture(vehicleDepartureBookRecordList, 2);