From 73204530b7c20b4b90f7277d34c7eb17c53021aa Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 15 Jul 2021 15:05:49 +0800
Subject: [PATCH] fix
---
gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java | 3 +++
gc-core/src/main/resources/application-dev.properties | 2 +-
gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/gc-core/src/main/resources/application-dev.properties b/gc-core/src/main/resources/application-dev.properties
index ac0a23e..cce19c3 100644
--- a/gc-core/src/main/resources/application-dev.properties
+++ b/gc-core/src/main/resources/application-dev.properties
@@ -12,7 +12,7 @@
#spring.datasource.url=jdbc:mysql://192.168.0.100:3306/t_xzxhb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useAffectedRows=true&serverTimezone=Asia/Shanghai
#spring.datasource.username=root
#spring.datasource.password=admin!@#00
-spring.datasource.url=jdbc:mysql://120.27.238.55:3306/db_xzx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useAffectedRows=true
+spring.datasource.url=jdbc:mysql://120.27.238.55:3306/db_xzx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useAffectedRows=true&serverTimezone=GMT%2b8
spring.datasource.username=ct_test
spring.datasource.password=123456
diff --git a/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java b/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java
index 27e1bf8..6c8c7df 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java
@@ -234,6 +234,6 @@
userAccount.setCollectScore(userScore.add(totalScore).setScale( 0, BigDecimal.ROUND_DOWN ).toString());
accountMapper.updateByPrimaryKey(userAccount);
- distribService.distribRecord(order.getId(), confirmDto.getUserId());
+ distribService.distribRecord(order.getId(), order.getUserId());
}
}
diff --git a/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java b/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java
index 43323f8..6c58db4 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java
@@ -32,6 +32,7 @@
import com.xzx.gc.model.JsonResult;
import com.xzx.gc.user.dto.UpdateSettingDto;
import com.xzx.gc.user.mapper.RedPaperRuleMapper;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -46,6 +47,7 @@
import java.util.List;
import java.util.Map;
+@Slf4j
@Service
@Transactional
public class DistribService {
@@ -104,6 +106,7 @@
public void join(String headId, String userId) {
+ log.info("#加入团队:{}, {}#", headId, userId);
AccountInfo headInfo = accountMapper.selectOneByUserId(headId);
if (AccountInfo.IS_HEAD_N.equals(headInfo.getIsHead())) {
throw new RestException(-3, "不是团长");
--
Gitblit v1.9.1