From 11ff0ab0ae65e6c57d8239879f9dd53c4cee9770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Fri, 22 Sep 2023 14:31:39 +0800
Subject: [PATCH 1/2] update_time

---
 .../main/resources/mapper/HyPartnerIntentInfoMapper.xml    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml
index a073cbe35..5cbedfa80 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml
@@ -360,7 +360,12 @@
     <if test="workflowStatus!=null and workflowStatus!=''">
       and a.workflow_status = #{workflowStatus}
     </if>
-    order by b.create_time
+    <if test="workflowStatus!=null and workflowStatus=='1'">
+      order by b.update_time
+    </if>
+    <if test="workflowStatus!=null and workflowStatus=='0'">
+      order by a.create_time
+    </if>
   </select>
 
   <select id="selectByLineId" resultMap="BaseResultMap">

From 25471df1618c2a9d7a61108fff4dda1071233ac6 Mon Sep 17 00:00:00 2001
From: zhangchenbiao <chenbiao.zhang@coolcollege.cn>
Date: Fri, 22 Sep 2023 14:40:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E7=94=A8?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/BeautyCameraSettingMapper.xml    | 11 ++---------
 .../com/cool/store/entity/BeautyCameraSettingDO.java  |  3 ---
 .../request/beauty/AddBeautyCameraSettingRequest.java |  4 ----
 .../cool/store/vo/beauty/BeautyCameraSettingVO.java   |  4 ----
 4 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/BeautyCameraSettingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/BeautyCameraSettingMapper.xml
index e92f6d17f..04d6a6a7c 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/BeautyCameraSettingMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/BeautyCameraSettingMapper.xml
@@ -4,7 +4,6 @@
     <resultMap id="BaseResultMap" type="com.cool.store.entity.BeautyCameraSettingDO">
         <id column="id" jdbcType="BIGINT" property="id"/>
         <result column="user_id" jdbcType="VARCHAR" property="userId"/>
-        <result column="beauty_status" jdbcType="BIT" property="beautyStatus"/>
         <result column="beauty" jdbcType="INTEGER" property="beauty"/>
         <result column="brightness" jdbcType="INTEGER" property="brightness"/>
         <result column="ruddy" jdbcType="INTEGER" property="ruddy"/>
@@ -13,7 +12,7 @@
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
     </resultMap>
     <sql id="Base_Column_List">
-        id, user_id, beauty_status, beauty, brightness, ruddy, deleted, create_time, update_time
+        id, user_id, beauty, brightness, ruddy, deleted, create_time, update_time
     </sql>
 
     <insert id="insertOrUpdateBeautyCameraSetting" keyColumn="id" keyProperty="record.id" useGeneratedKeys="true">
@@ -22,9 +21,6 @@
         <if test="record.userId != null">
           user_id,
         </if>
-        <if test="record.beautyStatus != null">
-          beauty_status,
-        </if>
         <if test="record.beauty != null">
           beauty,
         </if>
@@ -48,9 +44,6 @@
         <if test="record.userId != null">
           #{record.userId},
         </if>
-        <if test="record.beautyStatus != null">
-          #{record.beautyStatus},
-        </if>
         <if test="record.beauty != null">
           #{record.beauty},
         </if>
@@ -70,7 +63,7 @@
           #{record.updateTime},
         </if>
       </trim>
-      ON DUPLICATE KEY UPDATE beauty_status = values(beauty_status), beauty = values(beauty), brightness = values(brightness), ruddy = values(ruddy)
+      ON DUPLICATE KEY UPDATE beauty = values(beauty), brightness = values(brightness), ruddy = values(ruddy)
     </insert>
 
     <select id="getBeautyCameraSetting" resultMap="BaseResultMap">
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/BeautyCameraSettingDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/BeautyCameraSettingDO.java
index 3623223ce..19e320d21 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/BeautyCameraSettingDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/BeautyCameraSettingDO.java
@@ -26,9 +26,6 @@ public class BeautyCameraSettingDO implements Serializable {
     @ApiModelProperty("用户id")
     private String userId;
 
-    @ApiModelProperty("美颜状态0未开启,1开启")
-    private Boolean beautyStatus;
-
     @ApiModelProperty("美颜度")
     private Integer beauty;
 
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/beauty/AddBeautyCameraSettingRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/beauty/AddBeautyCameraSettingRequest.java
index f7aa1b6fe..f1f62fe3e 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/beauty/AddBeautyCameraSettingRequest.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/beauty/AddBeautyCameraSettingRequest.java
@@ -15,9 +15,6 @@ import java.util.Date;
 @Data
 public class AddBeautyCameraSettingRequest {
 
-    @ApiModelProperty("美颜状态0未开启,1开启")
-    private Boolean beautyStatus;
-
     @ApiModelProperty("美颜度")
     private Integer beauty;
 
@@ -31,7 +28,6 @@ public class AddBeautyCameraSettingRequest {
     public static BeautyCameraSettingDO convertDO(String userId, AddBeautyCameraSettingRequest request){
         BeautyCameraSettingDO result = new BeautyCameraSettingDO();
         result.setUserId(userId);
-        result.setBeautyStatus(request.getBeautyStatus());
         result.setBeauty(request.getBeauty());
         result.setBrightness(request.getBrightness());
         result.setRuddy(request.getRuddy());
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/beauty/BeautyCameraSettingVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/beauty/BeautyCameraSettingVO.java
index dd3b55979..74d73cd18 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/beauty/BeautyCameraSettingVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/beauty/BeautyCameraSettingVO.java
@@ -15,9 +15,6 @@ import java.util.Objects;
 @Data
 public class BeautyCameraSettingVO {
 
-    @ApiModelProperty("美颜状态0未开启,1开启")
-    private Boolean beautyStatus;
-
     @ApiModelProperty("美颜度")
     private Integer beauty;
 
@@ -32,7 +29,6 @@ public class BeautyCameraSettingVO {
             return null;
         }
         BeautyCameraSettingVO result = new BeautyCameraSettingVO();
-        result.setBeautyStatus(request.getBeautyStatus());
         result.setBeauty(request.getBeauty());
         result.setBrightness(request.getBrightness());
         result.setRuddy(request.getRuddy());