diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java
index bcc0d059..d8f6e789 100644
--- a/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java
+++ b/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java
@@ -56,6 +56,7 @@ public class YxStoreCombinationServiceImpl extends BaseServiceImpl<YxStoreCombin
      * @param combinationId
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void decStockIncSales(int num, int combinationId) {
         yxStoreCombinationMapper.decStockIncSales(num,combinationId);
     }
diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java
index 20c0fbe3..f6c00268 100644
--- a/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java
+++ b/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java
@@ -95,12 +95,41 @@ public class YxStorePinkServiceImpl extends BaseServiceImpl<YxStorePinkMapper, Y
 
             throw new ErrorRequestException("拼团已完成，无法取消");
         }
+        //如果团长取消拼团，团队还有人，就把后面的人作为下一任团长
+        YxStorePink nextPinkT = pinkAll.get(0);
 
+        //先退团长的money
         RefundParam param = new RefundParam();
         param.setUni(pinkT.getOrderId());
         param.setText("拼团取消开团");
         storeOrderService.orderApplyRefund(param,pinkT.getUid());
         orderPinkFailAfter(pinkT.getUid(),pinkT.getId());
+
+        if(ObjectUtil.isNotNull(nextPinkT)){
+            QueryWrapper<YxStorePink> wrapperO = new QueryWrapper<>();
+            YxStorePink storePinkO = new YxStorePink();
+            storePinkO.setKId(0);
+            storePinkO.setStatus(1);
+            storePinkO.setStopTime(OrderUtil.getSecondTimestampTwo()+"");
+            storePinkO.setId(nextPinkT.getId());
+            yxStorePinkMapper.updateById(storePinkO);
+
+            //原有团长的数据变更成新团长下面
+            wrapperO.eq("k_id",pinkT.getId());
+            YxStorePink storePinkT = new YxStorePink();
+            storePinkT.setKId(nextPinkT.getId());
+            yxStorePinkMapper.update(storePinkT,wrapperO);
+
+            //update order
+
+            YxStoreOrder storeOrder = new YxStoreOrder();
+            storeOrder.setPinkId(nextPinkT.getId());
+            storeOrder.setId(nextPinkT.getId());
+
+            storeOrderService.updateById(storeOrder);
+
+
+        }
     }
 
     /**
diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
index d034359b..91cf0b8e 100644
--- a/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
+++ b/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
@@ -137,6 +137,8 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
 
     @Autowired
     private DelayJobService delayJobService;
+
+    @Autowired
     private YxStoreCombinationService combinationService;
 
     @Autowired
diff --git a/yshop-api/src/main/resources/config/application-dev.yml b/yshop-api/src/main/resources/config/application-dev.yml
index 6ad243f1..72177aa6 100644
--- a/yshop-api/src/main/resources/config/application-dev.yml
+++ b/yshop-api/src/main/resources/config/application-dev.yml
@@ -5,10 +5,10 @@ spring:
       type: com.alibaba.druid.pool.DruidDataSource
       #driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
       driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-      url: jdbc:p6spy:mysql://106.12.82.39:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
+      url: jdbc:p6spy:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
       #url: jdbc:log4jdbc:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
       username: root
-      password: Admin@123
+      password: root
 
       # 初始化配置
       initial-size: 3
@@ -47,7 +47,7 @@ spring:
     database: 0
     host: 127.0.0.1
     port: 6379
-    password: root
+    password:
     #连接超时时间
     timeout: 5000
 
diff --git a/yshop-api/src/main/resources/config/application.yml b/yshop-api/src/main/resources/config/application.yml
index 35407377..45822824 100644
--- a/yshop-api/src/main/resources/config/application.yml
+++ b/yshop-api/src/main/resources/config/application.yml
@@ -59,7 +59,7 @@ wx:
   pay:
     appId: wxc061dee8806ff712
     mchId:
-    mchKey:
+    mchKey: dayouqiantuhupeng8638004yixiangt
     subAppId:
     subMchId:
     keyPath:
diff --git a/yshop-common/src/main/java/co/yixiang/redisson/RedissonConfig.java b/yshop-common/src/main/java/co/yixiang/redisson/RedissonConfig.java
index f3ee6efe..67c79f05 100644
--- a/yshop-common/src/main/java/co/yixiang/redisson/RedissonConfig.java
+++ b/yshop-common/src/main/java/co/yixiang/redisson/RedissonConfig.java
@@ -1,5 +1,6 @@
 package co.yixiang.redisson;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.Redisson;
@@ -39,10 +40,16 @@ public class RedissonConfig extends CachingConfigurerSupport {
     private String password;
 
     @Bean
-    public RedissonClient getRedisson(){
+    public RedissonClient getRedisson() {
 
         Config config = new Config();
-        config.useSingleServer().setAddress("redis://" + host + ":" + port).setPassword(password);
+        if (StrUtil.isNotEmpty(password)) {
+            config.useSingleServer().setAddress("redis://" + host + ":" + port)
+                    .setPassword(password);
+        } else {
+            config.useSingleServer().setAddress("redis://" + host + ":" + port);
+        }
+        //config.useSingleServer().setAddress("redis://" + host + ":" + port).setPassword(password);
         //添加主从配置
 //        config.useMasterSlaveServers().setMasterAddress("").setPassword("").addSlaveAddress(new String[]{"",""});
 
@@ -50,16 +57,17 @@ public class RedissonConfig extends CachingConfigurerSupport {
     }
 
     @Bean
-    CacheManager cacheManager(RedissonClient redissonClient){
+    CacheManager cacheManager(RedissonClient redissonClient) {
         Map<String, CacheConfig> config = new HashMap<>(16);
         // create "testMap" cache with ttl = 24 minutes and maxIdleTime = 12 minutes
-        config.put("testMap",new CacheConfig(24*60*1000,12*60*1000));
-        return  new RedissonSpringCacheManager(redissonClient,config);
+        config.put("testMap", new CacheConfig(24 * 60 * 1000, 12 * 60 * 1000));
+        return new RedissonSpringCacheManager(redissonClient, config);
     }
 
     /**
      * 自定义缓存key生成策略，默认将使用该策略
      * 使用方法 @Cacheable
+     *
      * @return
      */
     @Bean
diff --git a/yshop-system/src/main/resources/config/application-dev.yml b/yshop-system/src/main/resources/config/application-dev.yml
index b219f67f..4e0c4856 100644
--- a/yshop-system/src/main/resources/config/application-dev.yml
+++ b/yshop-system/src/main/resources/config/application-dev.yml
@@ -4,9 +4,9 @@ spring:
     druid:
       type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://106.12.82.39:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
+      url: jdbc:log4jdbc:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
       username: root
-      password: Admin@123
+      password: root
 
       # 初始化配置
       initial-size: 3
@@ -46,7 +46,7 @@ spring:
     database: 0
     host: 127.0.0.1
     port: 6379
-    password: root
+    password:
     #连接超时时间
     timeout: 5000