北京卓美存在的问题修复

fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreAfterSalesScrmController.java

@@ -133,6 +133,9 @@ public class FsStoreAfterSalesScrmController extends BaseController
 //                            zmvo.setAfterSalesNumber
                             zmvo.setRefundMoney(vo.getRefundAmount());
                             zmvo.setBankTransactionId(vo.getBankTransactionId());
+                            zmvo.setReasons(vo.getReasons());
+                            zmvo.setExplains(vo.getExplains());
+
                         } catch (Exception e) {
                             // 处理异常
                             e.printStackTrace();

fs-admin/src/main/java/com/fs/live/controller/LiveAfterSalesController.java

@@ -143,6 +143,8 @@ public class LiveAfterSalesController extends BaseController
 //                            zmvo.setAfterSalesNumber
                             zmvo.setRefundMoney(vo.getRefundAmount());
                             zmvo.setBankTransactionId(vo.getBankTransactionId());
+                            zmvo.setReasons(vo.getReasons());
+                            zmvo.setExplains(vo.getExplains());
                         } catch (Exception e) {
                             // 处理异常
                             e.printStackTrace();

fs-service/src/main/java/com/fs/hisStore/vo/FsStoreOrderItemExportRefundZMVO.java

@@ -130,4 +130,12 @@ public class FsStoreOrderItemExportRefundZMVO implements Serializable  {
     @Excel(name = "退款金额" ,sort = 240)
     private BigDecimal refundMoney;
 
+    /** 申请原因 */
+    @Excel(name = "申请原因",sort = 250)
+    private String reasons;
+
+    /** 说明 */
+    @Excel(name = "说明",sort = 260)
+    private String explains;
+
 }

fs-service/src/main/java/com/fs/live/mapper/LiveMapper.java

@@ -138,6 +138,7 @@ public interface LiveMapper
             "select * from live where 1=1 " +
             " <if test='param.companyId!=null' > and company_id = #{param.companyId} </if> and live_type IN (1,2, 3) AND status IN (3, 4) AND is_del = 0 and is_audit=1 " +
             " <if test='param.liveName!=null' > and live_name like concat('%' ,#{param.liveName},'%') </if> " +
+            " <if test='param.startTime!=null and param.endTime!=null' > and start_time between #{param.startTime} and  #{param.endTime}  </if> " +
             " UNION " +
             "select l.* from live l " +
             "LEFT JOIN ( " +
@@ -153,6 +154,7 @@ public interface LiveMapper
             "and TIMESTAMPDIFF(SECOND, l.start_time, NOW()) > COALESCE(video_duration.total_duration, 0) " +
             "and COALESCE(video_duration.total_duration, 0) > 0 " +
             " <if test='param.liveName!=null' > and l.live_name like concat('%' ,#{param.liveName},'%') </if> " +
+            " <if test='param.startTime!=null and param.endTime!=null' > and l.start_time between #{param.startTime} and  #{param.endTime}  </if> " +
             "order by create_time desc" +
             " </script>"})
     List<Live> listLiveData(@Param("param") LiveDataParam param);

fs-service/src/main/resources/mapper/hisStore/FsStoreOrderScrmMapper.xml

@@ -1309,7 +1309,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             left join fs_store_order_item_scrm oi on o.id = oi.order_id
             left join fs_store_product_scrm fsp on fsp.product_id = oi.product_id
         </if>
-        <if test="maps.appId != null and maps.appId != ''">
+        <if test="(maps.appId != null and maps.appId != '') or (maps.bankTransactionId != null and  maps.bankTransactionId !='')">
             LEFT JOIN (
             SELECT
             sp.*,
@@ -1456,7 +1456,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN fs_user us ON us.user_id=o.user_id
         LEFT JOIN company_user cu on cu.user_id=o.company_user_id
         LEFT JOIN fs_store_order_df df on df.order_id=o.id
-        <if test="maps.appId != null and maps.appId != ''">
+        <if test="(maps.appId != null and maps.appId != '') or (maps.bankTransactionId != null and  maps.bankTransactionId !='')">
             LEFT JOIN (
             SELECT
             sp.*,
@@ -1466,6 +1466,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ) sp_latest ON sp_latest.business_code = o.order_code AND sp_latest.rn = 1
             LEFT JOIN fs_course_play_source_config csc ON csc.appid = sp_latest.app_id
         </if>
+        <if test = "maps.productName != null and  maps.productName !=  '' ">
+            left join fs_store_product_scrm fsp on fsp.product_id = soi.product_id
+        </if>
         <where>
             <if test="maps.appId != null and maps.appId != ''">
                 and csc.appid = #{maps.appId}
@@ -1730,9 +1733,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </where>
         ${maps.params.dataScope}
-        <if test="maps.productName != null and  maps.productName !=  ''   ">
-            group by o.id
-        </if>
+<!--        <if test="maps.productName != null and  maps.productName !=  ''   ">-->
+<!--            group by o.id-->
+<!--        </if>-->
             order by
         <if test="maps.sortField == 'companyUserName'">
             cu.nick_name
@@ -1771,7 +1774,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             left join fs_store_order_item_scrm oi on o.id = oi.order_id
             left join fs_store_product_scrm fsp on fsp.product_id = oi.product_id
         </if>
-        <if test="maps.appId != null and maps.appId != ''">
+        <if test="(maps.appId != null and maps.appId != '') or (maps.bankTransactionId != null and  maps.bankTransactionId !='')">
             LEFT JOIN (
             SELECT
             sp.*,
@@ -1781,6 +1784,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ) sp_latest ON sp_latest.business_code = o.order_code AND sp_latest.rn = 1
             LEFT JOIN fs_course_play_source_config csc ON csc.appid = sp_latest.app_id
         </if>
+<!--        <if  test="maps.bankTransactionId != null and  maps.bankTransactionId !=''">-->
+<!--            LEFT JOIN (-->
+<!--            SELECT-->
+<!--            sp.*,-->
+<!--            ROW_NUMBER() OVER (PARTITION BY sp.business_code ORDER BY sp.create_time DESC) as rn-->
+<!--            FROM fs_store_payment_scrm sp-->
+<!--            WHERE sp.business_code IS NOT NULL-->
+<!--            ) sp_latest ON sp_latest.business_order_id = o.id AND sp_latest.rn = 1-->
+<!--        </if>-->
 
         <where>
             <if test="maps.appId != null and map.appId != ''">
@@ -1904,9 +1916,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </where>
         ${maps.params.dataScope}
-        <if test="maps.productName != null and  maps.productName !=  ''   ">
-            group by o.id
-        </if>
+<!--        <if test="maps.productName != null and  maps.productName !=  ''   ">-->
+<!--            group by o.id-->
+<!--        </if>-->
         order by o.id desc
     </select>
     <select id="selectAddTuiMoney" resultType="java.lang.Long">