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

pz-system/src/main/java/com/pz/merchant/domain/bo/WechatLoginBo.java

 package com.pz.merchant.domain.bo;
 package com.pz.merchant.domain.bo;
 
 
-import com.pz.common.core.validate.AddGroup;
-import com.pz.common.core.validate.EditGroup;
 import lombok.Data;
 import lombok.Data;
 
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;

pz-system/src/main/resources/mapper/system/DbghOrderMapper.xml

@@ -58,8 +58,9 @@
             <if test="bo.startTime != null and bo.startTime != '' and bo.endTime != null and bo.endTime != ''">
             <if test="bo.startTime != null and bo.startTime != '' and bo.endTime != null and bo.endTime != ''">
                 and yyod.create_time &gt; = #{bo.startTime} and yyod.create_time &lt; = #{bo.endTime}
                 and yyod.create_time &gt; = #{bo.startTime} and yyod.create_time &lt; = #{bo.endTime}
             </if>
             </if>
+            and yyod.create_time &lt; NOW()
         </where>
         </where>
-        order by yyod.visit_time desc
+        order by yyod.create_time desc
     </select>
     </select>
 
 
     <select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">
     <select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">

pz-system/src/main/resources/mapper/system/DbmyOrderMapper.xml

 <?xml version="1.0" encoding="UTF-8" ?>
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.pz.system.mapper.DbmyOrderMapper">
 <mapper namespace="com.pz.system.mapper.DbmyOrderMapper">
 
 
     <resultMap type="com.pz.system.domain.DbmyOrder" id="DbmyOrderResult">
     <resultMap type="com.pz.system.domain.DbmyOrder" id="DbmyOrderResult">
@@ -43,7 +43,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         tlo.`status` AS tStatus,
         tlo.`status` AS tStatus,
         tlo.is_satisfaction AS isSatisfaction,
         tlo.is_satisfaction AS isSatisfaction,
         tlo.evaluation_content AS evaluationContent,
         tlo.evaluation_content AS evaluationContent,
-            yyod.create_time as createTime
+        yyod.create_time as createTime,
+        yyod.is_refrigerate as isRefrigerate
         FROM
         FROM
         dbmy_order AS yyod
         dbmy_order AS yyod
         LEFT JOIN total_order AS tlo ON yyod.order_id = tlo.id
         LEFT JOIN total_order AS tlo ON yyod.order_id = tlo.id
@@ -61,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bo.startTime != null and bo.startTime != '' and bo.endTime != null and bo.endTime != ''">
             <if test="bo.startTime != null and bo.startTime != '' and bo.endTime != null and bo.endTime != ''">
                 and yyod.create_time &gt; = #{bo.startTime} and yyod.create_time &lt; = #{bo.endTime}
                 and yyod.create_time &gt; = #{bo.startTime} and yyod.create_time &lt; = #{bo.endTime}
             </if>
             </if>
+            and yyod.create_time &lt; NOW()
         </where>
         </where>
         order by yyod.create_time desc
         order by yyod.create_time desc
     </select>
     </select>
@@ -84,8 +86,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                dbmy_order.status                        as serviceStatus,
                dbmy_order.status                        as serviceStatus,
                services.name                            as project,
                services.name                            as project,
                business.name                            as businessName,
                business.name                            as businessName,
-               CONVERT((1 - services.fenmo / 100), decimal(10, 2)) *
-               CONVERT(services.price, decimal(10, 2)) as commission,
+               CONVERT((1 - services.fenmo / 100), decimal (10, 2)) *
+               CONVERT(services.price, decimal (10, 2)) as commission,
                dbmy_order.yp_name,
                dbmy_order.yp_name,
                dbmy_order.yd_address,
                dbmy_order.yd_address,
                dbmy_order.way,
                dbmy_order.way,
@@ -112,8 +114,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     </select>
     <select id="selectFinishTime" resultType="java.lang.String">
     <select id="selectFinishTime" resultType="java.lang.String">
         select over_time
         select over_time
-                   from total_order t left join dbmy_order d on d.order_id = t.id
-        where d.status = 2 and t.id = #{id}
+        from total_order t
+                 left join dbmy_order d on d.order_id = t.id
+        where d.status = 2
+          and t.id = #{id}
     </select>
     </select>
 
 
 
 

pz-system/src/main/resources/mapper/system/DbwzOrderMapper.xml

