Commit 29d13de5 by Kim Gyeongeun

会員編集画面修正

parent 5a2e5584
package jp.agentec.sinaburocast.entity; package jp.agentec.sinaburocast.entity;
import java.sql.Timestamp;
import java.util.List; import java.util.List;
import javax.persistence.Column; import javax.persistence.Column;
...@@ -9,9 +8,6 @@ import javax.persistence.GeneratedValue; ...@@ -9,9 +8,6 @@ import javax.persistence.GeneratedValue;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.OneToMany; import javax.persistence.OneToMany;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Version;
@Entity @Entity
@Table(name="m_gift") @Table(name="m_gift")
...@@ -35,6 +31,9 @@ public class Gift extends AbstractEntity { ...@@ -35,6 +31,9 @@ public class Gift extends AbstractEntity {
@Column(name = "gift_type") @Column(name = "gift_type")
public Integer giftType; public Integer giftType;
@Column(name = "allocation")
public Integer allocation;
@OneToMany(mappedBy = "gift") @OneToMany(mappedBy = "gift")
public List<GiftExchange> giftExchange; public List<GiftExchange> giftExchange;
......
...@@ -116,9 +116,9 @@ public class PointGetService extends AbstractService<PointGet> { ...@@ -116,9 +116,9 @@ public class PointGetService extends AbstractService<PointGet> {
giftExchange.memberId = member.memberId; giftExchange.memberId = member.memberId;
giftExchange.giftId = gift.giftId; giftExchange.giftId = gift.giftId;
if(SinaburoConstant.giftType.ECOBO.equals(gift.giftType)) { if(SinaburoConstant.giftType.ECOBO.equals(gift.giftType)) {
giftExchange.cnt = gift.requiredPoint / SinaburoConstant.ECHOBO_MAI_POINT.MAI1; giftExchange.cnt = gift.requiredPoint / gift.allocation;
} else { } else {
giftExchange.cnt = gift.requiredPoint * SinaburoConstant.ICHICO_PER_POINT.POINT; giftExchange.cnt = gift.requiredPoint * gift.allocation;
} }
giftExchange.applyDate = SinaburoUtil.getTimestamp(); giftExchange.applyDate = SinaburoUtil.getTimestamp();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment