Merge remote-tracking branch 'origin/dev/feat/partner1.4_20231009' into dev/feat/partner1.4_20231009

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">

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">

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;
 

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());

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());