Skip to content

O
order-group
Commit 5590bced by ping.wu
Options

Merge branches 'develop' and 'feature/20210407_券码灰度修改_wuping' of… 

Merge branches 'develop' and 'feature/20210407_券码灰度修改_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java
parents 69dd94e2 59dc98f1
Showing with 391 additions and 121 deletions
assortment-ordercenter-sdk/pom.xml
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<dependency> <dependency>
<artifactId>couponcenter-sdk</artifactId> <artifactId>couponcenter-sdk</artifactId>
<groupId>com.freemud.application.service.sdk</groupId> <groupId>com.freemud.application.service.sdk</groupId>
<version>4.0.0.RELEASE</version> <version>4.0.0-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<dependency> <dependency>
<artifactId>promotioncenter-sdk</artifactId> <artifactId>promotioncenter-sdk</artifactId>
<groupId>com.freemud.application.service.sdk</groupId> <groupId>com.freemud.application.service.sdk</groupId>
<version>2.7.RELEASE</version> <version>2.7.2.SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
......
order-application-service/pom.xml
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<dependency> <dependency>
<artifactId>couponcenter-sdk</artifactId> <artifactId>couponcenter-sdk</artifactId>
<groupId>com.freemud.application.service.sdk</groupId> <groupId>com.freemud.application.service.sdk</groupId>
<version>4.0.0.RELEASE</version> <version>4.0.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.freemud</groupId> <groupId>cn.freemud</groupId>
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<dependency> <dependency>
<artifactId>promotioncenter-sdk</artifactId> <artifactId>promotioncenter-sdk</artifactId>
<groupId>com.freemud.application.service.sdk</groupId> <groupId>com.freemud.application.service.sdk</groupId>
<version>2.7.RELEASE</version> <version>2.7.2.SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.freemud.sdk.api.assortment</groupId> <groupId>com.freemud.sdk.api.assortment</groupId>
...@@ -190,11 +190,11 @@ ...@@ -190,11 +190,11 @@
<artifactId>commons-collections4</artifactId> <artifactId>commons-collections4</artifactId>
<version>4.1</version> <version>4.1</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>com.freemud.application.service.sdk</groupId> <!-- <groupId>com.freemud.application.service.sdk</groupId>-->
<artifactId>open-store-open-platform-sdk</artifactId> <!-- <artifactId>open-store-open-platform-sdk</artifactId>-->
<version>1.3.5-SNAPSHOT</version> <!-- <version>1.3.5-SNAPSHOT</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId> <artifactId>springfox-swagger2</artifactId>
...@@ -262,11 +262,11 @@ ...@@ -262,11 +262,11 @@
<version>2.7.0</version> <version>2.7.0</version>
</dependency> </dependency>
<!-- 券码SDK --> <!-- 券码SDK -->
<dependency> <!-- <dependency>-->
<groupId>com.freemud.card.sdk</groupId> <!-- <groupId>com.freemud.card.sdk</groupId>-->
<artifactId>freemud-card-sdk</artifactId> <!-- <artifactId>freemud-card-sdk</artifactId>-->
<version>2.4.18-RELEASE</version> <!-- <version>2.4.18-RELEASE</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>io.github.openfeign.form</groupId> <groupId>io.github.openfeign.form</groupId>
......
order-application-service/src/main/java/cn/freemud/adapter/CouponAdapter.java
...@@ -34,7 +34,7 @@ import cn.freemud.utils.BeanUtil; ...@@ -34,7 +34,7 @@ import cn.freemud.utils.BeanUtil;
import cn.freemud.utils.LogUtil; import cn.freemud.utils.LogUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType; import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
import com.freemud.card.sdk.vo.coupon.request.MemberAddCouponVo; //import com.freemud.card.sdk.vo.coupon.request.MemberAddCouponVo;
import com.freemud.sdk.api.assortment.order.enums.OldOrderAccountType; import com.freemud.sdk.api.assortment.order.enums.OldOrderAccountType;
import com.freemud.sdk.api.assortment.order.enums.QueryOrderAccountType; import com.freemud.sdk.api.assortment.order.enums.QueryOrderAccountType;
import com.freemud.sdk.api.assortment.order.request.order.CreateOrderAccountRequest; import com.freemud.sdk.api.assortment.order.request.order.CreateOrderAccountRequest;
...@@ -325,30 +325,30 @@ public class CouponAdapter { ...@@ -325,30 +325,30 @@ public class CouponAdapter {
return createActivityRecordDto; return createActivityRecordDto;
} }
public MemberAddCouponVo convert2MemberAddCouponVo(ReceiveMemberCouponRequestVo requestVo) { // public MemberAddCouponVo convert2MemberAddCouponVo(ReceiveMemberCouponRequestVo requestVo) {
MemberAddCouponVo memberCardVo = new MemberAddCouponVo(); // MemberAddCouponVo memberCardVo = new MemberAddCouponVo();
memberCardVo.setMemberId(requestVo.getMemberId()); // memberCardVo.setMemberId(requestVo.getMemberId());
memberCardVo.setPartnerId(requestVo.getPartnerId()); // memberCardVo.setPartnerId(requestVo.getPartnerId());
List<MemberAddCouponVo.Coupons> receiveMemberCouponList = Lists.newArrayList(); // List<MemberAddCouponVo.Coupons> receiveMemberCouponList = Lists.newArrayList();
List<MemberAddCouponVo.Coupons> receiveMemberCouponListList = requestVo.getReceiveMemberCouponListList(); // List<MemberAddCouponVo.Coupons> receiveMemberCouponListList = requestVo.getReceiveMemberCouponListList();
if (CollectionUtils.isNotEmpty(receiveMemberCouponListList)) { // if (CollectionUtils.isNotEmpty(receiveMemberCouponListList)) {
receiveMemberCouponListList.forEach(coupon -> { // receiveMemberCouponListList.forEach(coupon -> {
MemberAddCouponVo.Coupons addCoupon = new MemberAddCouponVo.Coupons(); // MemberAddCouponVo.Coupons addCoupon = new MemberAddCouponVo.Coupons();
addCoupon.setCouponCode(coupon.getCouponCode()); // addCoupon.setCouponCode(coupon.getCouponCode());
addCoupon.setEncodeCouponCode(coupon.getEncodeCouponCode()); // addCoupon.setEncodeCouponCode(coupon.getEncodeCouponCode());
addCoupon.setCouponChannel(coupon.getCouponChannel()); // addCoupon.setCouponChannel(coupon.getCouponChannel());
addCoupon.setActivityCode(coupon.getActivityCode()); // addCoupon.setActivityCode(coupon.getActivityCode());
addCoupon.setPromotionCode(coupon.getPromotionCode()); // addCoupon.setPromotionCode(coupon.getPromotionCode());
addCoupon.setCouponName(coupon.getCouponName()); // addCoupon.setCouponName(coupon.getCouponName());
addCoupon.setCouponType(coupon.getCouponType()); // addCoupon.setCouponType(coupon.getCouponType());
addCoupon.setStartTime(coupon.getStartTime()); // addCoupon.setStartTime(coupon.getStartTime());
addCoupon.setEndTime(coupon.getEndTime()); // addCoupon.setEndTime(coupon.getEndTime());
receiveMemberCouponList.add(addCoupon); // receiveMemberCouponList.add(addCoupon);
}); // });
} // }
memberCardVo.setCoupons(receiveMemberCouponList); // memberCardVo.setCoupons(receiveMemberCouponList);
return memberCardVo; // return memberCardVo;
} // }
public List<GetMemberCouponListResponseVo.MemberCoupon> convert2MemberCouponList(List<GetMemberCouponListResponseDto.Result.MemberCoupon> couponList, AddWeixinCardJudgeResponseDto responseDto, Map<String, String> couponBarCodeMap) { public List<GetMemberCouponListResponseVo.MemberCoupon> convert2MemberCouponList(List<GetMemberCouponListResponseDto.Result.MemberCoupon> couponList, AddWeixinCardJudgeResponseDto responseDto, Map<String, String> couponBarCodeMap) {
List<GetMemberCouponListResponseVo.MemberCoupon> memberCouponList = Lists.newArrayList(); List<GetMemberCouponListResponseVo.MemberCoupon> memberCouponList = Lists.newArrayList();
......
order-application-service/src/main/java/cn/freemud/entities/coupon/CouponAvailableReqVo.java 0 → 100644
package cn.freemud.entities.coupon;
import lombok.Data;
import java.util.List;
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @Title: cn.freemud.entities.vo CouponAvailableReqVo
* @Description: TDO 描述....
* @author: family
* @date: 2020/6/30
* @Copyright: www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
@Data
public class CouponAvailableReqVo {
//渠道id
private String providerId;
//商户号
private String merchantId;
//门店id（校验门店限制）
private String storeId;
//组织机构id列表（校验渠道限制）
private List<String> channelIdList;
//组织机构code列表（校验渠道限制）
private List<String> channelCodeList;
//券码列表
private List<String> couponCodes;
//金额
private Integer totalAmount;
private String appId;
private String redeemChannel;
//购物车商品列表
private List<Product> productList;
}
order-application-service/src/main/java/cn/freemud/entities/coupon/CouponAvailableRespDto.java 0 → 100644
package cn.freemud.entities.coupon;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @Title: cn.freemud.entities.dto CouponAvailableRespDto
* @Description: TDO 描述....
* @author: family
* @date: 2020/6/30
* @Copyright: www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
@Data
@NoArgsConstructor
public class CouponAvailableRespDto {
private List<CouponStateVo> couponStateList;
private String result;
}
order-application-service/src/main/java/cn/freemud/entities/coupon/CouponStateVo.java 0 → 100644
package cn.freemud.entities.coupon;
import lombok.Data;
import java.util.List;
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @Title: cn.freemud.entities.vo.coupon CouponStateVo
* @Description: TDO 描述....
* @author: family
* @date: 2020/6/30
* @Copyright: www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
@Data
public class CouponStateVo {
/**
* 券号
*/
private String couponCode;
private Integer type;
/**
* 状态
* 0 可用 1 不可用 2 限制可用
*/
private Integer state;
/**
* 不可用原因
*/
private String message;
/**
* 最小金额 分
*/
private Integer minAmount;
/**
* 数量
*/
private Integer amount;
/**
* 活动折扣价格 分
*/
private Integer priceDiscount;
/**
* 原价 分
*/
private Integer originalPrice;
/**
* 折扣百分比
*/
private Integer discount;
/**
* 限制类型
* 0 白名单 1 黑名单
*/
private String limitType;
/**
* 今日剩余可使用次数(频次券才包含)
*/
private Integer dailyAvailableTimes;
/**
* 总可使用次数(频次券才包含)
*/
private Integer availableTimes;
/**
* 可用商品
*/
private List<Product> productList;
}
order-application-service/src/main/java/cn/freemud/entities/coupon/Finals.java 0 → 100644
package cn.freemud.entities.coupon;
public class Finals {
public static final String PARTNER_ID = "partner_id";
public static final String ACTION = "action";
public static final String ORDER_ID = "order_id";
public static final String SIGN = "sign";
public static final String ACTIVECODE = "active_code";
public static final String MERCHANT_ID = "merchant_id";
public static final String VALID_START = "valid_start";
public static final String VALID_ENDS = "valid_ends";
public static final String VALID_DAYS = "valid_days";
public static final String MOBILE = "mobile";
public static final String SMS_TEMPLATE = "sms_template";
public static final String TITLE = "title";
public static final String TIMESTAMP = "timestamp";
public static final String NUMBER = "number";
public static final String PARAMS = "params";
public static final String FLAG = "flag";
public static final String CODES = "codes";
public static final String STOREID = "storeId";
public static final String STORECHECK = "storecheck";
public static final String SEND_REASON = "send_reason";
public static final String STORE_ID = "store_id";
public static final String CARD_ID = "card_id";
public static final String APP_ID = "app_id";
public static final String MEMBER_ID = "member_id";
public static final String CHANNEL_ID_LIST = "channelIds";
public static final String CHANNEL_CODE_LIST = "channelCodes";
public static final Integer PRODUCT_COUPON = 0;
public static final Integer CASH_COUPON = 1;
public static final Integer ELSE_COUPON = 2;
public Finals() {
}
}
order-application-service/src/main/java/cn/freemud/entities/coupon/Product.java 0 → 100644
package cn.freemud.entities.coupon;
import lombok.Data;
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @Title: cn.freemud.entities.vo.coupon Product
* @Description: TDO 描述....
* @author: family
* @date: 2020/6/30
* @Copyright: www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
@Data
public class Product {
/**
* 商品id
*/
private String productId;
/**
* 商品单价
*/
private Integer amount;
/**
* quantity
*/
private Integer quantity;
/**
* categoryCode
*/
private String categoryCode;
}
order-application-service/src/main/java/cn/freemud/entities/vo/ReceiveMemberCouponRequestVo.java
package cn.freemud.entities.vo; package cn.freemud.entities.vo;
import com.freemud.card.sdk.vo.coupon.request.MemberAddCouponVo; //import com.freemud.card.sdk.vo.coupon.request.MemberAddCouponVo;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
...@@ -12,7 +12,7 @@ public class ReceiveMemberCouponRequestVo { ...@@ -12,7 +12,7 @@ public class ReceiveMemberCouponRequestVo {
/** /**
* 优惠券列表 * 优惠券列表
*/ */
private List<MemberAddCouponVo.Coupons> receiveMemberCouponListList; private List<ReceiveMemberCouponList> receiveMemberCouponListList;
@Data @Data
public static class ReceiveMemberCouponList{ public static class ReceiveMemberCouponList{
/** /**
...@@ -35,5 +35,21 @@ public class ReceiveMemberCouponRequestVo { ...@@ -35,5 +35,21 @@ public class ReceiveMemberCouponRequestVo {
* 券使用说明 * 券使用说明
*/ */
private String remark; private String remark;
// private String couponCode;
private String encodeCouponCode;
private String couponChannel;
// private String activityCode;
private String promotionCode;
private Integer promotionType;
private String couponName;
private String couponType;
private String startTime;
private String endTime;
private String sourceCode;
private String sourceName;
private String cardId;
private Integer isSynWechat;
} }
} }
order-application-service/src/main/java/cn/freemud/interceptor/ConfigInitBean.java
package cn.freemud.interceptor; //package cn.freemud.interceptor;
//
import com.freemud.card.sdk.comm.ConstantProfiles; //import com.freemud.card.sdk.comm.ConstantProfiles;
import com.freemud.card.sdk.comm.IUrlConfig; //import com.freemud.card.sdk.comm.IUrlConfig;
import com.freemud.card.sdk.comm.UrlConfig; //import com.freemud.card.sdk.comm.UrlConfig;
import org.springframework.context.annotation.Bean; //import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; //import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile; //import org.springframework.context.annotation.Profile;
//
/** ///**
* All rights Reserved, Designed By www.freemud.cn // * All rights Reserved, Designed By www.freemud.cn
* // *
* @version V1.0 // * @version V1.0
* @Title: ${FILE_NAME} // * @Title: ${FILE_NAME}
* @Package com.freemud.mail.core // * @Package com.freemud.mail.core
* @Description: ${TODO}(用一句话描述该文件做什么) // * @Description: ${TODO}(用一句话描述该文件做什么)
* @author: aiqi.gong // * @author: aiqi.gong
* @date: 2019/1/4 15:49 // * @date: 2019/1/4 15:49
* @Copyright: 2018 www.freemud.cn Inc. All rights reserved. // * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目 // * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/ // */
@Configuration //@Configuration
public class ConfigInitBean { //public class ConfigInitBean {
@Profile("pro") // @Profile("pro")
@Bean // @Bean
IUrlConfig proiUrlConfig() { // IUrlConfig proiUrlConfig() {
return new UrlConfig(ConstantProfiles.PRO); // return new UrlConfig(ConstantProfiles.PRO);
} // }
//
@Profile("test") // @Profile("test")
@Bean // @Bean
IUrlConfig devOrTestIUrlConfig() { // IUrlConfig devOrTestIUrlConfig() {
return new UrlConfig(ConstantProfiles.TEST); // return new UrlConfig(ConstantProfiles.TEST);
} // }
//
@Profile("qa") // @Profile("qa")
@Bean // @Bean
IUrlConfig qaIUrlConfig() { // IUrlConfig qaIUrlConfig() {
return new UrlConfig(ConstantProfiles.QA); // return new UrlConfig(ConstantProfiles.QA);
} // }
//
@Profile("default") // @Profile("default")
@Bean // @Bean
IUrlConfig defaultIUrlConfig() { // IUrlConfig defaultIUrlConfig() {
return new UrlConfig(ConstantProfiles.TEST); // return new UrlConfig(ConstantProfiles.TEST);
} // }
//
@Profile("dev") // @Profile("dev")
@Bean // @Bean
IUrlConfig devIUrlConfig() { // IUrlConfig devIUrlConfig() {
return new UrlConfig(ConstantProfiles.DEV); // return new UrlConfig(ConstantProfiles.DEV);
} // }
//
@Profile("pre-release") // @Profile("pre-release")
@Bean // @Bean
IUrlConfig preIUrlConfig() { // IUrlConfig preIUrlConfig() {
return new UrlConfig(ConstantProfiles.PRO); // return new UrlConfig(ConstantProfiles.PRO);
} // }
} //}
order-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java
...@@ -16,6 +16,7 @@ package cn.freemud.service.impl; ...@@ -16,6 +16,7 @@ package cn.freemud.service.impl;
import cn.freemud.adapter.CouponAdapter; import cn.freemud.adapter.CouponAdapter;
import cn.freemud.base.util.DateUtil; import cn.freemud.base.util.DateUtil;
import cn.freemud.constant.ResponseCodeConstant; import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.entities.coupon.*;
import cn.freemud.entities.dto.*; import cn.freemud.entities.dto.*;
import cn.freemud.entities.dto.promotion.ShoppingCartGoodsResponse; import cn.freemud.entities.dto.promotion.ShoppingCartGoodsResponse;
import cn.freemud.entities.vo.*; import cn.freemud.entities.vo.*;
...@@ -23,6 +24,7 @@ import cn.freemud.enums.*; ...@@ -23,6 +24,7 @@ import cn.freemud.enums.*;
import cn.freemud.redis.RedisCache; import cn.freemud.redis.RedisCache;
import cn.freemud.service.CouponService; import cn.freemud.service.CouponService;
import cn.freemud.service.thirdparty.CardBinClient; import cn.freemud.service.thirdparty.CardBinClient;
import cn.freemud.service.thirdparty.CouponAdapterClient;
import cn.freemud.service.thirdparty.CouponOnlineClient; import cn.freemud.service.thirdparty.CouponOnlineClient;
import cn.freemud.service.thirdparty.CustomerExtendClient; import cn.freemud.service.thirdparty.CustomerExtendClient;
import cn.freemud.utils.BarcodeUtil; import cn.freemud.utils.BarcodeUtil;
...@@ -31,13 +33,14 @@ import cn.freemud.utils.PropertyConvertUtil; ...@@ -31,13 +33,14 @@ import cn.freemud.utils.PropertyConvertUtil;
import cn.freemud.utils.RedisUtil; import cn.freemud.utils.RedisUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.freemud.application.sdk.api.log.ApiLog; import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.card.sdk.comm.Finals; //import com.freemud.card.sdk.comm.Finals;
import com.freemud.card.sdk.comm.SignUtil; //import com.freemud.card.sdk.comm.SignUtil;
import com.freemud.card.sdk.service.CouponAvailableService; //import com.freemud.card.sdk.service.CouponAvailableService;
import com.freemud.card.sdk.vo.coupon.CouponStateVo; //import com.freemud.card.sdk.vo.coupon.CouponStateVo;
import com.freemud.card.sdk.vo.coupon.Product; //import com.freemud.card.sdk.vo.coupon.Product;
import com.freemud.card.sdk.vo.coupon.request.CouponAvailableReqVo; //import com.freemud.card.sdk.vo.coupon.request.CouponAvailableReqVo;
import com.freemud.card.sdk.vo.coupon.response.CouponAvailableRespVo; //import com.freemud.card.sdk.vo.coupon.response.CouponAvailableRespVo;
import com.freemud.application.sdk.api.util.SignUtil;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
...@@ -64,11 +67,16 @@ public class CouponServiceImpl implements CouponService { ...@@ -64,11 +67,16 @@ public class CouponServiceImpl implements CouponService {
private CardBinClient cardBinClient; private CardBinClient cardBinClient;
@Autowired @Autowired
private CustomerExtendClient customerExtendClient; private CustomerExtendClient customerExtendClient;
@Autowired // @Autowired
private CouponAvailableService couponAvailableService; // private CouponAvailableService couponAvailableService;
@Autowired @Autowired
private CouponAdapter couponAdapter; private CouponAdapter couponAdapter;
@Autowired
private CouponAdapterClient couponAdaptClient;
@Override @Override
public GetCouponDetailResponseDto getMemberCoupon(GetMemberCouponRequestVo requestVo) { public GetCouponDetailResponseDto getMemberCoupon(GetMemberCouponRequestVo requestVo) {
//TODO 券详情查券服务 //TODO 券详情查券服务
...@@ -248,13 +256,15 @@ public class CouponServiceImpl implements CouponService { ...@@ -248,13 +256,15 @@ public class CouponServiceImpl implements CouponService {
} }
private List<CouponStateVo> buildAvailiableCoupons(List<ShoppingCartGoodsResponse.CartGoodsDetailDto> cartGoods, String partnerId, String storeId, List<String> couponCodes) { private List<CouponStateVo> buildAvailiableCoupons(List<ShoppingCartGoodsResponse.CartGoodsDetailDto> cartGoods, String partnerId, String storeId, List<String> couponCodes) {
String appSecret = getAppSecret(partnerId); // String appSecret = getAppSecret(partnerId);
// 最大15一提交 // 最大15一提交
int maxNum = 15; int maxNum = 15;
int count = couponCodes.size() / maxNum; int count = couponCodes.size() / maxNum;
// 计算可用不可用券 // 计算可用不可用券
CouponAvailableReqVo couponAvailableReqVo = new CouponAvailableReqVo(); CouponAvailableReqVo couponAvailableReqVo = new CouponAvailableReqVo();
couponAvailableReqVo.setPartnerId(partnerId); // couponAvailableReqVo.setPartnerId(partnerId);
couponAvailableReqVo.setProviderId(partnerId);
couponAvailableReqVo.setMerchantId(partnerId);
couponAvailableReqVo.setStoreId(storeId); couponAvailableReqVo.setStoreId(storeId);
List<Product> productList = Lists.newArrayList(); List<Product> productList = Lists.newArrayList();
// 优惠券优先级最高，根据商品原价做计算 // 优惠券优先级最高，根据商品原价做计算
...@@ -273,7 +283,9 @@ public class CouponServiceImpl implements CouponService { ...@@ -273,7 +283,9 @@ public class CouponServiceImpl implements CouponService {
} }
// 书写逻辑 // 书写逻辑
couponAvailableReqVo.setCouponCodes(calCouponCodes); couponAvailableReqVo.setCouponCodes(calCouponCodes);
CouponAvailableRespVo couponsAvailable = couponAvailableService.getCouponsAvailable(couponAvailableReqVo, appSecret); // CouponAvailableRespVo couponsAvailable = couponAvailableService.getCouponsAvailable(couponAvailableReqVo, appSecret);
CouponAvailableRespDto couponsAvailable = couponAdaptClient.getCouponsAvailable(couponAvailableReqVo);
LogUtil.info("availableCoupon_couponAvailableService.getCouponsAvailable", JSON.toJSONString(couponAvailableReqVo), JSON.toJSONString(couponsAvailable)); LogUtil.info("availableCoupon_couponAvailableService.getCouponsAvailable", JSON.toJSONString(couponAvailableReqVo), JSON.toJSONString(couponsAvailable));
if (Objects.equals(String.valueOf(couponsAvailable.getResult()), ResponseResult.SUCCESS.getCode()) if (Objects.equals(String.valueOf(couponsAvailable.getResult()), ResponseResult.SUCCESS.getCode())
&& CollectionUtils.isNotEmpty(couponsAvailable.getCouponStateList())) { && CollectionUtils.isNotEmpty(couponsAvailable.getCouponStateList())) {
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
...@@ -82,9 +82,9 @@ import com.freemud.api.assortment.datamanager.meal.MealCacheManager; ...@@ -82,9 +82,9 @@ import com.freemud.api.assortment.datamanager.meal.MealCacheManager;
import com.freemud.application.sdk.api.constant.ResponseConstant; import com.freemud.application.sdk.api.constant.ResponseConstant;
import com.freemud.application.sdk.api.constant.ResponseResultEnum; import com.freemud.application.sdk.api.constant.ResponseResultEnum;
import com.freemud.application.sdk.api.couponcenter.offline.service.OfflineCouponSdkService; import com.freemud.application.sdk.api.couponcenter.offline.service.OfflineCouponSdkService;
import com.freemud.application.sdk.api.deliverycenter.response.DeliveryInfoDto; //import com.freemud.application.sdk.api.deliverycenter.response.DeliveryInfoDto;
import com.freemud.application.sdk.api.deliverycenter.response.DeliveryResponseDto; //import com.freemud.application.sdk.api.deliverycenter.response.DeliveryResponseDto;
import com.freemud.application.sdk.api.deliverycenter.service.DeliveryService; //import com.freemud.application.sdk.api.deliverycenter.service.DeliveryService;
import com.freemud.application.sdk.api.log.ApiLog; import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.application.sdk.api.log.ErrorLog; import com.freemud.application.sdk.api.log.ErrorLog;
import com.freemud.application.sdk.api.log.LogThreadLocal; import com.freemud.application.sdk.api.log.LogThreadLocal;
...@@ -250,8 +250,8 @@ public class OrderServiceImpl implements Orderservice { ...@@ -250,8 +250,8 @@ public class OrderServiceImpl implements Orderservice {
//门店SDK //门店SDK
@Autowired @Autowired
private StoreCenterService storeCenterService; private StoreCenterService storeCenterService;
@Autowired // @Autowired
private DeliveryService deliveryService; // private DeliveryService deliveryService;
@Autowired @Autowired
private MQService mqService; private MQService mqService;
@Autowired @Autowired
......
order-application-service/src/main/java/cn/freemud/service/thirdparty/CouponAdapterClient.java 0 → 100644
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @Title: OrderClient
* @Package cn.freemud.service.thirdparty
* @Description:
* @author: liming.guo
* @date: 2018/8/10 16:06
* @version V1.0
* @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
package cn.freemud.service.thirdparty;
import cn.freemud.entities.coupon.CouponAvailableReqVo;
import cn.freemud.entities.coupon.CouponAvailableRespDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@FeignClient(name = "OPEN-STORE-COUPON-ADAPTER-SERVICE", url = "${saas.couponadapterclient.feign.url}")
@RequestMapping(produces = {"application/json;charset=UTF-8"})
public interface CouponAdapterClient {
/**
* 获取可用券信息
*
* @param couponAvailableReqVo
* @return
*/
@PostMapping("/getCouponsAvailable")
CouponAvailableRespDto getCouponsAvailable(CouponAvailableReqVo couponAvailableReqVo);
}
order-application-service/src/test/java/cn.freemud/client/CouoponOnlineTest.java
...@@ -7,7 +7,8 @@ import cn.freemud.service.thirdparty.CardBinClient; ...@@ -7,7 +7,8 @@ import cn.freemud.service.thirdparty.CardBinClient;
import cn.freemud.service.thirdparty.CouponOnlineClient; import cn.freemud.service.thirdparty.CouponOnlineClient;
import cn.freemud.utils.LogUtil; import cn.freemud.utils.LogUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.freemud.card.sdk.comm.SignUtil; //import com.freemud.card.sdk.comm.SignUtil;
import com.freemud.application.sdk.api.util.SignUtil;
import com.google.gson.Gson; import com.google.gson.Gson;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.junit.Test; import org.junit.Test;
...@@ -45,7 +46,7 @@ public class CouoponOnlineTest { ...@@ -45,7 +46,7 @@ public class CouoponOnlineTest {
requestDto.put("partner_id","1864"); requestDto.put("partner_id","1864");
requestDto.put("merchant_id","1864"); requestDto.put("merchant_id","1864");
requestDto.put("action","code.allDetails"); requestDto.put("action","code.allDetails");
String sign=SignUtil.createMD5Sign(requestDto,appSecret); String sign= SignUtil.createMD5Sign(requestDto,appSecret);
requestDto.put("sign",sign); requestDto.put("sign",sign);
Object responseDto2 = couponOnlineClient.getCouponDetails(requestDto); Object responseDto2 = couponOnlineClient.getCouponDetails(requestDto);
log.debug("requestDto"+requestDto); log.debug("requestDto"+requestDto);
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java
...@@ -88,7 +88,6 @@ public class CouponServiceImpl implements CouponService { ...@@ -88,7 +88,6 @@ public class CouponServiceImpl implements CouponService {
private final Gson gson = new Gson(); private final Gson gson = new Gson();
//@Autowired //@Autowired
//private MemberProductClient memberProductClient; //private MemberProductClient memberProductClient;
@Autowired @Autowired
private CustomerExtendClient customerExtendClient; private CustomerExtendClient customerExtendClient;
...@@ -506,7 +505,6 @@ public class CouponServiceImpl implements CouponService { ...@@ -506,7 +505,6 @@ public class CouponServiceImpl implements CouponService {
couponAvailableReqVo.setCouponCodes(calCouponCodes); couponAvailableReqVo.setCouponCodes(calCouponCodes);
//CouponAvailableRespVo couponsAvailable = couponAvailableService.getCouponsAvailable(couponAvailableReqVo, appSecret); //CouponAvailableRespVo couponsAvailable = couponAvailableService.getCouponsAvailable(couponAvailableReqVo, appSecret);
CouponAvailableRespDto couponsAvailable = couponAdaptClient.getCouponsAvailable(couponAvailableReqVo); CouponAvailableRespDto couponsAvailable = couponAdaptClient.getCouponsAvailable(couponAvailableReqVo);
;
LogUtil.info("availableCoupon_couponAvailableService.getCouponsAvailable", JSON.toJSONString(couponAvailableReqVo), JSON.toJSONString(couponsAvailable)); LogUtil.info("availableCoupon_couponAvailableService.getCouponsAvailable", JSON.toJSONString(couponAvailableReqVo), JSON.toJSONString(couponsAvailable));
if (Objects.equals(String.valueOf(couponsAvailable.getResult()), ResponseResult.SUCCESS.getCode()) if (Objects.equals(String.valueOf(couponsAvailable.getResult()), ResponseResult.SUCCESS.getCode())
&& CollectionUtils.isNotEmpty(couponsAvailable.getCouponStateList())) { && CollectionUtils.isNotEmpty(couponsAvailable.getCouponStateList())) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment