From 46229805300b4fbe8179b3b5e65b49a7d31b16dd Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 14 Jul 2021 10:24:11 +0800
Subject: [PATCH] 202107014
---
/dev/null | 9 ---------
gc-user/src/main/java/com/xzx/gc/user/dto/ViewSettingDto.java | 2 +-
gc-user/src/main/java/com/xzx/gc/user/vo/ViewSettingVo.java | 17 +++++++++++++++++
gc-user/src/main/java/com/xzx/gc/user/service/FxSysService.java | 10 +++++-----
gc-user/src/main/java/com/xzx/gc/user/controller/AdminDistribController.java | 20 +++++++++-----------
5 files changed, 32 insertions(+), 26 deletions(-)
diff --git a/gc-user/src/main/java/com/xzx/gc/user/controller/FxSysController.java b/gc-user/src/main/java/com/xzx/gc/user/controller/AdminDistribController.java
similarity index 64%
rename from gc-user/src/main/java/com/xzx/gc/user/controller/FxSysController.java
rename to gc-user/src/main/java/com/xzx/gc/user/controller/AdminDistribController.java
index 0117db9..e8f9ab2 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/controller/FxSysController.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/controller/AdminDistribController.java
@@ -3,11 +3,9 @@
import com.xzx.gc.common.constant.Constants;
import com.xzx.gc.common.request.BaseController;
import com.xzx.gc.model.JsonResult;
-import com.xzx.gc.user.dto.ViewFxsysDto;
-import com.xzx.gc.user.dto.ViewJhyInfoDto;
+import com.xzx.gc.user.dto.ViewSettingDto;
import com.xzx.gc.user.service.FxSysService;
-import com.xzx.gc.user.vo.ViewFxsysVo;
-import com.xzx.gc.user.vo.ViewJhyInfoVo;
+import com.xzx.gc.user.vo.ViewSettingVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -19,7 +17,7 @@
@RestController
@Api(tags = {"分銷系統管理"})
-public class FxSysController extends BaseController {
+public class AdminDistribController extends BaseController {
@Autowired
private FxSysService fxSysService;
@@ -27,13 +25,13 @@
/**
* 查看分銷系統设置详情
*/
- @PostMapping(Constants.ADMIN_VIEW_PREFIX + "/fxsys/viewFxsys.json")
- @ApiResponses({@ApiResponse( code = 200, message = "success", response = ViewFxsysVo.class)})
+ @PostMapping(Constants.ADMIN_VIEW_PREFIX + "/distrib/setting.json")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = ViewSettingVo.class)})
@ApiOperation(value="分銷系統管理-查看分銷系統设置详情", notes="test: 仅0有正确返回")
- public JsonResult<ViewFxsysVo> viewFxsys(@RequestBody ViewFxsysDto viewFxsysDto) {
- Long id = viewFxsysDto.getId();
- ViewFxsysVo viewFxsysVo = fxSysService.viewFxsys(id);
- return JsonResult.success(viewFxsysVo);
+ public JsonResult<ViewSettingVo> viewSetting(@RequestBody ViewSettingDto viewSettingDto) {
+ Long id = viewSettingDto.getId();
+ ViewSettingVo viewSettingVo = fxSysService.viewSetting(id);
+ return JsonResult.success(viewSettingVo);
}
diff --git a/gc-user/src/main/java/com/xzx/gc/user/dto/ViewFxsysDto.java b/gc-user/src/main/java/com/xzx/gc/user/dto/ViewSettingDto.java
similarity index 72%
rename from gc-user/src/main/java/com/xzx/gc/user/dto/ViewFxsysDto.java
rename to gc-user/src/main/java/com/xzx/gc/user/dto/ViewSettingDto.java
index 261f299..caa7cd2 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/dto/ViewFxsysDto.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/dto/ViewSettingDto.java
@@ -3,7 +3,7 @@
import lombok.Data;
@Data
-public class ViewFxsysDto {
+public class ViewSettingDto {
private Long id;
}
diff --git a/gc-user/src/main/java/com/xzx/gc/user/service/FxSysService.java b/gc-user/src/main/java/com/xzx/gc/user/service/FxSysService.java
index f608ca1..0a58836 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/service/FxSysService.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/service/FxSysService.java
@@ -1,6 +1,6 @@
package com.xzx.gc.user.service;
-import com.xzx.gc.user.vo.ViewFxsysVo;
+import com.xzx.gc.user.vo.ViewSettingVo;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -8,9 +8,9 @@
@Transactional
public class FxSysService {
- public ViewFxsysVo viewFxsys(Long id) {
- ViewFxsysVo viewFxsysVo = new ViewFxsysVo();
- return viewFxsysVo;
- }
+ public ViewSettingVo viewSetting(Long id) {
+ ViewSettingVo viewSettingVo = new ViewSettingVo();
+ return viewSettingVo;
+ }
}
diff --git a/gc-user/src/main/java/com/xzx/gc/user/vo/ViewFxsysVo.java b/gc-user/src/main/java/com/xzx/gc/user/vo/ViewFxsysVo.java
deleted file mode 100644
index febdc39..0000000
--- a/gc-user/src/main/java/com/xzx/gc/user/vo/ViewFxsysVo.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.xzx.gc.user.vo;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@Data
-@ApiModel(value = "ViewFxsysVo", description = "后台分销系统设置接口返回参数类")
-public class ViewFxsysVo {
-}
diff --git a/gc-user/src/main/java/com/xzx/gc/user/vo/ViewSettingVo.java b/gc-user/src/main/java/com/xzx/gc/user/vo/ViewSettingVo.java
new file mode 100644
index 0000000..2a32835
--- /dev/null
+++ b/gc-user/src/main/java/com/xzx/gc/user/vo/ViewSettingVo.java
@@ -0,0 +1,17 @@
+package com.xzx.gc.user.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel(value = "ViewSettingVo", description = "后台分销系统设置接口返回参数类")
+public class ViewSettingVo {
+
+ //首单奖励
+ private BigDecimal FristReward;
+
+ //团员在完成首单后，（请输入订单数量）笔单内，可以固定积分+环保币方式进行返佣团长
+ private Integer orderNum;
+}
--
Gitblit v1.9.1