Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
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
order-group-application
order-group
Commits
36f0d3e8
Commit
36f0d3e8
authored
Oct 10, 2020
by
ping.wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
对接会员发券接口
parent
ede34c53
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
56 additions
and
7 deletions
+56
-7
order-application-service/src/main/java/cn/freemud/entities/dto/user/SendCouponForqujiaDto.java
+26
-0
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
+26
-7
order-application-service/src/main/java/cn/freemud/service/thirdparty/CustomerExtendClient.java
+4
-0
No files found.
order-application-service/src/main/java/cn/freemud/entities/dto/user/SendCouponForqujiaDto.java
0 → 100644
View file @
36f0d3e8
package
cn
.
freemud
.
entities
.
dto
.
user
;
import
lombok.Data
;
import
java.util.List
;
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @version V1.0
* @Title: SendCouponForqujiaDto
* @Package cn.freemud.entities.dto.user
* @Description:
* @author: ping1.wu
* @date: 2020/10/10 17:35
* @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
* 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目
*/
@Data
public
class
SendCouponForqujiaDto
{
private
String
mobile
;
private
List
<
String
>
cardId
;
}
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
View file @
36f0d3e8
...
...
@@ -36,6 +36,7 @@ import cn.freemud.entities.dto.product.ProductAttributeGroup;
import
cn.freemud.entities.dto.product.ProductGroup
;
import
cn.freemud.entities.dto.shoppingCart.NewShoppingCartClearDto
;
import
cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto
;
import
cn.freemud.entities.dto.user.SendCouponForqujiaDto
;
import
cn.freemud.entities.vo.*
;
import
cn.freemud.enums.*
;
import
cn.freemud.interceptor.ServiceException
;
...
...
@@ -231,6 +232,8 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
private
EmailAlertService
emailAlertService
;
@Autowired
private
OrderBaseService
orderBaseService
;
@Autowired
private
CustomerExtendClient
customerExtendClient
;
@Override
public
BaseResponse
createMCCafeOrder
(
CreateOrderVo
createOrderVo
)
{
...
...
@@ -807,16 +810,16 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
OrderExtInfoDto
orderExtInfoDto
=
null
;
String
wxappid
=
""
;
String
sessionId
=
""
;
String
openid
=
""
;
String
ruleId
=
""
;
//
String openid = "";
//
String ruleId = "";
String
payCode
=
""
;
if
(
StringUtils
.
isNotBlank
(
extInfo
))
{
orderExtInfoDto
=
gson
.
fromJson
(
extInfo
,
OrderExtInfoDto
.
class
);
if
(
orderExtInfoDto
!=
null
&&
StringUtils
.
isNotBlank
(
orderExtInfoDto
.
getOpenid
()))
{
openid
=
orderExtInfoDto
.
getOpenid
();
//
openid = orderExtInfoDto.getOpenid();
wxappid
=
orderExtInfoDto
.
getAppid
();
sessionId
=
orderExtInfoDto
.
getSessionId
();
ruleId
=
orderExtInfoDto
.
getRuleId
();
//
ruleId = orderExtInfoDto.getRuleId();
}
if
(
orderExtInfoDto
!=
null
&&
StringUtils
.
isNotBlank
(
orderExtInfoDto
.
getPayCode
())
&&
Arrays
.
asList
(
PayChannel
.
ALIPAY
.
getCode
(),
PayChannel
.
WXPAY
.
getCode
()).
contains
(
orderExtInfoDto
.
getPayCode
()))
{
...
...
@@ -828,6 +831,9 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
return
sendPaySuccessNoticeMessage
();
}
//麦咖啡随单购咖啡月卡
withOrderBuyCoupon
(
orderBean
);
// 如果是到店,则冻结优惠券
// 如果是外卖,则核销优惠券
// 失败重试三次
...
...
@@ -845,9 +851,6 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
// TODO 记录一下冻结失败的券
}
}
//若该订单使用了优惠券,则移除卡包,移除失败也不退款
// BaseResponse couponBaseResponse = couponClientService.callbackNotify(orderBean);
// 订单失败后 发消息重试 待实现
String
takeCode
;
String
daySeq
;
...
...
@@ -1418,4 +1421,20 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
}
}
/**
* 随单购月卡调会员发券与更新订单使用的优惠券与买的优惠券
* @param orderBean
*/
private
void
withOrderBuyCoupon
(
OrderBean
orderBean
){
SendCouponForqujiaDto
request
=
new
SendCouponForqujiaDto
();
request
.
setMobile
(
orderBean
.
getPhone
());
request
.
setCardId
(
Arrays
.
asList
(
"MQYK4218C538123385F3AEA52D42AC894CBF"
));
customerExtendClient
.
sendCouponForqujia
(
request
);
}
}
order-application-service/src/main/java/cn/freemud/service/thirdparty/CustomerExtendClient.java
View file @
36f0d3e8
...
...
@@ -15,6 +15,7 @@ package cn.freemud.service.thirdparty;
import
cn.freemud.entities.dto.GetMemberCouponListRequestDto
;
import
cn.freemud.entities.dto.GetMemberCouponListResponseDto
;
import
cn.freemud.entities.dto.user.SendCouponForqujiaDto
;
import
org.springframework.cloud.netflix.feign.FeignClient
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
...
...
@@ -28,4 +29,7 @@ public interface CustomerExtendClient {
*/
@PostMapping
(
value
=
"/customerextendservice/coupon/getCoupons"
)
GetMemberCouponListResponseDto
getMemberCouponListRequestDto
(
@RequestBody
GetMemberCouponListRequestDto
getMemberCouponListRequestDto
);
@PostMapping
(
value
=
"/customerextendservice/qujia/b2breceiveCard"
)
GetMemberCouponListResponseDto
sendCouponForqujia
(
@RequestBody
SendCouponForqujiaDto
request
);
}
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