diff --git a/coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java b/coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java index a4a65b63d..a706aaef9 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java @@ -404,4 +404,9 @@ public class RedisConstant { * IP限制key */ public static final String IP_LIMIT = "ip_limit"; + + /** + * 新管家缴费回调完成 标识 + */ + public static final String XGJ_CALLBACK_SHOP = "xgj_callback_shop:{0}"; } diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index 4e0c3c73b..bd550b868 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -366,6 +366,7 @@ public enum ErrorCodeEnum { ORDER_DATA_EXCEPTION(1610113, "心愿单数据异常!", null), CURRENT_WISHLIST_NOT_EXIST(1610114, "当前心愿单不存在!", null), AMOUNT_GEN_ZERO(1610115, "分账金额必须大于0!", null), + AI_NOT_SUPPORT_OPERATION(1610116, "AI标准店不支持退回到缴费阶段!", null), diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/order/PreAllocationRecordDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/order/PreAllocationRecordDAO.java index e300f4aff..d5e0d3130 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/order/PreAllocationRecordDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/order/PreAllocationRecordDAO.java @@ -29,7 +29,11 @@ public class PreAllocationRecordDAO { return preAllocationRecordMapper.queryPageByShopId(shopId); } - public List queryPageByPayNo(String payNo) { + public PreAllocationRecordDO queryPageByShopIdAndExpenseType(Long shopId,String expenseType) { + return preAllocationRecordMapper.queryPageByShopIdAndExpenseType(shopId,expenseType); + } + + public PreAllocationRecordDO queryPageByPayNo(String payNo) { return preAllocationRecordMapper.queryPageByPayNo(payNo); } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/order/PreAllocationRecordMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/order/PreAllocationRecordMapper.java index 280aaa15b..aa46e31af 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/order/PreAllocationRecordMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/order/PreAllocationRecordMapper.java @@ -14,7 +14,9 @@ public interface PreAllocationRecordMapper extends Mapper List queryPageByShopId(@Param("shopId") Long shopId); - List queryPageByPayNo(@Param("payNo") String payNo); + PreAllocationRecordDO queryPageByShopIdAndExpenseType(Long shopId,String expenseType); + + PreAllocationRecordDO queryPageByPayNo(@Param("payNo") String payNo); int updateStatus(@Param("id") Long id, @Param("status") Integer status); diff --git a/coolstore-partner-dao/src/main/resources/mapper/order/PreAllocationRecordMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/order/PreAllocationRecordMapper.xml index 4d61cc991..2c9cfbf6a 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/order/PreAllocationRecordMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/order/PreAllocationRecordMapper.xml @@ -41,6 +41,14 @@ ORDER BY create_time DESC + +