物流批量导入接口，订单删除接口

fs-admin/src/main/java/com/fs/hisStore/FsStoreHealthOrderScrmController.java

@@ -203,7 +203,7 @@ public class FsStoreHealthOrderScrmController extends BaseController {
         try {
             List<FsOrderDeliveryNoteDTO> dtoList = util.importExcel(file.getInputStream());
             if(!dtoList.isEmpty()){
-                fsStoreOrderService.importDeliveryNoteExpress(dtoList);
+               return fsStoreOrderService.importDeliveryNoteExpress(dtoList);
             }else {
                 R.error("操作失败，导入数据不能小于1条！");
             }

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

@@ -1061,7 +1061,13 @@ public interface FsStoreOrderScrmMapper
 
     /**
      * 批量更新订单状态
-     * @param dtoList 订单更新数据表
+     * @param list 订单更新数据表
      * **/
-    void batchUpdateInOrderCode(@Param("dtoList") List<FsOrderDeliveryNoteDTO> dtoList);
+    void batchUpdateInOrderCode(@Param("list") List<FsOrderDeliveryNoteDTO> list);
+
+    /**
+     * 批量查询订单信息
+     * @param ids 订单id
+     * **/
+    List<FsStoreOrderScrm> selectStoreOrderScrmInId(@Param("ids") Long[] ids);
 }

fs-service/src/main/java/com/fs/hisStore/service/IFsStoreOrderScrmService.java

@@ -245,5 +245,5 @@ public interface IFsStoreOrderScrmService
      * 批量导入更新微信订单发货状态
      * @param dtoList 订单数据
      * **/
-    void importDeliveryNoteExpress(List<FsOrderDeliveryNoteDTO> dtoList);
+    R importDeliveryNoteExpress(List<FsOrderDeliveryNoteDTO> dtoList);
 }

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

@@ -882,14 +882,88 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="batchUpdateInOrderCode">
         UPDATE fs_store_order_scrm
-        SET status = CASE
-        <foreach collection="dtoList" item="item" separator="">
-            WHEN order_code = #{item.orderNumber} THEN #{item.deliveryNoteStatus}
-        </foreach>
-        END
+        <set>
+            delivery_name = CASE
+            <foreach collection="list" item="item">
+                WHEN order_code = #{item.orderNumber} THEN #{item.deliveryName}
+            </foreach>
+            ELSE delivery_name
+            END,
+
+            delivery_id = CASE
+            <foreach collection="list" item="item">
+                WHEN order_code = #{item.orderNumber} THEN #{item.deliveryId}
+            </foreach>
+            ELSE delivery_id
+            END,
+
+            delivery_status = CASE
+            <foreach collection="list" item="item">
+                WHEN order_code = #{item.orderNumber} THEN #{item.deliveryStatus}
+            </foreach>
+            ELSE delivery_status
+            END,
+
+            status = CASE
+            WHEN status = 1 THEN 2
+            ELSE status
+            END,
+
+            <if test="list != null and list.size() > 0 and list[0].deliveryPayMoney != null">
+                delivery_pay_money = CASE
+                <foreach collection="list" item="item">
+                    WHEN order_code = #{item.orderNumber} THEN #{item.deliveryPayMoney}
+                </foreach>
+                ELSE delivery_pay_money
+                END,
+            </if>
+
+            <if test="list != null and list.size() > 0 and list[0].deliveryType != null">
+                delivery_type = CASE
+                <foreach collection="list" item="item">
+                    WHEN order_code = #{item.orderNumber} THEN #{item.deliveryType}
+                </foreach>
+                ELSE delivery_type
+                END,
+            </if>
+
+            <if test="list != null and list.size() > 0 and list[0].deliveryPayStatus != null">
+                delivery_pay_status = CASE
+                <foreach collection="list" item="item">
+                    WHEN order_code = #{item.orderNumber} THEN #{item.deliveryPayStatus}
+                </foreach>
+                ELSE delivery_pay_status
+                END,
+            </if>
+
+            <if test="list != null and list.size() > 0 and list[0].deliveryTime != null">
+                delivery_time = CASE
+                <foreach collection="list" item="item">
+                    WHEN order_code = #{item.orderNumber} THEN #{item.deliveryTime}
+                </foreach>
+                ELSE delivery_time
+                END,
+            </if>
+
+            <if test="list != null and list.size() > 0 and list[0].deliveryPayTime != null">
+                delivery_pay_time = CASE
+                <foreach collection="list" item="item">
+                    WHEN order_code = #{item.orderNumber} THEN #{item.deliveryPayTime}
+                </foreach>
+                ELSE delivery_pay_time
+                END
+            </if>
+        </set>
         WHERE order_code IN
-        <foreach collection="dtoList" item="item" open="(" separator="," close=")">
+        <foreach collection="list" item="item" open="(" separator="," close=")">
             #{item.orderNumber}
         </foreach>
     </update>
+
+    <select id="selectStoreOrderScrmInId" resultType="com.fs.hisStore.domain.FsStoreOrderScrm">
+        <include refid="selectFsStoreOrderVo"/>
+        where id IN <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+    </foreach>
+    </select>
 </mapper>