@@ -62,8 +62,9 @@
             <if test="bo.startTime != null and bo.startTime != '' and bo.endTime != null and bo.endTime != ''">
             <if test="bo.startTime != null and bo.startTime != '' and bo.endTime != null and bo.endTime != ''">
                 and yyod.create_time &gt; = #{bo.startTime} and yyod.create_time &lt; = #{bo.endTime}
                 and yyod.create_time &gt; = #{bo.startTime} and yyod.create_time &lt; = #{bo.endTime}
             </if>
             </if>
+            and yyod.create_time &lt; NOW()
         </where>
         </where>
-        order by yyod.visit_time desc
+        order by yyod.create_time desc
     </select>
     </select>
 
 
     <select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">
     <select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">

pz-system/src/main/resources/mapper/system/OrderMessageMapper.xml

@@ -19,11 +19,12 @@
     </resultMap>
     </resultMap>
 
 
     <select id="selectLastTenRecord" resultType="com.pz.system.domain.vo.AppletOrderMessageVo">
     <select id="selectLastTenRecord" resultType="com.pz.system.domain.vo.AppletOrderMessageVo">
-        select ifnull(order_message.user_name, '') as userName,
+        select distinct ifnull(order_message.user_name, '') as userName,
         ifnull(user.avatar, '') as avatar
         ifnull(user.avatar, '') as avatar
         from order_message
         from order_message
         join total_order on total_order.id = order_message.total_order_id
         join total_order on total_order.id = order_message.total_order_id
         left join sys_user as user on user.user_id = total_order.uid
         left join sys_user as user on user.user_id = total_order.uid
+        <!-- where order_message.city_id = #{city} -->
         order by order_message.id desc
         order by order_message.id desc
         limit 10
         limit 10
     </select>
     </select>

pz-system/src/main/resources/mapper/system/YypzOrderMapper.xml

@@ -60,8 +60,9 @@
             <if test="bo.startTime != null and bo.startTime != '' and bo.endTime != null and bo.endTime != ''">
             <if test="bo.startTime != null and bo.startTime != '' and bo.endTime != null and bo.endTime != ''">
                 and yyod.create_time &gt; = #{bo.startTime} and yyod.create_time &lt; = #{bo.endTime}
                 and yyod.create_time &gt; = #{bo.startTime} and yyod.create_time &lt; = #{bo.endTime}
             </if>
             </if>
+            yyod.create_time &lt; NOW()
         </where>
         </where>
-        order by yyod.visit_time desc
+        order by yyod.create_time desc
     </select>
     </select>
 
 
     <select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">
     <select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">

pz-system/src/main/resources/mapper/system/ZqghOrderMapper.xml

@@ -48,12 +48,15 @@
         LEFT JOIN department AS d ON d.id = yyod.did
         LEFT JOIN department AS d ON d.id = yyod.did
         LEFT JOIN doctor AS s ON s.id = yyod.doctor_id
         LEFT JOIN doctor AS s ON s.id = yyod.doctor_id
         LEFT JOIN sys_user as su on su.user_id = tlo.uid
         LEFT JOIN sys_user as su on su.user_id = tlo.uid
+        <where>
             <if test="bo.orderSn != null and bo.orderSn != ''">
             <if test="bo.orderSn != null and bo.orderSn != ''">
-                    where tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')
+                and tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')
             </if>
             </if>
             <if test="bo.startTime != null and bo.startTime != '' and bo.endTime != null and bo.endTime != ''">
             <if test="bo.startTime != null and bo.startTime != '' and bo.endTime != null and bo.endTime != ''">
                 and yyod.create_time &gt; = #{bo.startTime} and yyod.create_time &lt; = #{bo.endTime}
                 and yyod.create_time &gt; = #{bo.startTime} and yyod.create_time &lt; = #{bo.endTime}
             </if>
             </if>
+            and yyod.create_time &lt; NOW()
+        </where>
         order by tlo.create_time desc
         order by tlo.create_time desc
     </select>
     </select>
 
 

pz-system/src/main/resources/mapper/system/ZyphOrderMapper.xml

@@ -64,6 +64,7 @@
             <if test="bo.startTime != null and bo.startTime != '' and bo.endTime != null and bo.endTime != ''">
             <if test="bo.startTime != null and bo.startTime != '' and bo.endTime != null and bo.endTime != ''">
                 and yyod.create_time &gt; = #{bo.startTime} and yyod.create_time &lt; = #{bo.endTime}
                 and yyod.create_time &gt; = #{bo.startTime} and yyod.create_time &lt; = #{bo.endTime}
             </if>
             </if>
+            and yyod.create_time &lt; NOW()
         </where>
         </where>
         order by yyod.create_time desc
         order by yyod.create_time desc
     </select>
     </select>