Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
freemud.be.toolbox
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
陈宁
freemud.be.toolbox
Commits
45da32bf
Commit
45da32bf
authored
Aug 08, 2020
by
陈宁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
# dev 清除用户测试环境麦钱包券
parent
a1cc0c9f
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
86 additions
and
27 deletions
+86
-27
Freemud.BE.Toolbox.WebApi/Controllers/RequestResourceController.cs
+6
-2
Freemud.BE.Toolbox.WebApi/Proxy/FmCouponProxy.cs
+4
-0
Freemud.BE.Toolbox.WebApi/Services/IRequestResourceService.cs
+2
-0
Freemud.BE.Toolbox.WebApi/Services/Impl/RequestResourceService.cs
+8
-9
freemud.be.toolboxview/src/router/index.js
+2
-2
freemud.be.toolboxview/src/views/requestresource/CouponFreeze.vue
+0
-5
freemud.be.toolboxview/src/views/requestresource/CouponOption.vue
+54
-0
freemud.be.toolboxview/src/views/requestresource/CouponProductSearch.vue
+3
-2
freemud.be.toolboxview/src/views/requestresource/RequestResource.vue
+4
-4
freemud.be.toolboxview/src/views/requestresource/UserCoupons.vue
+3
-3
No files found.
Freemud.BE.Toolbox.WebApi/Controllers/RequestResourceController.cs
View file @
45da32bf
...
@@ -17,8 +17,6 @@ namespace Freemud.BE.Toolbox.WebApi.Controllers
...
@@ -17,8 +17,6 @@ namespace Freemud.BE.Toolbox.WebApi.Controllers
this
.
requestResourceService
=
requestResourceService
;
this
.
requestResourceService
=
requestResourceService
;
}
}
[
HttpPost
(
"get-coupon"
)]
[
HttpPost
(
"get-coupon"
)]
public
async
Task
<
IActionResult
>
GetCouponInfo
([
FromBody
]
GetCouponInfoRequest
request
)
public
async
Task
<
IActionResult
>
GetCouponInfo
([
FromBody
]
GetCouponInfoRequest
request
)
{
{
...
@@ -31,6 +29,12 @@ namespace Freemud.BE.Toolbox.WebApi.Controllers
...
@@ -31,6 +29,12 @@ namespace Freemud.BE.Toolbox.WebApi.Controllers
return
Ok
(
data
:
await
requestResourceService
.
GetUserCoupons
(
request
));
return
Ok
(
data
:
await
requestResourceService
.
GetUserCoupons
(
request
));
}
}
[
HttpPost
(
"del-user-dev-archcards"
)]
public
async
Task
<
IActionResult
>
DeleteUserDevArchCards
(
string
terms
)
{
return
Ok
(
data
:
await
requestResourceService
.
DeleteUserArchCard
(
terms
));
}
[
HttpPost
(
"get-product"
)]
[
HttpPost
(
"get-product"
)]
public
async
Task
<
IActionResult
>
GetProductInfo
([
FromBody
]
GetProductInfoRequest
request
)
public
async
Task
<
IActionResult
>
GetProductInfo
([
FromBody
]
GetProductInfoRequest
request
)
{
{
...
...
Freemud.BE.Toolbox.WebApi/Proxy/FmCouponProxy.cs
View file @
45da32bf
...
@@ -188,6 +188,10 @@ namespace Freemud.BE.Toolbox.WebApi.Proxy
...
@@ -188,6 +188,10 @@ namespace Freemud.BE.Toolbox.WebApi.Proxy
public
async
Task
<
RequestResourceResponse
>
DeleteUserArchcards
(
string
memberId
)
public
async
Task
<
RequestResourceResponse
>
DeleteUserArchcards
(
string
memberId
)
{
{
var
url
=
GetUrl
(
ToolboxConstants
.
ENV_DEV
,
"Archcard"
,
"delUserCard"
);
var
url
=
GetUrl
(
ToolboxConstants
.
ENV_DEV
,
"Archcard"
,
"delUserCard"
);
// 特殊处理一下此URL, 避免多配置一个服务节点
url
=
url
.
Replace
(
"debug/"
,
string
.
Empty
);
var
body
=
new
{
user_id
=
memberId
};
var
body
=
new
{
user_id
=
memberId
};
var
response
=
await
HttpHeper
.
Post
(
url
,
jsonBody
:
body
);
var
response
=
await
HttpHeper
.
Post
(
url
,
jsonBody
:
body
);
...
...
Freemud.BE.Toolbox.WebApi/Services/IRequestResourceService.cs
View file @
45da32bf
...
@@ -13,6 +13,8 @@ namespace Freemud.BE.Toolbox.WebApi.Services
...
@@ -13,6 +13,8 @@ namespace Freemud.BE.Toolbox.WebApi.Services
Task
<
List
<
RequestResourceResponse
>>
GetUserCoupons
(
GetUserCouponsRequest
request
);
Task
<
List
<
RequestResourceResponse
>>
GetUserCoupons
(
GetUserCouponsRequest
request
);
Task
<
List
<
RequestResourceResponse
>>
DeleteUserArchCard
(
string
terms
);
Task
<
List
<
RequestResourceResponse
>>
GetProductInfo
(
GetProductInfoRequest
request
);
Task
<
List
<
RequestResourceResponse
>>
GetProductInfo
(
GetProductInfoRequest
request
);
Task
<
List
<
RequestResourceResponse
>>
GetStoreInfo
(
GetStoreInfoRequest
request
);
Task
<
List
<
RequestResourceResponse
>>
GetStoreInfo
(
GetStoreInfoRequest
request
);
...
...
Freemud.BE.Toolbox.WebApi/Services/Impl/RequestResourceService.cs
View file @
45da32bf
...
@@ -122,7 +122,7 @@ namespace Freemud.BE.Toolbox.WebApi.Services
...
@@ -122,7 +122,7 @@ namespace Freemud.BE.Toolbox.WebApi.Services
result
.
Add
(
new
RequestResourceResponse
result
.
Add
(
new
RequestResourceResponse
{
{
Name
=
"查询词有误"
,
Name
=
"查询词有误"
,
ResponseError
=
"查询关键词格式有误可接受: Mobile 或 MemberId"
ResponseError
=
"查询关键词格式有误
.
可接受: Mobile 或 MemberId"
});
});
}
}
else
else
...
@@ -136,7 +136,6 @@ namespace Freemud.BE.Toolbox.WebApi.Services
...
@@ -136,7 +136,6 @@ namespace Freemud.BE.Toolbox.WebApi.Services
{
{
Name
=
"查询用户信息失败"
,
Name
=
"查询用户信息失败"
,
ResponseError
=
"查询用户信息失败"
ResponseError
=
"查询用户信息失败"
});
});
}
}
else
else
...
@@ -273,11 +272,11 @@ namespace Freemud.BE.Toolbox.WebApi.Services
...
@@ -273,11 +272,11 @@ namespace Freemud.BE.Toolbox.WebApi.Services
return
result
;
return
result
;
}
}
/// <summary>
#
endregion
/// 删除用户麦钱包券(仅测试环境)
/// </summary>
/// <param name="terms">手机号 / MemberId</param>
#
region
删除用户麦钱包券
(
仅测试环境
)
/// <returns></returns>
public
async
Task
<
List
<
RequestResourceResponse
>>
DeleteUserArchCard
(
string
terms
)
public
async
Task
<
List
<
RequestResourceResponse
>>
DeleteUserArchCard
(
string
terms
)
{
{
var
result
=
new
List
<
RequestResourceResponse
>();
var
result
=
new
List
<
RequestResourceResponse
>();
...
@@ -287,7 +286,7 @@ namespace Freemud.BE.Toolbox.WebApi.Services
...
@@ -287,7 +286,7 @@ namespace Freemud.BE.Toolbox.WebApi.Services
result
.
Add
(
new
RequestResourceResponse
result
.
Add
(
new
RequestResourceResponse
{
{
Name
=
"查询词有误"
,
Name
=
"查询词有误"
,
ResponseError
=
"查询关键词格式有误可接受: Mobile 或 MemberId"
ResponseError
=
"查询关键词格式有误
.
可接受: Mobile 或 MemberId"
});
});
}
}
else
else
...
@@ -298,7 +297,7 @@ namespace Freemud.BE.Toolbox.WebApi.Services
...
@@ -298,7 +297,7 @@ namespace Freemud.BE.Toolbox.WebApi.Services
result
.
Add
(
new
RequestResourceResponse
result
.
Add
(
new
RequestResourceResponse
{
{
Name
=
"查询用户信息失败"
,
Name
=
"查询用户信息失败"
,
ResponseError
=
"
查询用户信息失败
"
ResponseError
=
"
未找到相关用户信息
"
});
});
}
}
else
else
...
...
freemud.be.toolboxview/src/router/index.js
View file @
45da32bf
...
@@ -7,7 +7,7 @@ import EnvironmentConfigure from '../views/EnvironmentConfigure.vue'
...
@@ -7,7 +7,7 @@ import EnvironmentConfigure from '../views/EnvironmentConfigure.vue'
import
BeLogging
from
'../views/BeLogging.vue'
import
BeLogging
from
'../views/BeLogging.vue'
import
RequestResource
from
'../views/requestresource/RequestResource.vue'
import
RequestResource
from
'../views/requestresource/RequestResource.vue'
import
CanDaoStoreSearch
from
'../views/requestresource/CanDaoStoreSearch.vue'
import
CanDaoStoreSearch
from
'../views/requestresource/CanDaoStoreSearch.vue'
import
Coupon
Freeze
from
'../views/requestresource/CouponFreeze
.vue'
import
Coupon
Option
from
'../views/requestresource/CouponOption
.vue'
import
CouponProductSearch
from
'../views/requestresource/CouponProductSearch.vue'
import
CouponProductSearch
from
'../views/requestresource/CouponProductSearch.vue'
import
OrderSearch
from
'../views/requestresource/OrderSearch.vue'
import
OrderSearch
from
'../views/requestresource/OrderSearch.vue'
import
ProductSearch
from
'../views/requestresource/ProductSearch.vue'
import
ProductSearch
from
'../views/requestresource/ProductSearch.vue'
...
@@ -31,7 +31,7 @@ const routes = [
...
@@ -31,7 +31,7 @@ const routes = [
redirect
:
'/request-resource/coupon-product'
,
redirect
:
'/request-resource/coupon-product'
,
children
:
[
children
:
[
{
path
:
'candao-store'
,
component
:
CanDaoStoreSearch
},
{
path
:
'candao-store'
,
component
:
CanDaoStoreSearch
},
{
path
:
'coupon-
freeze'
,
component
:
CouponFreeze
},
{
path
:
'coupon-
option'
,
component
:
CouponOption
},
{
path
:
'coupon-product'
,
component
:
CouponProductSearch
},
{
path
:
'coupon-product'
,
component
:
CouponProductSearch
},
{
path
:
'order'
,
component
:
OrderSearch
},
{
path
:
'order'
,
component
:
OrderSearch
},
{
path
:
'product'
,
component
:
ProductSearch
},
{
path
:
'product'
,
component
:
ProductSearch
},
...
...
freemud.be.toolboxview/src/views/requestresource/CouponFreeze.vue
deleted
100644 → 0
View file @
a1cc0c9f
<
template
>
<div>
<h1>
coupon-freeze
</h1>
</div>
</
template
>
freemud.be.toolboxview/src/views/requestresource/CouponOption.vue
0 → 100644
View file @
45da32bf
<
template
>
<div>
<Row
:gutter=
"16"
>
<Col
span=
"12"
>
<Card>
<p
slot=
"title"
>
<Icon
type=
"ios-hammer"
/>
<span>
清空测试环境麦钱包券
</span>
</p>
<Input
search
enter-button=
"清卡"
placeholder=
"手机号 / MemberId"
@
on-search=
"clearDevArchCards"
/>
</Card>
</Col>
</Row>
</div>
</
template
>
<
script
>
export
default
{
data
()
{
return
{
channel
:
'delivery'
,
env
:
'dev'
,
time
:
new
Date
()
}
},
methods
:
{
async
clearDevArchCards
(
val
)
{
if
(
!
val
)
{
this
.
$Message
.
warning
(
'请输入手机号 或 MemberId'
)
return
}
const
{
data
:
response
}
=
await
this
.
$http
.
post
(
'/requestresource/del-user-dev-archcards?terms='
+
val
)
if
(
response
.
code
!==
200
)
{
this
.
$Message
.
error
(
response
.
message
)
}
else
{
if
(
response
.
data
[
0
].
responseContent
)
{
const
result
=
JSON
.
parse
(
response
.
data
[
0
].
responseContent
)
if
(
result
.
code
===
0
)
{
this
.
$Message
.
success
(
'清除成功'
)
}
else
{
this
.
$Message
.
error
(
result
.
msg
)
}
}
}
}
}
}
</
script
>
freemud.be.toolboxview/src/views/requestresource/CouponProductSearch.vue
View file @
45da32bf
...
@@ -167,7 +167,7 @@ export default {
...
@@ -167,7 +167,7 @@ export default {
return
{
return
{
loadingSearch
:
false
,
loadingSearch
:
false
,
channel
:
'delivery'
,
channel
:
'delivery'
,
env
:
'
prod
'
,
env
:
'
dev
'
,
time
:
''
,
time
:
''
,
couponCode
:
''
,
couponCode
:
''
,
storeId
:
''
,
storeId
:
''
,
...
@@ -225,7 +225,8 @@ export default {
...
@@ -225,7 +225,8 @@ export default {
{
name
:
'优惠券过期时间'
,
field
:
'vdata'
,
val
:
c
.
codeInfo
.
vdata
},
{
name
:
'优惠券过期时间'
,
field
:
'vdata'
,
val
:
c
.
codeInfo
.
vdata
},
{
name
:
'活动号'
,
field
:
'act_id'
,
val
:
c
.
codeInfo
.
act_id
},
{
name
:
'活动号'
,
field
:
'act_id'
,
val
:
c
.
codeInfo
.
act_id
},
{
name
:
'活动名称'
,
field
:
'act_name'
,
val
:
c
.
codeInfo
.
act_name
},
{
name
:
'活动名称'
,
field
:
'act_name'
,
val
:
c
.
codeInfo
.
act_name
},
{
name
:
'活动描述'
,
field
:
'act_desc'
,
val
:
c
.
codeInfo
.
act_desc
},
{
name
:
'总可用次数'
,
field
:
'availableTimes'
,
val
:
c
.
codeInfo
.
availableTimes
},
{
name
:
'限制可用次数'
,
field
:
'limitTimes'
,
val
:
c
.
codeInfo
.
limitTimes
},
{
name
:
'代金券优惠(非代金券不返回)'
,
field
:
'amount '
,
val
:
c
.
codeInfo
.
amount
},
{
name
:
'代金券优惠(非代金券不返回)'
,
field
:
'amount '
,
val
:
c
.
codeInfo
.
amount
},
{
name
:
'代金券门槛(非代金券不返回)'
,
field
:
'minamount'
,
val
:
c
.
codeInfo
.
minamount
},
{
name
:
'代金券门槛(非代金券不返回)'
,
field
:
'minamount'
,
val
:
c
.
codeInfo
.
minamount
},
{
name
:
'对应商品编号'
,
field
:
'mcd_productCode'
,
val
:
c
.
codeInfo
.
products
[
0
].
mcd_productCode
},
{
name
:
'对应商品编号'
,
field
:
'mcd_productCode'
,
val
:
c
.
codeInfo
.
products
[
0
].
mcd_productCode
},
...
...
freemud.be.toolboxview/src/views/requestresource/RequestResource.vue
View file @
45da32bf
...
@@ -11,9 +11,9 @@
...
@@ -11,9 +11,9 @@
<MenuItem
name=
"/user-coupons"
to=
"/request-resource/user-coupons"
>
<MenuItem
name=
"/user-coupons"
to=
"/request-resource/user-coupons"
>
<Icon
type=
"md-cube"
/>
用户券数据
<Icon
type=
"md-cube"
/>
用户券数据
</MenuItem>
</MenuItem>
<
!--
<MenuItem
name=
"/coupon-freeze"
to=
"/request-resource/coupon-freeze
"
>
<
MenuItem
name=
"/coupon-option"
to=
"/request-resource/coupon-option
"
>
<Icon
type=
"md-cube"
/>
激活
&
冻结
<Icon
type=
"md-cube"
/>
券相关操作
</MenuItem>
-->
</MenuItem>
</MenuGroup>
</MenuGroup>
<MenuGroup
title=
"商品"
>
<MenuGroup
title=
"商品"
>
<MenuItem
name=
"/product"
to=
"/request-resource/product"
>
<MenuItem
name=
"/product"
to=
"/request-resource/product"
>
...
@@ -51,7 +51,7 @@ export default {
...
@@ -51,7 +51,7 @@ export default {
resources
:
[
resources
:
[
{
name
:
'/coupon-product'
,
text
:
'码券商品信息'
},
{
name
:
'/coupon-product'
,
text
:
'码券商品信息'
},
{
name
:
'/user-coupons'
,
text
:
'用户券数据'
},
{
name
:
'/user-coupons'
,
text
:
'用户券数据'
},
{
name
:
'/coupon-
freeze'
,
text
:
'激活&冻结
'
},
{
name
:
'/coupon-
option'
,
text
:
'券相关操作
'
},
{
name
:
'/product'
,
text
:
'商品信息查询'
},
{
name
:
'/product'
,
text
:
'商品信息查询'
},
{
name
:
'/order'
,
text
:
'根据订单编号查询订单'
},
{
name
:
'/order'
,
text
:
'根据订单编号查询订单'
},
{
name
:
'/candao-store'
,
text
:
'门店信息'
}
{
name
:
'/candao-store'
,
text
:
'门店信息'
}
...
...
freemud.be.toolboxview/src/views/requestresource/UserCoupons.vue
View file @
45da32bf
...
@@ -59,7 +59,6 @@
...
@@ -59,7 +59,6 @@
<div
class=
"resource-result"
>
<div
class=
"resource-result"
>
<Tabs
:animated=
"false"
>
<Tabs
:animated=
"false"
>
<TabPane
label=
"结果"
icon=
"md-list-box"
>
<TabPane
label=
"结果"
icon=
"md-list-box"
>
<Row
class=
"coupon-line"
:gutter=
"16"
></Row>
<Collapse
simple
v-if=
"!vError"
>
<Collapse
simple
v-if=
"!vError"
>
<Panel
v-for=
"item in vData"
:key=
"item.type"
:class=
"['card-panel-'+item.type]"
>
<Panel
v-for=
"item in vData"
:key=
"item.type"
:class=
"['card-panel-'+item.type]"
>
{{
item
.
name
}}
(
{{
item
.
data
.
length
}}
张)
{{
item
.
name
}}
(
{{
item
.
data
.
length
}}
张)
...
@@ -69,7 +68,7 @@
...
@@ -69,7 +68,7 @@
v-for=
"data in item.data"
v-for=
"data in item.data"
:key=
"data.card.code"
:key=
"data.card.code"
class=
"coupon-line"
class=
"coupon-line"
:gutter=
"
1
6"
:gutter=
"6"
>
>
<Col
span=
"8"
>
<Col
span=
"8"
>
<Card
dis-hover
>
<Card
dis-hover
>
...
@@ -375,7 +374,8 @@ export default {
...
@@ -375,7 +374,8 @@ export default {
{
name
:
'优惠券过期时间'
,
field
:
'vdata'
,
val
:
c
.
codeInfo
.
vdata
},
{
name
:
'优惠券过期时间'
,
field
:
'vdata'
,
val
:
c
.
codeInfo
.
vdata
},
{
name
:
'活动号'
,
field
:
'act_id'
,
val
:
c
.
codeInfo
.
act_id
},
{
name
:
'活动号'
,
field
:
'act_id'
,
val
:
c
.
codeInfo
.
act_id
},
{
name
:
'活动名称'
,
field
:
'act_name'
,
val
:
c
.
codeInfo
.
act_name
},
{
name
:
'活动名称'
,
field
:
'act_name'
,
val
:
c
.
codeInfo
.
act_name
},
{
name
:
'活动描述'
,
field
:
'act_desc'
,
val
:
c
.
codeInfo
.
act_desc
},
{
name
:
'总可用次数'
,
field
:
'availableTimes'
,
val
:
c
.
codeInfo
.
availableTimes
},
{
name
:
'限制可用次数'
,
field
:
'limitTimes'
,
val
:
c
.
codeInfo
.
limitTimes
},
{
name
:
'代金券优惠(非代金券不返回)'
,
field
:
'amount '
,
val
:
c
.
codeInfo
.
amount
},
{
name
:
'代金券优惠(非代金券不返回)'
,
field
:
'amount '
,
val
:
c
.
codeInfo
.
amount
},
{
name
:
'代金券门槛(非代金券不返回)'
,
field
:
'minamount'
,
val
:
c
.
codeInfo
.
minamount
},
{
name
:
'代金券门槛(非代金券不返回)'
,
field
:
'minamount'
,
val
:
c
.
codeInfo
.
minamount
},
{
name
:
'对应商品编号'
,
field
:
'mcd_productCode'
,
val
:
c
.
codeInfo
.
products
[
0
].
mcd_productCode
},
{
name
:
'对应商品编号'
,
field
:
'mcd_productCode'
,
val
:
c
.
codeInfo
.
products
[
0
].
mcd_productCode
},
...
...
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