Browse Source

FIX: 推送微信物流状态

xdd 1 week ago
parent
commit
47db1b5372

+ 4 - 4
fs-service-system/src/main/java/com/fs/erp/mapper/FsJstAftersalePushMapper.java

@@ -102,7 +102,7 @@ public interface FsJstAftersalePushMapper {
             "   <if test='lastExecuteTime != null'>last_execute_time = #{lastExecuteTime},</if>" +
             "   <if test='result != null'>result = #{result},</if>" +
             "   <if test='errorMessage != null'>error_message = #{errorMessage},</if>" +
-        "       <if test='orderType != null and orderType != \"\"'>#{orderType}</if>" +
+        "       <if test='orderType != null and orderType != \"\"'>order_type = #{orderType}</if>" +
             "</set>" +
             "WHERE id = #{id}" +
             "</if>" +
@@ -133,7 +133,7 @@ public interface FsJstAftersalePushMapper {
             "        type,\n" +
             "        task_status,\n" +
             "        retry_count,\n" +
-            "        ROW_NUMBER() OVER(PARTITION BY order_id ORDER BY CAST(type AS UNSIGNED)) AS task_seq,order_type" +
+            "        ROW_NUMBER() OVER(PARTITION BY order_id ORDER BY CAST(type AS UNSIGNED)) AS task_seq, order_type " +
             "    FROM \n" +
             "        fs_jst_aftersale_push\n" +
             "),\n" +
@@ -158,7 +158,7 @@ public interface FsJstAftersalePushMapper {
             "            WHERE p.order_id = o.order_id\n" +
             "              AND p.task_seq < o.task_seq\n" +
             "              AND p.task_status != 1\n" +
-            "        ) AS has_pending_prev_task,order_type" +
+            "        ) AS has_pending_prev_task, order_type " +
             "    FROM \n" +
             "        OrderWithNextTaskType o\n" +
             "    WHERE \n" +
@@ -170,7 +170,7 @@ public interface FsJstAftersalePushMapper {
             "    after_sale_id,\n" +
             "    type,\n" +
             "    task_status,\n" +
-            "    retry_count,order_type" +
+            "    retry_count, order_type " +
             "FROM \n" +
             "    PendingTasks\n" +
             "WHERE \n" +

+ 1 - 1
fs-service-system/src/main/java/com/fs/live/mapper/LiveOrderItemMapper.java

@@ -78,7 +78,7 @@ public interface LiveOrderItemMapper {
     List<LiveOrderItemListUVO> selectLiveOrderItemListUVOByOrderId(Long orderId);
 
     @Update("update live_order_item set order_code=#{orderCode} where order_id=#{orderId} ")
-    int updateFsStoreOrderCode(@Param("orderId")Long orderId,@Param("orderSn") String orderSn);
+    int updateFsStoreOrderCode(@Param("orderId")Long orderId,@Param("orderCode") String orderSn);
 
     @Select("select * from live_order_item where order_id= #{orderId}")
     List<LiveOrderItem> selectCheckedByOrderId(@Param("orderId") Long orderId);