From 2b6c510f42418d6b4060e697ad053eb14b96c45d Mon Sep 17 00:00:00 2001 From: clunt Date: Thu, 5 May 2022 16:47:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=9D=E6=AD=A5=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B+=E5=95=86=E5=93=81=E8=A7=84=E6=A0=BC=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=EF=BC=8C=E4=BB=A5=E5=8F=8A=E5=B9=B3=E5=8F=B0=E6=89=A3?= =?UTF-8?q?=E6=AC=BE=EF=BC=8C=E5=88=86=E9=94=80=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../goods/GoodsStandardController.java | 17 +++++ .../web/controller/order/OrderController.java | 34 +++++++++ .../com/ghy/goods/domain/GoodsStandard.java | 47 ++++++++++++ .../com/ghy/system/domain/SysDeptConfig.java | 14 +++- logs/sys-error.2022-02-22.log | 0 logs/sys-info.2022-02-22.log | 76 ------------------- logs/sys-user.2022-02-22.log | 4 - 7 files changed, 111 insertions(+), 81 deletions(-) create mode 100644 ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsStandardController.java create mode 100644 ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java create mode 100644 ghy-goods/src/main/java/com/ghy/goods/domain/GoodsStandard.java delete mode 100644 logs/sys-error.2022-02-22.log delete mode 100644 logs/sys-info.2022-02-22.log delete mode 100644 logs/sys-user.2022-02-22.log diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsStandardController.java b/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsStandardController.java new file mode 100644 index 00000000..35563dfd --- /dev/null +++ b/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsStandardController.java @@ -0,0 +1,17 @@ +package com.ghy.web.controller.goods; + +import com.ghy.common.core.controller.BaseController; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * @author clunt + * 商品规格 + */ +@Controller +@RequestMapping("/goods/standard") +public class GoodsStandardController extends BaseController { + + + +} diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java new file mode 100644 index 00000000..adca53b0 --- /dev/null +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java @@ -0,0 +1,34 @@ +package com.ghy.web.controller.order; + +import com.ghy.common.core.controller.BaseController; +import com.ghy.common.core.domain.AjaxResult; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * @author clunt + * 下单接口 + */ +@Controller +@RequestMapping("/order") +public class OrderController extends BaseController { + + @PostMapping("/app") + public AjaxResult appOrder(){ + //TODO 校验商品信息(库存) + + //TODO 计算商品费用和运费汇总 + + //TODO 生成主单 + + //TODO 生成细单 + + //TODO 生成财务主单 + + //TODO 生成财务细单 + + return AjaxResult.success(); + } + +} diff --git a/ghy-goods/src/main/java/com/ghy/goods/domain/GoodsStandard.java b/ghy-goods/src/main/java/com/ghy/goods/domain/GoodsStandard.java new file mode 100644 index 00000000..c6a79097 --- /dev/null +++ b/ghy-goods/src/main/java/com/ghy/goods/domain/GoodsStandard.java @@ -0,0 +1,47 @@ +package com.ghy.goods.domain; + +import com.ghy.common.annotation.Excel; +import com.ghy.common.core.domain.BaseEntity; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class GoodsStandard extends BaseEntity { + + @Excel(name = "序号", cellType = Excel.ColumnType.NUMERIC) + private Long goodsStandardId; + + @Excel(name = "商品id", cellType = Excel.ColumnType.NUMERIC) + private Long goodsId; + + @Excel(name = "规格名称", cellType = Excel.ColumnType.STRING) + private String goodsStandardName; + + @Excel(name = "一级分销扣点比例", cellType = Excel.ColumnType.STRING) + private String oneRate; + + @Excel(name = "二级分销扣点比例", cellType = Excel.ColumnType.STRING) + private String twoRate; + + @Excel(name = "三级分销扣点比例", cellType = Excel.ColumnType.STRING) + private String threeRate; + + @Excel(name = "规格状态", cellType = Excel.ColumnType.NUMERIC) + private Integer status; + + @Excel(name = "价格") + private BigDecimal goodsPrice; + + @Excel(name = "优惠价") + private BigDecimal discountsPrice; + + @Excel(name = "团购价") + private BigDecimal groupPrice; + + /** 岗位排序 */ + @Excel(name = "商品排序", cellType = Excel.ColumnType.NUMERIC) + private String goodsSort; + + +} diff --git a/ghy-system/src/main/java/com/ghy/system/domain/SysDeptConfig.java b/ghy-system/src/main/java/com/ghy/system/domain/SysDeptConfig.java index a11081c5..837da6ea 100644 --- a/ghy-system/src/main/java/com/ghy/system/domain/SysDeptConfig.java +++ b/ghy-system/src/main/java/com/ghy/system/domain/SysDeptConfig.java @@ -1,5 +1,6 @@ package com.ghy.system.domain; +import com.ghy.common.annotation.Excel; import com.ghy.common.core.domain.BaseEntity; import lombok.Data; @@ -10,12 +11,23 @@ import lombok.Data; @Data public class SysDeptConfig extends BaseEntity { + @Excel(name = "序号", cellType = Excel.ColumnType.NUMERIC) private Long sysDeptConfigId; + @Excel(name = "部门id", cellType = Excel.ColumnType.NUMERIC) private Long deptId; + @Excel(name = "首页图片", cellType = Excel.ColumnType.STRING) private String bannerUrl; - // TODO 应该有很多配置才对. 例如支付第三方，logo的路径等等 + //通用支付/小程序配置 + private String adapayAppKey; + private String adapayMasterSecret; + private String adapayMaxRetryTimes; + private String wxAppId; + private String wxSecret; + + //平台扣点比例 + private String takeRate; } diff --git a/logs/sys-error.2022-02-22.log b/logs/sys-error.2022-02-22.log deleted file mode 100644 index e69de29b..00000000 diff --git a/logs/sys-info.2022-02-22.log b/logs/sys-info.2022-02-22.log deleted file mode 100644 index 44c68b0f..00000000 --- a/logs/sys-info.2022-02-22.log +++ /dev/null @@ -1,76 +0,0 @@ -11:30:35.981 [background-preinit] INFO o.h.v.i.util.Version - [,21] - HV000001: Hibernate Validator 6.2.0.Final -11:30:35.986 [restartedMain] INFO c.ghy.GhyApplication - [logStarting,55] - Starting GhyApplication using Java 1.8.0_282 on cluntdeMacBook-Pro.local with PID 67687 (/Users/clunt/java/guanghy/ghy/ghy-admin/target/classes started by clunt in /Users/clunt/java/guanghy/ghy) -11:30:35.987 [restartedMain] INFO c.ghy.GhyApplication - [logStartupProfileInfo,674] - The following profiles are active: druid -11:30:37.653 [restartedMain] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [sys-authCache] -11:30:38.343 [restartedMain] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [loginRecordCache] -11:30:42.311 [restartedMain] INFO c.a.d.p.DruidDataSource - [init,998] - {dataSource-1} inited -11:30:42.546 [restartedMain] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [sys-config] -11:30:42.549 [restartedMain] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [sys-config] -11:30:42.550 [restartedMain] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [sys-config] -11:30:42.550 [restartedMain] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [sys-config] -11:30:42.551 [restartedMain] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [sys-config] -11:30:42.551 [restartedMain] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [sys-config] -11:30:42.552 [restartedMain] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [sys-config] -11:30:42.552 [restartedMain] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [sys-config] -11:30:42.552 [restartedMain] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [sys-config] -11:30:42.553 [restartedMain] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [sys-config] -11:30:42.651 [restartedMain] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [sys-userCache] -11:30:42.966 [restartedMain] INFO o.a.c.h.Http11NioProtocol - [log,173] - Initializing ProtocolHandler ["http-nio-80"] -11:30:42.966 [restartedMain] INFO o.a.c.c.StandardService - [log,173] - Starting service [Tomcat] -11:30:42.967 [restartedMain] INFO o.a.c.c.StandardEngine - [log,173] - Starting Servlet engine: [Apache Tomcat/9.0.56] -11:30:43.034 [restartedMain] INFO o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring embedded WebApplicationContext -11:30:43.347 [restartedMain] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [sys-dict] -11:30:43.407 [restartedMain] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [sys-dict] -11:30:43.451 [restartedMain] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [sys-dict] -11:30:43.518 [restartedMain] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [sys-dict] -11:30:43.557 [restartedMain] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [sys-dict] -11:30:43.595 [restartedMain] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [sys-dict] -11:30:43.847 [restartedMain] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [sys-dict] -11:30:43.891 [restartedMain] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [sys-dict] -11:30:43.943 [restartedMain] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [sys-dict] -11:30:43.990 [restartedMain] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [sys-dict] -11:30:44.154 [restartedMain] INFO o.q.i.StdSchedulerFactory - [instantiate,1220] - Using default implementation for ThreadExecutor -11:30:44.168 [restartedMain] INFO o.q.c.SchedulerSignalerImpl - [,61] - Initialized Scheduler Signaller of type: class org.quartz.core.SchedulerSignalerImpl -11:30:44.168 [restartedMain] INFO o.q.c.QuartzScheduler - [,229] - Quartz Scheduler v.2.3.2 created. -11:30:44.177 [restartedMain] INFO o.q.c.QuartzScheduler - [initialize,294] - Scheduler meta-data: Quartz Scheduler (v2.3.2) 'RuoyiScheduler' with instanceId 'cluntdeMacBook-Pro.local1645500644157' - Scheduler class: 'org.quartz.core.QuartzScheduler' - running locally. - NOT STARTED. - Currently in standby mode. - Number of jobs executed: 0 - Using thread pool 'org.quartz.simpl.SimpleThreadPool' - with 20 threads. - Using job-store 'org.springframework.scheduling.quartz.LocalDataSourceJobStore' - which supports persistence. and is clustered. - -11:30:44.177 [restartedMain] INFO o.q.i.StdSchedulerFactory - [instantiate,1374] - Quartz scheduler 'RuoyiScheduler' initialized from an externally provided properties instance. -11:30:44.177 [restartedMain] INFO o.q.i.StdSchedulerFactory - [instantiate,1378] - Quartz scheduler version: 2.3.2 -11:30:44.179 [restartedMain] INFO o.q.c.QuartzScheduler - [setJobFactory,2293] - JobFactory set to: org.springframework.scheduling.quartz.AdaptableJobFactory@8e8095e -11:30:50.170 [restartedMain] INFO o.a.c.h.Http11NioProtocol - [log,173] - Starting ProtocolHandler ["http-nio-80"] -11:30:50.440 [restartedMain] INFO c.ghy.GhyApplication - [logStarted,61] - Started GhyApplication in 14.969 seconds (JVM running for 15.885) -11:30:52.012 [Quartz Scheduler [RuoyiScheduler]] INFO o.q.c.QuartzScheduler - [start,547] - Scheduler RuoyiScheduler_$_cluntdeMacBook-Pro.local1645500644157 started. -11:34:07.230 [http-nio-80-exec-1] INFO o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring DispatcherServlet 'dispatcherServlet' -11:34:07.251 [http-nio-80-exec-1] INFO o.a.s.s.m.AbstractValidatingSessionManager - [enableSessionValidation,233] - Enabling session validation scheduler... -11:34:07.277 [http-nio-80-exec-1] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [shiro-activeSessionCache] -11:34:07.319 [http-nio-80-exec-2] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [sys-config] -11:34:08.253 [schedule-pool-1] INFO c.g.f.s.w.s.OnlineWebSessionManager - [validateSessions,100] - invalidation sessions... -11:34:08.386 [schedule-pool-1] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [sys-userCache] -11:34:08.426 [schedule-pool-1] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [sys-userCache] -11:34:08.740 [schedule-pool-1] INFO c.g.f.s.w.s.OnlineWebSessionManager - [validateSessions,165] - Finished invalidation session. [2] sessions were stopped. -11:34:11.498 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功] -11:34:11.692 [http-nio-80-exec-23] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [sys-config] -11:34:11.693 [http-nio-80-exec-23] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [sys-config] -11:34:11.693 [http-nio-80-exec-23] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [sys-config] -11:34:11.693 [http-nio-80-exec-23] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [sys-config] -11:34:11.694 [http-nio-80-exec-23] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [sys-config] -11:34:11.694 [http-nio-80-exec-23] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [sys-config] -11:34:11.695 [http-nio-80-exec-23] INFO o.a.s.c.e.EhCacheManager - [getCache,169] - Using existing EHCache named [sys-config] -11:35:32.120 [SpringApplicationShutdownHook] INFO o.q.c.QuartzScheduler - [standby,585] - Scheduler RuoyiScheduler_$_cluntdeMacBook-Pro.local1645500644157 paused. -11:35:32.141 [SpringApplicationShutdownHook] INFO o.q.c.QuartzScheduler - [shutdown,666] - Scheduler RuoyiScheduler_$_cluntdeMacBook-Pro.local1645500644157 shutting down. -11:35:32.141 [SpringApplicationShutdownHook] INFO o.q.c.QuartzScheduler - [standby,585] - Scheduler RuoyiScheduler_$_cluntdeMacBook-Pro.local1645500644157 paused. -11:35:32.142 [SpringApplicationShutdownHook] INFO o.q.c.QuartzScheduler - [shutdown,740] - Scheduler RuoyiScheduler_$_cluntdeMacBook-Pro.local1645500644157 shutdown complete. -11:35:32.142 [SpringApplicationShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务==== -11:35:32.143 [SpringApplicationShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -11:35:32.143 [SpringApplicationShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== -11:35:32.151 [SpringApplicationShutdownHook] INFO c.a.d.p.DruidDataSource - [close,2071] - {dataSource-1} closing ... -11:35:32.154 [SpringApplicationShutdownHook] INFO c.a.d.p.DruidDataSource - [close,2144] - {dataSource-1} closed -11:35:46.277 [background-preinit] INFO o.h.v.i.util.Version - [,21] - HV000001: Hibernate Validator 6.2.0.Final -11:35:46.279 [restartedMain] INFO c.ghy.GhyApplication - [logStarting,55] - Starting GhyApplication using Java 1.8.0_282 on cluntdeMacBook-Pro.local with PID 70392 (/Users/clunt/java/guanghy/ghy/ghy-admin/target/classes started by clunt in /Users/clunt/java/guanghy/ghy) -11:35:46.279 [restartedMain] INFO c.ghy.GhyApplication - [logStartupProfileInfo,674] - The following profiles are active: druid diff --git a/logs/sys-user.2022-02-22.log b/logs/sys-user.2022-02-22.log deleted file mode 100644 index 10406951..00000000 --- a/logs/sys-user.2022-02-22.log +++ /dev/null @@ -1,4 +0,0 @@ -11:34:11.498 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功] -11:35:32.142 [SpringApplicationShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务==== -11:35:32.143 [SpringApplicationShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== -11:35:32.143 [SpringApplicationShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====