Merge branch 'dev' into test

share-admin/src/main/java/share/web/controller/system/SRoomController.java

@@ -76,6 +76,7 @@ public class SRoomController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
+
         return success(sRoomService.selectSRoomById(id));
     }
 

share-system/src/main/java/share/system/domain/SRoom.java

@@ -129,4 +129,8 @@ public class SRoom extends BaseEntity
     @TableField(exist = false)
     private Integer queryNotRoomStat;
 
+    /** 房间类型文本录入 */
+    @Excel(name = "房间类型文本录入")
+    private String textInput;
+
 }

share-system/src/main/java/share/system/domain/vo/SRoomVo.java

@@ -164,6 +164,10 @@ public class SRoomVo extends BaseEntity
      */
     private Integer orderType;
 
+    /** 房间类型文本录入 */
+    @Excel(name = "房间类型文本录入")
+    private String textInput;
+
 
     @Override
     public String toString() {

share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

@@ -3493,6 +3493,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
         //门店交易-门店交易退款
         statisticsResponse.setActualFee(statisticsResponse.getStoreFee().subtract(statisticsResponse.getStoreRefundFee()));
         //计算开始时间和结束时间相差多少天
+        /**
         if (ObjectUtil.isNotEmpty(request.getStartTime()) && ObjectUtil.isNotEmpty(request.getEndTime())) {
             long between = DateUtil.getTwoDateDays(request.getStartTime(), request.getEndTime());
 //             ChronoUnit.DAYS.between((Temporal) request.getStartTime(), (Temporal) request.getEndTime());
@@ -3504,6 +3505,8 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 orderVoList = orderVoList.stream().filter(order -> order.getCreateTime().after(date)).collect(Collectors.toList());
             }
         }
+         */
+        orderVoList.sort(Comparator.comparing(OrderVo::getCreateTime).reversed());
         if (orderVoList.size() > 5) {
             statisticsResponse.setOrderVoList(orderVoList.subList(0, 5));
         } else {

share-system/src/main/resources/mapper/system/SRoomMapper.xml

@@ -26,6 +26,7 @@
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
         <result property="roomStat"    column="room_stat"    />
+        <result property="textInput"    column="text_input"    />
     </resultMap>
 
     <sql id="selectSRoomVo">
@@ -49,7 +50,8 @@
                update_by,
                update_time,
                remark,
-               room_stat
+               room_stat,
+               text_input
         from s_room
     </sql>
 
@@ -71,8 +73,6 @@
             <if test="params2 != null  and params2 != ''"> and params2 = #{params2}</if>
             <if test="roomStat != null">and room_stat = #{roomStat}</if>
             <if test="queryNotRoomStat != null ">and room_stat != #{queryNotRoomStat}</if>
-
-
         </where>
         order by sort desc
     </select>
@@ -105,6 +105,7 @@
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
             <if test="roomStat != null">room_stat,</if>
+            <if test="textInput != null">text_input</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="sort != null">#{sort},</if>
@@ -127,6 +128,7 @@
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
             <if test="roomStat != null">#{roomStat},</if>
+            <if test="textInput != null">#{textInput}</if>
         </trim>
     </insert>
 
@@ -153,6 +155,7 @@
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="roomStat != null">room_stat = #{roomStat},</if>
+            <if test="textInput != null">text_input = #{textInput}</if>
         </trim>
         where id = #{id}
     </update>