记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
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
董敬伟
liquidnet-bus-v1
Commits
245e4668
Commit
245e4668
authored
Aug 08, 2022
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交 根据端订单 查询大麦单号
parent
249188d7
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
225 additions
and
176 deletions
+225
-176
KylinOrderRefundAdminController.java
...oller/zhengzai/kylin/KylinOrderRefundAdminController.java
+1
-1
OrderSwitchAdminController.java
...controller/zhengzai/order/OrderSwitchAdminController.java
+1
-1
orderList.html
...s/templates/zhengzai/kylin/order/orderList/orderList.html
+213
-174
KylinOrderRefundsServiceImpl.java
...gzai/kylin/service/impl/KylinOrderRefundsServiceImpl.java
+10
-0
No files found.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinOrderRefundAdminController.java
View file @
245e4668
...
@@ -264,7 +264,7 @@ public class KylinOrderRefundAdminController extends BaseController {
...
@@ -264,7 +264,7 @@ public class KylinOrderRefundAdminController extends BaseController {
@ResponseBody
@ResponseBody
@ApiImplicitParams
({
@ApiImplicitParams
({
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"String"
,
name
=
"code"
,
value
=
"订单号"
,
example
=
""
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"String"
,
name
=
"code"
,
value
=
"订单号"
,
example
=
""
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"int"
,
name
=
"type"
,
value
=
"1退款单号 2订单号"
,
example
=
""
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"int"
,
name
=
"type"
,
value
=
"1退款单号 2订单号
3大麦单号
"
,
example
=
""
),
})
})
public
AjaxResult
loginSmsSwitch
(
@NotNull
(
message
=
"订单号不能为空"
)
@RequestParam
String
code
,
public
AjaxResult
loginSmsSwitch
(
@NotNull
(
message
=
"订单号不能为空"
)
@RequestParam
String
code
,
@NotNull
(
message
=
"类型不能为空"
)
@RequestParam
int
type
)
{
@NotNull
(
message
=
"类型不能为空"
)
@RequestParam
int
type
)
{
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/order/OrderSwitchAdminController.java
View file @
245e4668
...
@@ -30,7 +30,7 @@ public class OrderSwitchAdminController {
...
@@ -30,7 +30,7 @@ public class OrderSwitchAdminController {
@ApiOperation
(
value
=
"根据截取订单号获取全量订单号"
)
@ApiOperation
(
value
=
"根据截取订单号获取全量订单号"
)
@ApiImplicitParams
({
@ApiImplicitParams
({
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"String"
,
name
=
"code"
,
value
=
"订单号"
,
example
=
""
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"String"
,
name
=
"code"
,
value
=
"订单号"
,
example
=
""
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"int"
,
name
=
"type"
,
value
=
"1退款单号 2订单号"
,
example
=
""
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"int"
,
name
=
"type"
,
value
=
"1退款单号 2订单号
3大麦单号
"
,
example
=
""
),
})
})
@PostMapping
(
"search/code"
)
@PostMapping
(
"search/code"
)
public
ResponseDto
<
Object
>
loginSmsSwitch
(
@NotNull
(
message
=
"订单号不能为空"
)
@RequestParam
String
code
,
public
ResponseDto
<
Object
>
loginSmsSwitch
(
@NotNull
(
message
=
"订单号不能为空"
)
@RequestParam
String
code
,
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/order/orderList/orderList.html
View file @
245e4668
This diff is collapsed.
Click to expand it.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinOrderRefundsServiceImpl.java
View file @
245e4668
...
@@ -13,6 +13,7 @@ import com.liquidnet.client.admin.common.utils.DateUtils;
...
@@ -13,6 +13,7 @@ import com.liquidnet.client.admin.common.utils.DateUtils;
import
com.liquidnet.client.admin.common.utils.ShiroUtils
;
import
com.liquidnet.client.admin.common.utils.ShiroUtils
;
import
com.liquidnet.commons.lang.util.BeanUtil
;
import
com.liquidnet.commons.lang.util.BeanUtil
;
import
com.liquidnet.commons.lang.util.JsonUtils
;
import
com.liquidnet.commons.lang.util.JsonUtils
;
import
com.liquidnet.commons.lang.util.StringUtil
;
import
com.liquidnet.service.base.ErrorMapping
;
import
com.liquidnet.service.base.ErrorMapping
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.kylin.constant.KylinTableStatusConst
;
import
com.liquidnet.service.kylin.constant.KylinTableStatusConst
;
...
@@ -33,6 +34,7 @@ import com.liquidnet.service.kylin.service.IKylinOrderRefundsService;
...
@@ -33,6 +34,7 @@ import com.liquidnet.service.kylin.service.IKylinOrderRefundsService;
import
com.mongodb.BasicDBObject
;
import
com.mongodb.BasicDBObject
;
import
com.mongodb.client.result.UpdateResult
;
import
com.mongodb.client.result.UpdateResult
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.mongodb.core.MongoTemplate
;
import
org.springframework.data.mongodb.core.MongoTemplate
;
...
@@ -558,6 +560,14 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
...
@@ -558,6 +560,14 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
}
else
{
}
else
{
orderCode
=
data
.
getOrderCode
();
orderCode
=
data
.
getOrderCode
();
}
}
}
else
if
(
type
==
3
)
{
KylinOrderTickets
data
=
kylinOrderTicketsMapper
.
selectOne
(
new
UpdateWrapper
<
KylinOrderTickets
>().
like
(
"order_code"
,
code
));
if
(
data
==
null
)
{
return
null
;
}
else
{
String
orderId
=
data
.
getOrderTicketsId
();
orderCode
=
StringUtils
.
left
(
orderId
,
5
).
concat
(
StringUtils
.
right
(
orderId
,
8
));
}
}
}
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
...
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