Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mmg-inf
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Jira
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
member
mmg-inf
Commits
335e1f84
Commit
335e1f84
authored
1 year ago
by
朱传珍
Browse files
Options
Downloads
Patches
Plain Diff
fix: memberCardLog增加physicalcardId
parent
c87929fa
Branches
Branches containing commit
Tags
production-deploy-20230728-163522
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/entity/MemberCardLog.ts
+3
-0
3 additions, 0 deletions
src/entity/MemberCardLog.ts
src/service/pay.service.ts
+4
-0
4 additions, 0 deletions
src/service/pay.service.ts
with
7 additions
and
0 deletions
src/entity/MemberCardLog.ts
+
3
−
0
View file @
335e1f84
...
...
@@ -272,4 +272,7 @@ export class MemberCardLog {
@
Column
(
'
varchar
'
,
{
name
:
'
type_sub
'
,
nullable
:
true
,
comment
:
'
子类型
'
,
length
:
50
})
typeSub
:
string
|
null
;
@
Column
(
'
int
'
,
{
name
:
'
physicalcard_id
'
,
nullable
:
true
,
comment
:
'
实体卡id
'
})
physicalcardId
:
number
|
null
;
}
This diff is collapsed.
Click to expand it.
src/service/pay.service.ts
+
4
−
0
View file @
335e1f84
...
...
@@ -224,6 +224,7 @@ export class PayService {
addUserName
:
body
.
addUserName
,
cardConfigId
:
memberCard
.
cardId
||
memberCard
.
giftcardId
,
cardType
:
memberCard
.
cardId
?
MemberCardLog
.
CARD_TYPE_CARD
:
MemberCardLog
.
CARD_TYPE_GIFTCARD
,
physicalcardId
:
memberCard
.
physicalcardId
,
});
memberCard
.
balance
=
parseFloat
(
new
Decimal
(
memberCard
.
balance
).
minus
(
body
.
amount
).
toFixed
(
2
));
memberCard
.
balanceGive
=
parseFloat
(
new
Decimal
(
memberCard
.
balanceGive
).
minus
(
balanceGiveChange
).
toFixed
(
2
));
...
...
@@ -337,6 +338,7 @@ export class PayService {
cardType
:
memberCard
.
cardId
?
MemberCardLog
.
CARD_TYPE_CARD
:
MemberCardLog
.
CARD_TYPE_GIFTCARD
,
remark
:
body
.
payNo
,
outRefundNo
:
body
.
refundNo
,
physicalcardId
:
memberCard
.
physicalcardId
,
});
memberCard
.
balance
=
log
.
balanceAfter
;
memberCard
.
balanceGive
=
log
.
balanceGiveAfter
;
...
...
@@ -432,6 +434,7 @@ export class PayService {
remark
:
body
.
payNo
,
cardConfigId
:
memberCard
.
cardId
||
memberCard
.
giftcardId
,
cardType
:
memberCard
.
cardId
?
MemberCardLog
.
CARD_TYPE_CARD
:
MemberCardLog
.
CARD_TYPE_GIFTCARD
,
physicalcardId
:
memberCard
.
physicalcardId
,
});
newLogs
.
push
(
newLog
);
memberCard
.
balance
=
balanceAfter
;
...
...
@@ -535,6 +538,7 @@ export class PayService {
remark
:
body
.
payNo
,
cardConfigId
:
memberCard
.
cardId
||
memberCard
.
giftcardId
,
cardType
:
memberCard
.
cardId
?
MemberCardLog
.
CARD_TYPE_CARD
:
MemberCardLog
.
CARD_TYPE_GIFTCARD
,
physicalcardId
:
memberCard
.
physicalcardId
,
});
memberCard
.
balance
=
balanceAfter
;
memberCard
.
balanceGive
=
balanceGiveAfter
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment