FIX: 怨气运单号适配

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

@@ -58,7 +58,7 @@ import java.util.List;
 import java.util.Map;
 
 
-/**
+/**`
  * 订单Controller
  *
  * @author fs

fs-service-system/src/main/java/com/fs/express/impl/FsStoreDeliversServiceImpl.java

@@ -58,6 +58,7 @@ public class FsStoreDeliversServiceImpl implements FsStoreDeliversService {
     public FsStoreDelivers save(FsStoreDelivers fsStoreDelivers) {
         if (fsStoreDelivers.getId() == null) {
             fsStoreDelivers.setCreateTime(LocalDateTime.now());
+            fsStoreDelivers.setType(0);
             fsStoreDeliversMapper.insert(fsStoreDelivers);
 
         }

fs-service-system/src/main/java/com/fs/store/mapper/FsStoreDeliversMapper.java

@@ -59,9 +59,9 @@ public interface FsStoreDeliversMapper {
      * @param orderId 订单ID
      * @return 发货信息
      */
-    @Select("SELECT * FROM fs_store_delivers WHERE order_id = #{orderId} and type=0")
+    @Select("SELECT * FROM fs_store_delivers WHERE order_id = #{orderId} and ifnull(type,0)=0")
     List<FsStoreDelivers> findByOrderId(@Param("orderId") Long orderId);
-    @Select("SELECT * FROM fs_store_delivers WHERE order_id = #{orderId} and type=#{type}")
+    @Select("SELECT * FROM fs_store_delivers WHERE order_id = #{orderId} and ifnull(type,0)=#{type}")
     List<FsStoreDelivers> findByOrderIdWithType(@Param("orderId") Long orderId,@Param("type") Integer type);
 
     @Select("<script>" +
@@ -75,7 +75,7 @@ public interface FsStoreDeliversMapper {
     @MapKey("orderId")
     Map<Long,FsStoreDelivers> findByOrderIdWithTypeBatch(@Param("orderIds") List<Long> orderId, @Param("type") Integer type);
 
-    @Select("SELECT * FROM fs_store_delivers WHERE order_id = #{orderId} and type=#{type} limit 1")
+    @Select("SELECT * FROM fs_store_delivers WHERE order_id = #{orderId} and ifnull(type,0)=#{type} limit 1")
     FsStoreDelivers findByOrderIdWithTypeSingle(@Param("orderId") Long orderId,@Param("type") Integer type);
 
     /**

fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreOrderServiceImpl.java

@@ -1158,6 +1158,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                 fsStoreDeliver.setUpdateTime(LocalDateTime.now());
                 fsStoreDeliver.setCreateBy("admin");
                 fsStoreDeliver.setUpdateBy("admin");
+                fsStoreDeliver.setType(0);
                 fsStoreDeliversMapper.insert(fsStoreDeliver);
             }