原有短信发送日志接口改造

src/main/java/com/sqx/modules/errand/dao/TbIndentSmsSendLogDao.java

@@ -13,7 +13,9 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface TbIndentSmsSendLogDao extends BaseMapper<TbIndentSmsSendLog>  {
 
-    IPage<IndentSmsSendLogVO> logPage(@Param("pages") Page<TbIndentSmsSendLog> pages, @Param("query") SmsLogQueryDTO query);
+    IPage<IndentSmsSendLogVO> logPageByRider(@Param("pages") Page<TbIndentSmsSendLog> pages, @Param("query") SmsLogQueryDTO query);
+
+    IPage<IndentSmsSendLogVO> logPageByShop(@Param("pages") Page<TbIndentSmsSendLog> pages, @Param("query") SmsLogQueryDTO query);
 
     int countOfSendSuccess(@Param("query") SmsCountQueryDTO queryDTO);
 }

src/main/java/com/sqx/modules/errand/dto/SmsLogQueryDTO.java

@@ -24,6 +24,9 @@ public class SmsLogQueryDTO extends PageQuery {
     @ApiModelProperty("发送人电话")
     private String fromTo;
 
+    @ApiModelProperty("发送店铺id")
+    private Long shopId;
+
     @ApiModelProperty("接受人电话")
     private String sendTo;
 
@@ -34,4 +37,7 @@ public class SmsLogQueryDTO extends PageQuery {
     @ApiModelProperty("查询结束时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date endTime;
+
+    @ApiModelProperty("发送来源：1骑手、2商家，默认为1")
+    private String sourceType = "1";
 }

src/main/java/com/sqx/modules/errand/entity/TbIndentSmsSendLog.java

@@ -45,4 +45,7 @@ public class TbIndentSmsSendLog {
 
     @ApiModelProperty("发送时间")
     private Date sendTime;
+
+    @ApiModelProperty("发送来源 1骑手、2商家")
+    private String sourceType;
 }

src/main/java/com/sqx/modules/errand/service/impl/TbIndentSmsSendLogServiceImpl.java

@@ -21,7 +21,16 @@ public class TbIndentSmsSendLogServiceImpl extends ServiceImpl<TbIndentSmsSendLo
     @Override
     public PageUtils logPage(SmsLogQueryDTO queryDTO) {
         Page<TbIndentSmsSendLog> pages = new Page<>(queryDTO.getPage(), queryDTO.getLimit());
-        IPage<IndentSmsSendLogVO> pageRecord = baseMapper.logPage(pages, queryDTO);
+
+        IPage<IndentSmsSendLogVO> pageRecord;
+        // 发送来源：1骑手、2商家
+        if ("1".equals(queryDTO.getSourceType())) {
+            pageRecord = baseMapper.logPageByRider(pages, queryDTO);
+        } else {
+            pageRecord = baseMapper.logPageByShop(pages, queryDTO);
+
+        }
+
         return new PageUtils(pageRecord);
     }
 
@@ -37,6 +46,8 @@ public class TbIndentSmsSendLogServiceImpl extends ServiceImpl<TbIndentSmsSendLo
         log.setSendResult(smsSendResult.getMsg());
         log.setSendFromId(smsSendResult.getSendFromId());
         log.setSendTo(smsSendResult.getSendTo());
+        // 1骑手、2商家
+        log.setSourceType("1");
 
         save(log);
     }

src/main/resources/mapper/errand/TbIndentSmsSendLogMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.sqx.modules.errand.dao.TbIndentSmsSendLogDao">
-    <select id="logPage" resultType="com.sqx.modules.errand.IndentSmsSendLogVO">
+    <select id="logPageByRider" resultType="com.sqx.modules.errand.IndentSmsSendLogVO">
         select
                issl.*, o.delivery_imgs as imgs, u.phone as sendFromPhone
         from
@@ -11,6 +11,7 @@
         left join tb_order o on o.order_id = i.order_id
         left join tb_user u on u.user_id = issl.send_from_id
         <where>
+                and issl.source_type = '1'
             <if test="query.orderId != null">
                 and issl.order_id = #{query.orderId}
             </if>
@@ -33,6 +34,37 @@
         order by issl.send_time desc
     </select>
 
+    <select id="logPageByShop" resultType="com.sqx.modules.errand.IndentSmsSendLogVO">
+        select
+        issl.*, o.delivery_imgs as imgs
+        from
+        tb_indent_sms_send_log issl
+        left join tb_indent i on i.indent_id = issl.order_id
+        left join tb_order o on o.order_id = i.order_id
+        <where>
+            and issl.source_type = '2'
+            <if test="query.orderId != null">
+                and issl.order_id = #{query.orderId}
+            </if>
+            <if test="query.successFlag != null and query.successFlag != ''">
+                and issl.success_flag = #{query.successFlag}
+            </if>
+            <if test="query.shopId != null">
+                and o.shop_id = #{query.shopId}
+            </if>
+            <if test="query.sendTo != null and query.sendTo != ''">
+                and issl.send_to = #{query.sendTo}
+            </if>
+            <if test="query.startTime != null">
+                and issl.send_time >= #{query.startTime}
+            </if>
+            <if test="query.endTime != null">
+                and issl.send_time <![CDATA[<=]]> #{query.endTime}
+            </if>
+        </where>
+        order by issl.send_time desc
+    </select>
+
     <select id="countOfSendSuccess" resultType="java.lang.Integer">
         select
                count(1)