召回试算接口

@@ -51,7 +51,7 @@ public interface StorageDepositMapper {
     StorageDeposit selectByDepositCode(@Param("uid") int uid, @Param("depositCode")String depositCode, @Param("statusList")List<Integer> statusList);
     StorageDeposit selectByDepositCode(@Param("uid") int uid, @Param("depositCode")String depositCode, @Param("statusList")List<Integer> statusList);
 
 
     List<StorageDeposit> getDepositOffs(@Param("uid") Integer uid, @Param("storageId") Integer storageId, @Param("count") Integer count);
     List<StorageDeposit> getDepositOffs(@Param("uid") Integer uid, @Param("storageId") Integer storageId, @Param("count") Integer count);
-    int updateStorageStatus(@Param("depositCode")String depositCode, @Param("status")int status, @Param("orderStatus")int orderStatus);
+    int updateStorageStatus(@Param("depositCode")String depositCode, @Param("status")int status, @Param("orderStatus")int orderStatus,@Param("outType")Integer outType);
 
 
     int getUserDepositCount(@Param("uid") Integer uid);
     int getUserDepositCount(@Param("uid") Integer uid);
     
     

@@ -347,6 +347,9 @@
   <update id="updateStorageStatus">
   <update id="updateStorageStatus">
     update storage_deposit
     update storage_deposit
     set status = #{status,jdbcType=INTEGER} ,update_time = unix_timestamp(now())
     set status = #{status,jdbcType=INTEGER} ,update_time = unix_timestamp(now())
+    <if test="outType != null" >
+      , out_type = #{outType}
+    </if>
     where deposit_code = #{depositCode,jdbcType=VARCHAR} AND del_status = 0 AND order_status = #{orderStatus,jdbcType=INTEGER}
     where deposit_code = #{depositCode,jdbcType=VARCHAR} AND del_status = 0 AND order_status = #{orderStatus,jdbcType=INTEGER}
   </update>
   </update>
   
   

@@ -44,7 +44,7 @@ public class DepositFinishDeliveryDelayMsgConsumer implements YhConsumer {
         }
         }
         
         
         //更新寄存状态为已完成
         //更新寄存状态为已完成
-        storageDepositMapper.updateStorageStatus(deposit.getDepositCode(), StorageDepositStatusEnum.HAS_END.getCode(), OrderStatus.WAITING_PAY.getCode());
+        storageDepositMapper.updateStorageStatus(deposit.getDepositCode(), StorageDepositStatusEnum.HAS_END.getCode(), OrderStatus.WAITING_PAY.getCode(), null);
 
 
     }
     }
 }
 }

@@ -267,7 +267,7 @@ public class AppraiseService {
     		return;
     		return;
     	}
     	}
     	
     	
-    	int num = storageDepositMapper.updateStorageStatus(deposit.getDepositCode(), StorageDepositStatusEnum.HAS_OUT.getCode(),  OrderStatus.WAITING_PAY.getCode());
+    	int num = storageDepositMapper.updateStorageStatus(deposit.getDepositCode(), StorageDepositStatusEnum.HAS_OUT.getCode(),  OrderStatus.WAITING_PAY.getCode(), null);
     	if(num > 0) {
     	if(num > 0) {
         	//发mq，延迟30天设置状态为已完成
         	//发mq，延迟30天设置状态为已完成
     		LOGGER.info("start send storageDeposit mq,topic is {}, depositCode is {}", TopicConstants.DEPOSIT_FINISH_DELIVERY, deposit.getDepositCode());
     		LOGGER.info("start send storageDeposit mq,topic is {}, depositCode is {}", TopicConstants.DEPOSIT_FINISH_DELIVERY, deposit.getDepositCode());

@@ -5,6 +5,7 @@ import com.yohobuy.ufo.model.order.bo.ButtonShowBo;
 import com.yohobuy.ufo.model.order.bo.DepositDetailBo;
 import com.yohobuy.ufo.model.order.bo.DepositDetailBo;
 import com.yohobuy.ufo.model.order.bo.DepositProductBo;
 import com.yohobuy.ufo.model.order.bo.DepositProductBo;
 import com.yohobuy.ufo.model.order.constants.DepositOrderStatusEnum;
 import com.yohobuy.ufo.model.order.constants.DepositOrderStatusEnum;
+import com.yohobuy.ufo.model.order.constants.DepositOutTypeEnum;
 import com.yohobuy.ufo.model.order.constants.StorageDepositStatusEnum;
 import com.yohobuy.ufo.model.order.constants.StorageDepositStatusEnum;
 import com.yohobuy.ufo.model.order.resp.PageResp;
 import com.yohobuy.ufo.model.order.resp.PageResp;
 import com.yohoufo.common.ApiResponse;
 import com.yohoufo.common.ApiResponse;
@@ -316,7 +317,7 @@ public class DepositServiceImpl implements DepositService {
             LOGGER.warn("clearOrderCache execute wrong, depositCode is {}", depositCode);
             LOGGER.warn("clearOrderCache execute wrong, depositCode is {}", depositCode);
         }
         }
 
 
-        return storageDepositMapper.updateStorageStatus(depositCode, status, orderStatus);
+        return storageDepositMapper.updateStorageStatus(depositCode, status, orderStatus, DepositOutTypeEnum.OUTTYPE_FLASH_PURCHASE.getCode());
     }
     }
 
 
     public void clearCache(Integer uid, Integer productId, Integer storageId) {
     public void clearCache(Integer uid, Integer productId, Integer storageId) {