送达短信发送日志接口新增送达图片字段；

修复送达时没有更新订单图片信息bug；

src/main/java/com/sqx/modules/errand/IndentSmsSendLogVO.java

@@ -0,0 +1,17 @@
+package com.sqx.modules.errand;
+
+import com.sqx.modules.errand.entity.TbIndentSmsSendLog;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 短信发送日志vo
+ */
+@Data
+@ApiModel("IndentSmsSendLogVO")
+public class IndentSmsSendLogVO extends TbIndentSmsSendLog {
+
+    @ApiModelProperty("图片")
+    private String imgs;
+}

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

@@ -1,9 +1,16 @@
 package com.sqx.modules.errand.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sqx.modules.errand.IndentSmsSendLogVO;
+import com.sqx.modules.errand.dto.SmsLogQueryDTO;
 import com.sqx.modules.errand.entity.TbIndentSmsSendLog;
 import org.apache.ibatis.annotations.Mapper;
+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);
 }

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

@@ -884,7 +884,7 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
         // 订单新增送达图片
         TbOrder tbOrder = appOrderService.getById(indentOrder.getOrderId());
         tbOrder.setDeliveryImgs(imgs);
-        appOrderService.updateOrder(tbOrder);
+        appOrderService.updateById(tbOrder);
 
         // 发送短信并记录短信发送记录
         SmsSendResult smsSendResult = smsTemplateService.sendSms(smsTemplateId, riderUser, userPhone);

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

@@ -1,12 +1,11 @@
 package com.sqx.modules.errand.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sqx.common.sms.SmsSendResult;
 import com.sqx.common.utils.PageUtils;
+import com.sqx.modules.errand.IndentSmsSendLogVO;
 import com.sqx.modules.errand.dao.TbIndentSmsSendLogDao;
 import com.sqx.modules.errand.dto.SmsLogQueryDTO;
 import com.sqx.modules.errand.entity.TbIndentSmsSendLog;
@@ -21,14 +20,8 @@ public class TbIndentSmsSendLogServiceImpl extends ServiceImpl<TbIndentSmsSendLo
     @Override
     public PageUtils logPage(SmsLogQueryDTO queryDTO) {
         Page<TbIndentSmsSendLog> pages = new Page<>(queryDTO.getPage(), queryDTO.getLimit());
-        LambdaQueryWrapper<TbIndentSmsSendLog> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(ObjectUtil.isNotNull(queryDTO.getOrderId()), TbIndentSmsSendLog::getOrderId, queryDTO.getOrderId());
-        queryWrapper.eq(StrUtil.isNotBlank(queryDTO.getSuccessFlag()), TbIndentSmsSendLog::getSuccessFlag, queryDTO.getSuccessFlag());
-        queryWrapper.eq(StrUtil.isNotBlank(queryDTO.getSendTo()), TbIndentSmsSendLog::getSendTo, queryDTO.getSendTo());
-        queryWrapper.ge(ObjectUtil.isNotNull(queryDTO.getStartTime()), TbIndentSmsSendLog::getSendTime, queryDTO.getStartTime());
-        queryWrapper.le(ObjectUtil.isNotNull(queryDTO.getEndTime()), TbIndentSmsSendLog::getSendTime, queryDTO.getEndTime());
-
-        return new PageUtils(this.page(pages, queryWrapper));
+        IPage<IndentSmsSendLogVO> pageRecord = baseMapper.logPage(pages, queryDTO);
+        return new PageUtils(pageRecord);
     }
 
     @Override

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

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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
+               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>
+            <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.sendTo != null and query.sendTo != ''">
+                and issl.send_to = #{query.sendTo}
+            </if>
+            <if test="query.startTime != null">
+                and issl.send_time >= #{query.orderId}
+            </if>
+            <if test="query.endTime != null">
+                and issl.send_time <![CDATA[<=]]> #{query.orderId}
+            </if>
+        </where>
+        order by issl.send_time desc
+    </select>
+</mapper>