Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
farming
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
郑云飞
farming
Commits
27dba34e
Commit
27dba34e
authored
2 years ago
by
郑云飞
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
init
parent
a0c11b4d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
src/main/java/com/yunniu/farming/webadmin/service/impl/GroupOrderServiceImpl.java
+1
-1
src/main/java/com/yunniu/farming/webadmin/service/impl/OrderMainServiceImpl.java
+6
-5
No files found.
src/main/java/com/yunniu/farming/webadmin/service/impl/GroupOrderServiceImpl.java
View file @
27dba34e
...
...
@@ -62,7 +62,7 @@ public class GroupOrderServiceImpl implements GroupOrderService {
throw
new
ServiceException
(
"团购活动不存在"
);
}
if
(
ObjectUtils
.
isEmpty
(
groupOrder
))
{
List
<
Integer
>
list
=
JSON
.
parseArray
(
groupBuy
.
getAreaIds
(),
Integer
.
class
);
List
<
Long
>
list
=
JSON
.
parseArray
(
groupBuy
.
getAreaIds
(),
Long
.
class
);
if
(!
list
.
contains
(
item
.
getAreaId
()))
{
throw
new
ServiceException
(
"小区不存在"
);
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/yunniu/farming/webadmin/service/impl/OrderMainServiceImpl.java
View file @
27dba34e
...
...
@@ -108,8 +108,9 @@ public class OrderMainServiceImpl {
item
.
setIpaystatus
(
OrderMain
.
PAY_STATUS_NO
);
// 未支付
}
// item.setItype(OrderMain.ITYPE_TAKE);//外卖订单
if
(
item
.
getItype
()
==
null
)
{
item
.
setItype
(
OrderMain
.
ITYPE_TAKE
);
//外卖订单
}
item
.
setIstatus
(
OrderMain
.
STATUS_NOPAY
);
//未付款
item
.
setIpaytype
(
10
);
//微信支付
...
...
@@ -157,9 +158,9 @@ public class OrderMainServiceImpl {
if
(
item
.
getIpaystatus
()
==
null
)
{
item
.
setIpaystatus
(
OrderMain
.
PAY_STATUS_NO
);
// 未支付
}
//
item.setItype(OrderMain.ITYPE_TAKE);//外卖订单
if
(
item
.
getItype
()
==
null
)
{
item
.
setItype
(
OrderMain
.
ITYPE_TAKE
);
//外卖订单
}
item
.
setIstatus
(
OrderMain
.
STATUS_NOPAY
);
//未付款
item
.
setIpaytype
(
30
);
//积分支付
...
...
This diff is collapsed.
Click to expand it.
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