瀏覽代碼

feat: 直播退款订单有些东西未生效

xdd 4 天之前
父節點
當前提交
0bb9c54b02

+ 2 - 0
fs-service-system/src/main/java/com/fs/live/vo/LiveAfterSalesVo.java

@@ -1,5 +1,6 @@
 package com.fs.live.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fs.common.annotation.Excel;
 import lombok.Data;
 
@@ -109,6 +110,7 @@ public class LiveAfterSalesVo {
 
     /** 创建时间 */
     @Excel(name = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
     private String companyName;
     private String companyUserNickName;

+ 2 - 1
fs-service-system/src/main/resources/mapper/live/LiveAfterSalesMapper.xml

@@ -74,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         <where>
             <if test="liveId != null and liveId != ''"> and las.live_id = #{liveId}</if>
+            <if test="companyUserNickName != null and companyUserNickName != ''"> and cu.user_name like concat(#{companyUserNickName},'%')</if>
             <if test="storeId != null and storeId != ''"> and las.store_id = #{storeId}</if>
             <if test="orderCode != null and orderCode != ''"> and lo.order_code = #{orderCode}</if>
             <if test="refundAmount != null "> and las.refund_amount = #{refundAmount}</if>
@@ -99,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyId != null "> and las.company_id = #{companyId}</if>
             <if test="companyUserId != null "> and las.company_user_id = #{companyUserId}</if>
             <if test="deptId != null "> and cu.dept_id = #{deptId}</if>
-            <if test="userPhone != null "> and lo.user_phone like concat('%',#{userPhone},'%')</if>
+            <if test="userPhone != null "> and lo.user_phone like concat(#{userPhone},'%')</if>
         </where>
         order by las.create_time desc
     </select>