From b1b61f9bbd329b593ee019e3de98e4df14466af3 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Jun 2021 10:29:36 +0800
Subject: [PATCH] fix score details

---
 gc-user/src/main/java/com/xzx/gc/user/controller/AdminJhyInfoController.java |   18 ++++++++++++++++++
 gc-user/src/main/java/com/xzx/gc/user/vo/JhyInfoListVo.java                  |   14 ++++++++++++++
 gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java              |    2 ++
 gc-user/src/main/java/com/xzx/gc/user/controller/ApiJhyInfoController.java   |    2 +-
 4 files changed, 35 insertions(+), 1 deletions(-)

diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
index b63101c..606efc2 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
@@ -242,6 +242,7 @@
         scoreDetails.setOriginalScore(score);
         scoreDetails.setCurrentScore(remianScore);
         scoreDetails.setChangeScore(totalPrice);
+        scoreDetails.setCreatedTime(new Date());
         scoreDetailsMapper.insert(scoreDetails);
 
         sku.setStock(sku.getStock() - addGoodsOrderDto.getCnt());
@@ -315,6 +316,7 @@
         scoreDetails.setOrderNo(order.getOrderNo());
         scoreDetails.setType(ScoreDetails.SCORE_TYPE_SHOPPING_RETURN);
         scoreDetails.setCreatedTime(new Date());
+        scoreDetails.setUserId(userId);
         scoreDetailsMapper.insert(scoreDetails);
 
         accountInfo.setCollectScore(score.toString());
diff --git a/gc-user/src/main/java/com/xzx/gc/user/controller/AdminJhyInfoController.java b/gc-user/src/main/java/com/xzx/gc/user/controller/AdminJhyInfoController.java
new file mode 100644
index 0000000..0d4d766
--- /dev/null
+++ b/gc-user/src/main/java/com/xzx/gc/user/controller/AdminJhyInfoController.java
@@ -0,0 +1,18 @@
+package com.xzx.gc.user.controller;
+
+import com.xzx.gc.common.request.BaseController;
+import com.xzx.gc.user.service.JhyInfoService;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@Api(tags = {"集物员--集物员管理"})
+@Slf4j
+public class AdminJhyInfoController extends BaseController {
+
+    @Autowired
+    private JhyInfoService jhyInfoService;
+
+}
diff --git a/gc-user/src/main/java/com/xzx/gc/user/controller/ApiJhyInfoController.java b/gc-user/src/main/java/com/xzx/gc/user/controller/ApiJhyInfoController.java
index e67fd7e..e8c1a00 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/controller/ApiJhyInfoController.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/controller/ApiJhyInfoController.java
@@ -15,7 +15,7 @@
 import javax.servlet.http.HttpServletRequest;
 
 @RestController
-@Api(tags = {"集物员--集物员管理"})
+@Api(tags = {"集物员--小程序集物员"})
 @Slf4j
 public class ApiJhyInfoController extends BaseController {
 
diff --git a/gc-user/src/main/java/com/xzx/gc/user/vo/JhyInfoListVo.java b/gc-user/src/main/java/com/xzx/gc/user/vo/JhyInfoListVo.java
new file mode 100644
index 0000000..10ad8e3
--- /dev/null
+++ b/gc-user/src/main/java/com/xzx/gc/user/vo/JhyInfoListVo.java
@@ -0,0 +1,14 @@
+package com.xzx.gc.user.vo;
+
+
+import io.swagger.annotations.ApiModel;
+
+@ApiModel(value = "JhyInfoListVo", description = "后台集物员列表接口返回参数类")
+public class JhyInfoListVo {
+
+    private String name;
+
+    private String gender;
+
+    private String mobile;
+}

--
Gitblit v1.9.1