Browse Source

改为正式配置

liujunchi 2 years ago
parent
commit
50ccc174ec

+ 1 - 1
cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/impl/OmsOrderCourierServiceImpl.java

@@ -51,7 +51,7 @@ public class OmsOrderCourierServiceImpl implements OmsOrderCourierService {
 
     @Override
     public OmsOrderCourier refreshCourier(String deliverySn) throws InterruptedException {
-        RLock lock = redissonClient.getLock(OrderCacheEnum.COURIER_LOCK.getCode());
+        RLock lock = redissonClient.getLock(OrderCacheEnum.COURIER_LOCK.getCode() + deliverySn);
         boolean b = lock.tryLock(0,1, TimeUnit.HOURS);
 
         OmsOrderCourier omsOrderCourier = omsOrderCourierMapper.queryByCourierNo(deliverySn);

+ 2 - 2
cooleshow-mall/mall-common/src/main/java/com/yonge/cooleshow/mall/common/courier/service/impl/Courier100ServiceImpl.java

@@ -37,10 +37,10 @@ public class Courier100ServiceImpl implements CourierService {
 
     private static final Logger LOG = LoggerFactory.getLogger(Courier100ServiceImpl.class);
 
-    @Value("${courier.courier100.key:VCjiLJPi6082}")
+    @Value("${courier.courier100.key:jvpXSAFN9687}")
     private String key;
 
-    @Value("${courier.courier100.customer:9D9FE2336BB04B0414E243E7700FBD83}")
+    @Value("${courier.courier100.customer:B6E26D57F060E7D9C87032AF7F000046}")
     private String customer;
 
 

+ 1 - 1
cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsOrderCourierServiceImpl.java

@@ -51,7 +51,7 @@ public class OmsOrderCourierServiceImpl implements OmsOrderCourierService {
 
     @Override
     public OmsOrderCourier refreshCourier(String deliverySn) throws InterruptedException {
-        RLock lock = redissonClient.getLock(OrderCacheEnum.COURIER_LOCK.getCode());
+        RLock lock = redissonClient.getLock(OrderCacheEnum.COURIER_LOCK.getCode() + deliverySn);
         boolean b = lock.tryLock(0,1, TimeUnit.HOURS);
 
         OmsOrderCourier omsOrderCourier = omsOrderCourierMapper.queryByCourierNo(deliverySn);