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
7dc97176
Commit
7dc97176
authored
Nov 02, 2021
by
ping.wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
删除无用代码
parent
9673dc14
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
80 deletions
+5
-80
shopping-cart-application-service/src/main/java/cn/freemud/service/CouponService.java
+0
-72
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java
+0
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/CouponOnlineClient.java
+0
-3
shopping-cart-application-service/src/test/java/cn.freemud/service/CouponServiceTest.java
+5
-5
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/CouponService.java
View file @
7dc97176
...
@@ -20,21 +20,7 @@ import java.util.List;
...
@@ -20,21 +20,7 @@ import java.util.List;
import
java.util.Map
;
import
java.util.Map
;
public
interface
CouponService
{
public
interface
CouponService
{
/**
* 获取优惠券列表
*
* @param getMemberCouponListRequestVo
* @return
*/
// BaseResponse<GetMemberCouponListResponseVo> getCouponList(GetMemberCouponListRequestVo getMemberCouponListRequestVo);
/**
* 添加到微信卡包
*
* @param requestVo
* @return
*/
// AddWeiXinCardResponseVo addWeiXinCard(AddWeiXinCardRequestVo requestVo);
/**
/**
* 获取卡券详情
* 获取卡券详情
...
@@ -47,40 +33,6 @@ public interface CouponService {
...
@@ -47,40 +33,6 @@ public interface CouponService {
List
<
GetMemberCouponListResponseDto
.
Result
.
MemberCoupon
>
getValidMemberCouponList
(
GetMemberCouponListRequestDto
getMemberCouponListRequestDto
,
Integer
orderType
);
List
<
GetMemberCouponListResponseDto
.
Result
.
MemberCoupon
>
getValidMemberCouponList
(
GetMemberCouponListRequestDto
getMemberCouponListRequestDto
,
Integer
orderType
);
/**
/**
* 批次查询券详情
*
* @param partnerId
* @param storeId
* @param codes
* @return
*/
List
<
GetCouponDetailResponseDto
.
Details
>
getMemberCoupons
(
String
partnerId
,
String
storeId
,
List
<
String
>
codes
);
/**
* 获取麦咖啡卡券详情
*
* @param requestVo
* @return
*/
// GetCouponDetailResponseDto getMCCafeMemberCoupon(GetMemberCouponRequestVo requestVo);
/**
* 同步券到会员卡包(投放会员卡包)
*
* @param requestVo
* @return
*/
// BaseResponse receiveMemberCoupon(ReceiveMemberCouponRequestVo requestVo);
/**
* 调用会员接口列表
*
* @param cartGoods
* @return
*/
//ActivityClassifyCouponBean availableCoupon(List<CartGoods> cartGoods, String partnerId, String userId, String storeId, String couponCode, boolean hasGoodsCoupon, Integer orderType, int isNew,String appId,String MenuType, String unChooseCouponCode);
/**
* 调用会员接口列表
* 调用会员接口列表
*
*
* @param cartGoods
* @param cartGoods
...
@@ -93,18 +45,6 @@ public interface CouponService {
...
@@ -93,18 +45,6 @@ public interface CouponService {
*/
*/
String
getAppSecret
(
String
partnerId
);
String
getAppSecret
(
String
partnerId
);
/**
* 获取卡券服务麦咖啡商户密钥
*/
// String getMCCafeAppSecret(String partnerId);
/**
* 通过code校验券是否存在,返回商品券信息pid、price、code
*
* @param requestDto
* @return
*/
// CheckSpqInfoResponseDto checkSpqInfo(CheckSpqInfoRequestDto requestDto);
CheckSpqInfoResponseDto
checkSpqInfo
(
CheckSpqInfoRequestDto
requestDto
,
String
goodsId
);
CheckSpqInfoResponseDto
checkSpqInfo
(
CheckSpqInfoRequestDto
requestDto
,
String
goodsId
);
...
@@ -113,17 +53,6 @@ public interface CouponService {
...
@@ -113,17 +53,6 @@ public interface CouponService {
GetProductsVo
getSpqProductInfo
(
CheckSpqInfoRequestDto
requestDto
,
String
goodsId
);
GetProductsVo
getSpqProductInfo
(
CheckSpqInfoRequestDto
requestDto
,
String
goodsId
);
// /**
// * 领券
// *
// * @param activityCodes
// * @param partnerId
// * @param storeId
// * @param mobile
// * @param userId
// */
// List<CreateCouponBeanVo> createCoupon(List<ActivityDiscountDto> activityCodes, String partnerId, String storeId, String mobile, String userId);
GetCouponBarCodeResponseVo
getCouponBarCode
(
String
couponCode
);
GetCouponBarCodeResponseVo
getCouponBarCode
(
String
couponCode
);
...
@@ -136,5 +65,4 @@ public interface CouponService {
...
@@ -136,5 +65,4 @@ public interface CouponService {
*/
*/
Map
<
String
,
Boolean
>
couponOrderWay
(
String
partnerId
,
List
<
String
>
activityCodes
,
Integer
orderTye
);
Map
<
String
,
Boolean
>
couponOrderWay
(
String
partnerId
,
List
<
String
>
activityCodes
,
Integer
orderTye
);
void
checkValidCoupon
(
CouponPromotionVO
couponPromotionVO
,
List
<
String
>
couponList
,
Map
<
String
,
List
<
String
>>
spqIdToCartUuid
,
String
couponCode
,
List
<
CartGoods
>
cartGoodsList
);
}
}
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java
View file @
7dc97176
This diff is collapsed.
Click to expand it.
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/CouponOnlineClient.java
View file @
7dc97176
package
cn
.
freemud
.
service
.
thirdparty
;
package
cn
.
freemud
.
service
.
thirdparty
;
//import cn.freemud.constant.IgnoreFeignLogAnnotation;
import
cn.freemud.annotations.IgnoreFeignLogAnnotation
;
import
cn.freemud.annotations.IgnoreFeignLogAnnotation
;
import
cn.freemud.constant.ResponseCodeConstant
;
import
cn.freemud.constant.ResponseCodeConstant
;
import
cn.freemud.constant.ResponseCodeKeyConstant
;
import
cn.freemud.constant.ResponseCodeKeyConstant
;
...
@@ -10,12 +9,10 @@ import cn.freemud.interceptor.FormSupportConfig;
...
@@ -10,12 +9,10 @@ import cn.freemud.interceptor.FormSupportConfig;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.http.MediaType
;
import
org.springframework.http.MediaType
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
java.util.Map
;
import
java.util.Map
;
//@IgnoreFeignLogAnnotation
@FeignClient
(
name
=
"OPEN-STORE-ONLINE-COUPON-SERVICE"
,
url
=
"${saas.coupononlineclient.feign.url}"
,
configuration
=
FormSupportConfig
.
class
)
@FeignClient
(
name
=
"OPEN-STORE-ONLINE-COUPON-SERVICE"
,
url
=
"${saas.coupononlineclient.feign.url}"
,
configuration
=
FormSupportConfig
.
class
)
public
interface
CouponOnlineClient
{
public
interface
CouponOnlineClient
{
/**
/**
...
...
shopping-cart-application-service/src/test/java/cn.freemud/service/CouponServiceTest.java
View file @
7dc97176
...
@@ -94,11 +94,11 @@ public class CouponServiceTest {
...
@@ -94,11 +94,11 @@ public class CouponServiceTest {
assertEquals
(
getCouponDetailResponseDto
.
getStatusCode
().
toString
(),
"100"
);
assertEquals
(
getCouponDetailResponseDto
.
getStatusCode
().
toString
(),
"100"
);
}
}
@Test
//
@Test
public
void
getMemberCoupons
()
{
//
public void getMemberCoupons() {
List
<
GetCouponDetailResponseDto
.
Details
>
details
=
couponService
.
getMemberCoupons
(
"1864"
,
"1001"
,
Arrays
.
asList
(
"8812412"
,
"88141242"
));
//
List<GetCouponDetailResponseDto.Details> details = couponService.getMemberCoupons("1864", "1001",Arrays.asList("8812412","88141242"));
assertTrue
(
CollectionUtils
.
isNotEmpty
(
details
));
//
assertTrue(CollectionUtils.isNotEmpty(details));
}
//
}
// @Test
// @Test
// public void receiveMemberCoupon() {
// public void receiveMemberCoupon() {
...
...
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