Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
em
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ichikawa
em
Commits
29d13de5
Commit
29d13de5
authored
Apr 10, 2024
by
Kim Gyeongeun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
会員編集画面修正
parent
5a2e5584
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
src/main/java/jp/agentec/sinaburocast/entity/Gift.java
+3
-4
src/main/java/jp/agentec/sinaburocast/service/PointGetService.java
+2
-2
No files found.
src/main/java/jp/agentec/sinaburocast/entity/Gift.java
View file @
29d13de5
package
jp
.
agentec
.
sinaburocast
.
entity
;
import
java.sql.Timestamp
;
import
java.util.List
;
import
javax.persistence.Column
;
...
...
@@ -9,9 +8,6 @@ import javax.persistence.GeneratedValue;
import
javax.persistence.Id
;
import
javax.persistence.OneToMany
;
import
javax.persistence.Table
;
import
javax.persistence.Temporal
;
import
javax.persistence.TemporalType
;
import
javax.persistence.Version
;
@Entity
@Table
(
name
=
"m_gift"
)
...
...
@@ -36,6 +32,9 @@ public class Gift extends AbstractEntity {
@Column
(
name
=
"gift_type"
)
public
Integer
giftType
;
@Column
(
name
=
"allocation"
)
public
Integer
allocation
;
@OneToMany
(
mappedBy
=
"gift"
)
public
List
<
GiftExchange
>
giftExchange
;
...
...
src/main/java/jp/agentec/sinaburocast/service/PointGetService.java
View file @
29d13de5
...
...
@@ -116,9 +116,9 @@ public class PointGetService extends AbstractService<PointGet> {
giftExchange
.
memberId
=
member
.
memberId
;
giftExchange
.
giftId
=
gift
.
giftId
;
if
(
SinaburoConstant
.
giftType
.
ECOBO
.
equals
(
gift
.
giftType
))
{
giftExchange
.
cnt
=
gift
.
requiredPoint
/
SinaburoConstant
.
ECHOBO_MAI_POINT
.
MAI1
;
giftExchange
.
cnt
=
gift
.
requiredPoint
/
gift
.
allocation
;
}
else
{
giftExchange
.
cnt
=
gift
.
requiredPoint
*
SinaburoConstant
.
ICHICO_PER_POINT
.
POINT
;
giftExchange
.
cnt
=
gift
.
requiredPoint
*
gift
.
allocation
;
}
giftExchange
.
applyDate
=
SinaburoUtil
.
getTimestamp
();
...
...
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