diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/listener/OrderPayedListener.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/listener/OrderPayedListener.java index bc45b8ad..f876215d 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/order/listener/OrderPayedListener.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/listener/OrderPayedListener.java @@ -115,28 +115,20 @@ public class OrderPayedListener { // 检查订单是否已经处理过(幂等性检查) if (isOrderPaid(orderInfoOld)) { - logger.info("[订单支付监听] 订单已支付,无需重复处理,订单ID: {}", orderId); + logger.debug("[订单支付监听] 订单已支付,无需重复处理,订单ID: {}", orderId); flag = true; continue; } - if (order_state_id == StateCode.ORDER_STATE_WAIT_PAY) { - // 待支付状态 - logger.info("[订单支付监听] 处理待支付订单. 订单ID: {}", orderId); - flag = shopOrderBaseService.setPaidYes(Collections.singletonList(orderId)); + if (StateCode.PAYMENT_TYPE_OFFLINE == orderInfoOld.getPayment_type_id().intValue()) { + logger.debug("[订单支付监听] 处理线下支付订单. 订单ID: {}", orderId); + ShopOrderInfo orderInfo = new ShopOrderInfo(); + orderInfo.setOrder_id(orderId); + orderInfo.setOrder_is_paid(StateCode.ORDER_PAID_STATE_YES); + flag = shopOrderInfoService.edit(orderInfo); } else { - //判断是否线下支付 - if (StateCode.PAYMENT_TYPE_OFFLINE == orderInfoOld.getPayment_type_id().intValue()) { - //线下支付,直接处理订单支付状态, 不处理订单状态 - logger.info("[订单支付监听] 处理线下支付订单. 订单ID: {}", orderId); - ShopOrderInfo orderInfo = new ShopOrderInfo(); - orderInfo.setOrder_id(orderId); - orderInfo.setOrder_is_paid(StateCode.ORDER_PAID_STATE_YES); - flag = shopOrderInfoService.edit(orderInfo); - } else { - logger.info("[订单支付监听] 处理其他支付订单. 订单ID: {}", orderId); - flag = shopOrderBaseService.setPaidYes(Collections.singletonList(orderId)); - } + logger.debug("[订单支付监听] 处理支付订单. 订单ID: {}", orderId); + flag = shopOrderBaseService.setPaidYes(Collections.singletonList(orderId)); } logger.info("[订单支付监听] 订单ID: {},支付异步通知回调处理是否成功: {} ", flag, orderId); diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sync/keymanage/RedisKey.java b/mall-shop/src/main/java/com/suisung/mall/shop/sync/keymanage/RedisKey.java index 25ea1adb..2b13b698 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/sync/keymanage/RedisKey.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/sync/keymanage/RedisKey.java @@ -4,28 +4,31 @@ public class RedisKey { //public static final String SXCLIENTKEYVERSION="sxclientKey:version";//客户端版本 - public static final String STOREDATARELEASE="shopQuality:release"; + public static final String STOREDATARELEASE = "shopQuality:release"; - public static final String STOREDATAPRODUCTMAPING="storedata:productMaping"; + public static final String STOREDATAPRODUCTMAPING = "storedata:productMaping"; - public static final String STOREDATASHOPBASEPRODUCTSPEC="storedata:shopBaseProductSpec"; + public static final String STOREDATASHOPBASEPRODUCTSPEC = "storedata:shopBaseProductSpec"; - public static final String STOREDATASPECITEMID="storedata:SpecItemId"; + public static final String STOREDATASPECITEMID = "storedata:SpecItemId"; - public static final String STOREDATAPRODUCTSPECITEM="storedata:ProductSpecItem"; + public static final String STOREDATAPRODUCTSPECITEM = "storedata:ProductSpecItem"; - public static final String STOREDBDATAPRIORITYMODEKEY="storedbdata:priorityModeKey"; + public static final String STOREDBDATAPRIORITYMODEKEY = "storedbdata:priorityModeKey"; - public static final String STOREDATACCOUNTBASEID="storedata:accountBaseId"; + public static final String STOREDATACCOUNTBASEID = "storedata:accountBaseId"; - public static final String STOREDATASPECID="storedata:SpecId"; + public static final String STOREDATASPECID = "storedata:SpecId"; - public static final String STOREDATALIBRARYID="storedata:libraryId"; + public static final String STOREDATALIBRARYID = "storedata:libraryId"; - public static final String STOREDATAGOODBATCHLOCK="store:data:goodsbatchLock"; + public static final String STOREDATAGOODBATCHLOCK = "store:data:goodsbatchLock"; + + + public static final String STOREDATASHOPBASEPAGE = "store:data:shop:base:page"; }