修复直播相关的问题

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreProductScrmMapper.java

@@ -80,7 +80,7 @@ public interface FsStoreProductScrmMapper
     @Select({"<script> " +
             "select p.*,pc.cate_name, fs.store_name from fs_store_product_scrm p left join fs_store_product_category_scrm pc on p.cate_id=pc.cate_id  " +
             "left join fs_store fs on fs.store_id = p.store_id " +
-            "where 1=1 " +
+            "where 1=1 and p.is_del= 0 " +
             "<if test = 'maps.productName != null and  maps.productName !=\"\"    '> " +
             "and p.product_name like CONCAT('%',#{maps.productName},'%') " +
             "</if>" +
@@ -99,7 +99,7 @@ public interface FsStoreProductScrmMapper
             "<if test = 'maps.storeId != null and maps.storeId != \"\" '> " +
             "and p.store_id = #{maps.storeId} " +
             "</if>"+
-            "<if test = 'maps.storeIds != null '>" +
+            "<if test = 'maps.storeIds != null and maps.storeIds.length > 0'>" +
             "and p.store_id in " +
             "<foreach collection='maps.storeIds'  item='item' index='index'  open='(' separator=',' close=')'> #{item} </foreach>" +
             "</if>" +

fs-service/src/main/java/com/fs/live/domain/LiveCouponUser.java

@@ -73,5 +73,7 @@ public class LiveCouponUser extends BaseEntity
     @Excel(name = "商品ID")
     private Long goodsId;
 
+    private String nickName;
 
+    private String phone;
 }

fs-service/src/main/java/com/fs/live/service/impl/LiveAutoTaskServiceImpl.java

@@ -391,7 +391,10 @@ public class LiveAutoTaskServiceImpl implements ILiveAutoTaskService {
             }
         }
         if (!updateList.isEmpty()) {
-            baseMapper.batchUpdateLiveAutoTask(updateList);
+            for (LiveAutoTask liveAutoTask : updateList) {
+                baseMapper.updateLiveAutoTask(liveAutoTask);
+            }
+//            baseMapper.batchUpdateLiveAutoTask(updateList);
         }
     }
 

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

@@ -465,7 +465,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteFsStoreProductByIds" parameterType="String">
-        update fs_store_product_scrm set id_del = 1 where product_id in
+        update fs_store_product_scrm set is_del = 1 where product_id in
         <foreach item="productId" collection="array" open="(" separator="," close=")">
             #{productId}
         </foreach>

fs-service/src/main/resources/mapper/live/LiveAfterSalesMapper.xml

@@ -110,8 +110,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="createTimeBegin != null and createTimeBegin != ''"> and date_format(las.create_time,'%y%m%d') &gt;= date_format(#{createTimeBegin},'%y%m%d')</if>
-            <if test="createTimeEnd != null and createTimeEnd != ''"> and date_format(las.create_time,'%y%m%d') &lt;= date_format(#{createTimeEnd},'%y%m%d')</if>
+            <if test="createTimeBegin != null"> and date_format(las.create_time,'%y%m%d') &gt;= date_format(#{createTimeBegin},'%y%m%d')</if>
+            <if test="createTimeEnd != null"> and date_format(las.create_time,'%y%m%d') &lt;= date_format(#{createTimeEnd},'%y%m%d')</if>
         </where>
         <if test="productName != null and productName != ''">
         group by las.id

fs-service/src/main/resources/mapper/live/LiveCouponUserMapper.xml

@@ -27,20 +27,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectLiveCouponUserList" parameterType="LiveCouponUser" resultMap="LiveCouponUserResult">
-        <include refid="selectLiveCouponUserVo"/>
+        select lcu.id, lcu.coupon_id, lcu.user_id, lcu.coupon_title, lcu.coupon_price, lcu.use_min_price, lcu.create_time, lcu.update_time, lcu.limit_time,
+               lcu.use_time, lcu.type, lcu.status, lcu.is_fail, lcu.is_del,lcu.goods_id, fu.nick_name,fu.phone
+        from live_coupon_user lcu LEFT JOIN fs_user fu ON lcu.user_id = fu.user_id
         <where>
-            <if test="couponId != null "> and coupon_id = #{couponId}</if>
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="couponTitle != null  and couponTitle != ''"> and coupon_title = #{couponTitle}</if>
-            <if test="couponPrice != null "> and coupon_price = #{couponPrice}</if>
-            <if test="useMinPrice != null "> and use_min_price = #{useMinPrice}</if>
-            <if test="limitTime != null "> and limit_time = #{limitTime}</if>
-            <if test="useTime != null "> and use_time = #{useTime}</if>
-            <if test="type != null  and type != ''"> and type = #{type}</if>
-            <if test="status != null "> and status = #{status}</if>
-            <if test="isFail != null "> and is_fail = #{isFail}</if>
-            <if test="isDel != null "> and is_del = #{isDel}</if>
-            <if test="goodsId != null "> and goods_id = #{goodsId}</if>
+            <if test="couponId != null "> and lcu.coupon_id = #{couponId}</if>
+            <if test="userId != null "> and lcu.user_id = #{userId}</if>
+            <if test="couponTitle != null  and couponTitle != ''"> and lcu.coupon_title = #{couponTitle}</if>
+            <if test="couponPrice != null "> and lcu.coupon_price = #{couponPrice}</if>
+            <if test="useMinPrice != null "> and lcu.use_min_price = #{useMinPrice}</if>
+            <if test="limitTime != null "> and lcu.limit_time = #{limitTime}</if>
+            <if test="useTime != null "> and lcu.use_time = #{useTime}</if>
+            <if test="type != null  and type != ''"> and lcu.type = #{type}</if>
+            <if test="status != null "> and lcu.status = #{status}</if>
+            <if test="isFail != null "> and lcu.is_fail = #{isFail}</if>
+            <if test="isDel != null "> and lcu.is_del = #{isDel}</if>
+            <if test="goodsId != null "> and lcu.goods_id = #{goodsId}</if>
         </where>
     </select>