Ver código fonte

离线包状态

lyhzzz 5 meses atrás
pai
commit
65d1bb8c6d

+ 1 - 0
src/main/java/com/fdkankan/ucenter/service/impl/ProductOrderServiceImpl.java

@@ -76,6 +76,7 @@ public class ProductOrderServiceImpl extends ServiceImpl<IProductOrderMapper, Pr
         wrapper.set(ProductOrder::getTradeTime,new Date());
         wrapper.set(ProductOrder::getNumber,tradeNo);
         wrapper.set(ProductOrder::getPayStatus,1);
+        wrapper.set(ProductOrder::getPayType,payType);
         this.update(wrapper);
 
         productCooperationService.paySuccess(orderSn);

+ 2 - 2
src/main/java/com/fdkankan/ucenter/service/impl/SceneCooperationServiceImpl.java

@@ -275,12 +275,12 @@ public class SceneCooperationServiceImpl extends ServiceImpl<ISceneCooperationMa
 
 
     private ProductOrder checkNeedPay(List<String> numList, List<User> users,User loginUser,Integer payType,Integer timeZone) {
-        Integer totalCount = 0;
+        Integer totalCount = users.size() -1;
         HashMap<String, List<User>> map = this.getByNumList(numList);
         for (String num : map.keySet()) {
             List<User> users1 = map.get(num);
             if (users1.isEmpty()){
-                totalCount += users.size() -1 ;
+                totalCount += users.size()  ;
                 continue;
             }
             List<Long> collect1 = users1.stream().map(User::getId).collect(Collectors.toList());

+ 48 - 0
src/main/resources/bootstrap-dev-eur.yml

@@ -0,0 +1,48 @@
+spring:
+  application:
+    name: 4dkankan-center-ucenter
+  cloud:
+    nacos:
+      config:
+        server-addr: 3.75.137.132:8848
+        file-extension: yaml
+        namespace: 4dkankan-v4-dev-eur
+        extension-configs:
+          - data-id: 4dkankan-center-ucenter.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+        shared-configs:
+
+          - data-id: common-redis-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-rabbitmq-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-fyun-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: forest-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-db-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: sms-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+      discovery:
+        server-addr: ${spring.cloud.nacos.config.server-addr}
+        namespace: ${spring.cloud.nacos.config.namespace}
+
+
+

+ 3 - 1
src/main/resources/bootstrap-dev.yml

@@ -37,7 +37,9 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
-
+          - data-id: sms-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
       discovery:
         server-addr: ${spring.cloud.nacos.config.server-addr}
         namespace: ${spring.cloud.nacos.config.namespace}

+ 1 - 1
src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: test-eur
+    active: dev-eur
 server:
   port: 8082
   servlet: