Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
serviceApi
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
antaile
serviceApi
Commits
088f9f78
Commit
088f9f78
authored
Jul 19, 2021
by
XiaHou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
查询展览纪念馆
parent
efb5f72e
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
13 deletions
+13
-13
BlessController.java
...tlgroupasia/servicecenter/controller/BlessController.java
+2
-4
OshServicesOrderDTO.java
...m/atlgroupasia/servicecenter/dto/OshServicesOrderDTO.java
+1
-1
Logback.xml
src/main/resources/Logback.xml
+1
-1
application.yml
src/main/resources/application.yml
+6
-4
OshServicesOrderMapper.xml
src/main/resources/mapper/OshServicesOrderMapper.xml
+3
-3
No files found.
src/main/java/com/atlgroupasia/servicecenter/controller/BlessController.java
View file @
088f9f78
...
...
@@ -8,10 +8,7 @@ import io.swagger.annotations.Api;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiParam
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.*
;
/**
* @Author xh
...
...
@@ -21,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@Api
(
tags
=
"福位相关接口"
,
description
=
"福位控制器"
)
@RequestMapping
(
"/bless"
)
@CrossOrigin
(
value
=
"*"
,
maxAge
=
3600
)
public
class
BlessController
{
@Autowired
...
...
src/main/java/com/atlgroupasia/servicecenter/dto/OshServicesOrderDTO.java
View file @
088f9f78
...
...
@@ -38,7 +38,7 @@ public class OshServicesOrderDTO implements Serializable {
@ApiModelProperty
(
value
=
"纪念次数"
)
private
Long
times
;
@ApiModelProperty
(
value
=
"活跃值
)
@ApiModelProperty
(
value
=
"活跃值
"
)
private
BigDecimal
sumTotalPrice
;
}
src/main/resources/Logback.xml
View file @
088f9f78
...
...
@@ -41,7 +41,7 @@
<logger
name=
"java.sql.PreparedStatement"
level=
"DEBUG"
/>
<!-- 日志输出级别 -->
<root
level=
"
INFO
"
>
<root
level=
"
DEBUG
"
>
<appender-ref
ref=
"STDOUT"
/>
<appender-ref
ref=
"FILE"
/>
</root>
...
...
src/main/resources/application.yml
View file @
088f9f78
...
...
@@ -10,10 +10,12 @@ spring:
#���ݿ�����
datasource
:
driver-class-name
:
com.mysql.cj.jdbc.Driver
url
:
jdbc:mysql://lmerp001w.mysql.rds.aliyuncs.com/lmerp?characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
username
:
test_erp
password
:
Fzii591com
#url: jdbc:mysql://lmerp001w.mysql.rds.aliyuncs.com/lmerp?characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
#username: test_erp
#password: Fzii591com
url
:
jdbc:mysql://lmerp001w.mysql.rds.aliyuncs.com/lmerp_demo?characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
username
:
dev_erp
password
:
fzii591COM
#url: jdbc:mysql://47.98.216.76:3306/atl-service-center?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#username: root
#password: 6just@2019
...
...
src/main/resources/mapper/OshServicesOrderMapper.xml
View file @
088f9f78
...
...
@@ -206,10 +206,10 @@
</select>
<select
id=
"selectPayOrderTimes"
parameterType=
"com.atlgroupasia.servicecenter.queryparam.QueryOrderRelationTimeParam"
resultType=
"java.lang.Long"
>
select IFNULL(count(*),0) from osh_services_order
where pay_price is not null
select IFNULL(count(*),0) from osh_services_order
a
where
a.
pay_price is not null
<if
test=
"relationTimeId != null"
>
and
relation_time_id =
#{relationTimeId}
and
a.relation_time_id =
#{relationTimeId}
</if>
</select>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment