Skip to content

O
order-group
Commit 77a52ee6 by ping.wu
Options

购物车服务升级券码sdk

parent 625e17f2
Showing with 260 additions and 214 deletions
assortment-shoppingcart-sdk/pom.xml
......@@ -46,7 +46,7 @@
<dependency>
<groupId>com.freemud.application.service.sdk</groupId>
<artifactId>couponcenter-sdk</artifactId>
<version>1.9.2.RELEASE</version>
<version>4.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
......
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/impl/CollageCartBaseServiceImpl.java
......@@ -4,29 +4,24 @@ import ch.qos.logback.classic.Level;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.redis.RedisCache;
import com.alibaba.fastjson.JSONObject;
import com.freemud.application.sdk.api.couponcenter.online.service.FMActiveSdkService;
import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.application.sdk.api.log.ErrorLog;
import com.freemud.sdk.api.assortment.shoppingcart.adapter.CollageOrderSdkAdapter;
import com.freemud.sdk.api.assortment.shoppingcart.constant.CartResponseConstant;
import com.freemud.sdk.api.assortment.shoppingcart.constant.RedisKeyConstant;
import com.freemud.sdk.api.assortment.shoppingcart.constant.ShoppingCartConstant;
import com.freemud.sdk.api.assortment.shoppingcart.constant.VersionUtils;
import com.freemud.sdk.api.assortment.shoppingcart.domain.*;
import com.freemud.sdk.api.assortment.shoppingcart.domain.CartAddItem;
import com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods;
import com.freemud.sdk.api.assortment.shoppingcart.domain.CartParamDto;
import com.freemud.sdk.api.assortment.shoppingcart.exception.ServiceException;
import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService;
import com.freemud.sdk.api.assortment.shoppingcart.util.CartResponseUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.BoundHashOperations;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import java.text.MessageFormat;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
......@@ -47,10 +42,10 @@ import java.util.stream.Collectors;
@Service("collageCartBaseService")
public class CollageCartBaseServiceImpl implements ShoppingCartBaseService {
@Value("${coupon.app.id}")
private String appId;
@Autowired
private FMActiveSdkService fmActiveSdkService;
// @Value("${coupon.app.id}")
// private String appId;
// @Autowired
// private FMActiveSdkService fmActiveSdkService;
@Autowired
private RedisCache redisCache;
......
shopping-cart-application-service/pom.xml
......@@ -40,7 +40,7 @@
<dependency>
<groupId>com.freemud.application.service.sdk</groupId>
<artifactId>couponcenter-sdk</artifactId>
<version>1.9.2.RELEASE</version>
<version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>cn.freemud</groupId>
......@@ -53,11 +53,11 @@
<artifactId>ordercenter-sdk</artifactId>
<version>1.9.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.freemud.application.service.sdk</groupId>
<artifactId>promotioncenter-sdk</artifactId>
<version>2.0.RELEASE</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.freemud.application.service.sdk</groupId>-->
<!-- <artifactId>promotioncenter-sdk</artifactId>-->
<!-- <version>2.0.RELEASE</version>-->
<!-- </dependency>-->
<dependency>
<artifactId>assortment-data-manager</artifactId>
<groupId>com.freemud.sdk.api.assortment</groupId>
......@@ -227,11 +227,11 @@
<artifactId>commons-amqp</artifactId>
</dependency>
<!-- 券码SDK -->
<dependency>
<groupId>com.freemud.card.sdk</groupId>
<artifactId>freemud-card-sdk</artifactId>
<version>2.4.18-RELEASE</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.freemud.card.sdk</groupId>-->
<!-- <artifactId>freemud-card-sdk</artifactId>-->
<!-- <version>2.4.18-RELEASE</version>-->
<!-- </dependency>-->
<dependency>
<groupId>io.github.openfeign.form</groupId>
......
shopping-cart-application-service/src/main/java/cn/freemud/adapter/CouponAdapter.java
......@@ -27,7 +27,7 @@ import cn.freemud.enums.ActivityShareType;
import cn.freemud.enums.CouponStatus;
import cn.freemud.enums.CouponTypeEnum;
import cn.freemud.utils.BeanUtil;
import com.freemud.card.sdk.vo.coupon.request.MemberAddCouponVo;
//import com.freemud.card.sdk.vo.coupon.request.MemberAddCouponVo;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import org.apache.commons.collections4.CollectionUtils;
......@@ -271,30 +271,30 @@ public class CouponAdapter {
return createActivityRecordDto;
}
public MemberAddCouponVo convert2MemberAddCouponVo(ReceiveMemberCouponRequestVo requestVo) {
MemberAddCouponVo memberCardVo = new MemberAddCouponVo();
memberCardVo.setMemberId(requestVo.getMemberId());
memberCardVo.setPartnerId(requestVo.getPartnerId());
List<MemberAddCouponVo.Coupons> receiveMemberCouponList = Lists.newArrayList();
List<MemberAddCouponVo.Coupons> receiveMemberCouponListList = requestVo.getReceiveMemberCouponListList();
if (CollectionUtils.isNotEmpty(receiveMemberCouponListList)) {
receiveMemberCouponListList.forEach(coupon -> {
MemberAddCouponVo.Coupons addCoupon = new MemberAddCouponVo.Coupons();
addCoupon.setCouponCode(coupon.getCouponCode());
addCoupon.setEncodeCouponCode(coupon.getEncodeCouponCode());
addCoupon.setCouponChannel(coupon.getCouponChannel());
addCoupon.setActivityCode(coupon.getActivityCode());
addCoupon.setPromotionCode(coupon.getPromotionCode());
addCoupon.setCouponName(coupon.getCouponName());
addCoupon.setCouponType(coupon.getCouponType());
addCoupon.setStartTime(coupon.getStartTime());
addCoupon.setEndTime(coupon.getEndTime());
receiveMemberCouponList.add(addCoupon);
});
}
memberCardVo.setCoupons(receiveMemberCouponList);
return memberCardVo;
}
// public MemberAddCouponVo convert2MemberAddCouponVo(ReceiveMemberCouponRequestVo requestVo) {
// MemberAddCouponVo memberCardVo = new MemberAddCouponVo();
// memberCardVo.setMemberId(requestVo.getMemberId());
// memberCardVo.setPartnerId(requestVo.getPartnerId());
// List<MemberAddCouponVo.Coupons> receiveMemberCouponList = Lists.newArrayList();
// List<MemberAddCouponVo.Coupons> receiveMemberCouponListList = requestVo.getReceiveMemberCouponListList();
// if (CollectionUtils.isNotEmpty(receiveMemberCouponListList)) {
// receiveMemberCouponListList.forEach(coupon -> {
// MemberAddCouponVo.Coupons addCoupon = new MemberAddCouponVo.Coupons();
// addCoupon.setCouponCode(coupon.getCouponCode());
// addCoupon.setEncodeCouponCode(coupon.getEncodeCouponCode());
// addCoupon.setCouponChannel(coupon.getCouponChannel());
// addCoupon.setActivityCode(coupon.getActivityCode());
// addCoupon.setPromotionCode(coupon.getPromotionCode());
// addCoupon.setCouponName(coupon.getCouponName());
// addCoupon.setCouponType(coupon.getCouponType());
// addCoupon.setStartTime(coupon.getStartTime());
// addCoupon.setEndTime(coupon.getEndTime());
// receiveMemberCouponList.add(addCoupon);
// });
// }
// memberCardVo.setCoupons(receiveMemberCouponList);
// return memberCardVo;
// }
public List<GetMemberCouponListResponseVo.MemberCoupon> convert2MemberCouponList(List<GetMemberCouponListResponseDto.Result.MemberCoupon> couponList, AddWeixinCardJudgeResponseDto responseDto, Map<String, String> couponBarCodeMap) {
List<GetMemberCouponListResponseVo.MemberCoupon> memberCouponList = Lists.newArrayList();
......
shopping-cart-application-service/src/main/java/cn/freemud/demo/manager/coupon/Finals.java 0 → 100644
package cn.freemud.demo.manager.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() {
}
}
shopping-cart-application-service/src/main/java/cn/freemud/demo/manager/coupon/KgdCouponServiceImpl.java
......@@ -24,8 +24,9 @@ import cn.freemud.service.thirdparty.CardBinClient;
import cn.freemud.service.thirdparty.CouponOnlineClient;
import cn.freemud.utils.RedisUtil;
import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateShopProductType;
import com.freemud.card.sdk.comm.Finals;
import com.freemud.card.sdk.comm.SignUtil;
//import com.freemud.card.sdk.comm.Finals;
//import com.freemud.card.sdk.comm.SignUtil;
import com.freemud.application.sdk.api.util.SignUtil;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
import ma.glasnost.orika.MapperFacade;
......
shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/AbstractAddGoodsService.java
......@@ -14,7 +14,7 @@ import cn.freemud.demo.entities.bo.member.CustomerInfo;
import cn.freemud.demo.entities.bo.product.GetProductStock;
import cn.freemud.demo.entities.bo.product.ProductStockBO;
import cn.freemud.demo.entities.bo.promotion.ActivityBO;
import cn.freemud.demo.manager.coupon.CouponManager;
//import cn.freemud.demo.manager.coupon.CouponManager;
import cn.freemud.demo.manager.coupon.CouponService;
import cn.freemud.demo.manager.product.ProductManager;
import cn.freemud.demo.manager.customer.CustomerManager;
......
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountResponseDto.java
......@@ -2,8 +2,6 @@ package cn.freemud.entities.dto;
import cn.freemud.entities.dto.shoppingCart.SendPoint;
import cn.freemud.entities.vo.SubtractStockVO;
import com.freemud.application.sdk.api.promotioncenter.dto.promotion.DiscountDTO;
import com.freemud.application.sdk.api.promotioncenter.dto.promotion.SendCouponsDTO;
import lombok.Data;
import lombok.NoArgsConstructor;
......
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityResponseDto.java
package cn.freemud.entities.dto;
import com.freemud.application.sdk.api.promotioncenter.domain.ActivityBenefitVO;
import lombok.Data;
import java.util.List;
......
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/BatchQueryActivityInfoResponseDto.java
package cn.freemud.entities.dto;
import com.freemud.card.sdk.vo.coupon.Active;
//import com.freemud.card.sdk.vo.coupon.Active;
import cn.freemud.entities.dto.coupon.Active;
import lombok.Data;
import java.util.List;
......
shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ReceiveMemberCouponRequestVo.java
package cn.freemud.entities.vo;
import com.freemud.card.sdk.vo.coupon.request.MemberAddCouponVo;
import lombok.Data;
import java.util.List;
@Data
public class ReceiveMemberCouponRequestVo {
private String partnerId;
private String memberId;
/**
* 优惠券列表
*/
private List<MemberAddCouponVo.Coupons> receiveMemberCouponListList;
@Data
public static class ReceiveMemberCouponList{
/**
* 优惠券号
*/
private String couponCode;
/**
* 券来源
*/
private String sourceFlag;
/**
* 活动号
*/
private String activityCode;
/**
* 优惠券名称
*/
private String activityName;
/**
* 券使用说明
*/
private String remark;
}
}
//package cn.freemud.entities.vo;
//
//import com.freemud.card.sdk.vo.coupon.request.MemberAddCouponVo;
//import lombok.Data;
//
//import java.util.List;
//
//@Data
//public class ReceiveMemberCouponRequestVo {
// private String partnerId;
// private String memberId;
// /**
// * 优惠券列表
// */
// private List<MemberAddCouponVo.Coupons> receiveMemberCouponListList;
// @Data
// public static class ReceiveMemberCouponList{
// /**
// * 优惠券号
// */
// private String couponCode;
// /**
// * 券来源
// */
// private String sourceFlag;
// /**
// * 活动号
// */
// private String activityCode;
// /**
// * 优惠券名称
// */
// private String activityName;
// /**
// * 券使用说明
// */
// private String remark;
// }
//}
shopping-cart-application-service/src/main/java/cn/freemud/interceptor/ConfigInitBean.java
package cn.freemud.interceptor;
import com.freemud.card.sdk.comm.ConstantProfiles;
import com.freemud.card.sdk.comm.IUrlConfig;
import com.freemud.card.sdk.comm.UrlConfig;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @version V1.0
* @Title: ${FILE_NAME}
* @Package com.freemud.mail.core
* @Description: ${TODO}(用一句话描述该文件做什么)
* @author: aiqi.gong
* @date: 2019/1/4 15:49
* @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
@Configuration
public class ConfigInitBean {
@Profile("pro")
@Bean
IUrlConfig proiUrlConfig() {
return new UrlConfig(ConstantProfiles.PRO);
}
@Profile("test")
@Bean
IUrlConfig devOrTestIUrlConfig() {
return new UrlConfig(ConstantProfiles.TEST);
}
@Profile("qa")
@Bean
IUrlConfig qaIUrlConfig() {
return new UrlConfig(ConstantProfiles.QA);
}
@Profile("default")
@Bean
IUrlConfig defaultIUrlConfig() {
return new UrlConfig(ConstantProfiles.TEST);
}
@Profile("dev")
@Bean
IUrlConfig devIUrlConfig() {
return new UrlConfig(ConstantProfiles.DEV);
}
@Profile("pre-release")
@Bean
IUrlConfig preIUrlConfig() {
return new UrlConfig(ConstantProfiles.PRE);
}
}
//package cn.freemud.interceptor;
//
//import com.freemud.card.sdk.comm.ConstantProfiles;
//import com.freemud.card.sdk.comm.IUrlConfig;
//import com.freemud.card.sdk.comm.UrlConfig;
//import org.springframework.context.annotation.Bean;
//import org.springframework.context.annotation.Configuration;
//import org.springframework.context.annotation.Profile;
//
///**
// * All rights Reserved, Designed By www.freemud.cn
// *
// * @version V1.0
// * @Title: ${FILE_NAME}
// * @Package com.freemud.mail.core
// * @Description: ${TODO}(用一句话描述该文件做什么)
// * @author: aiqi.gong
// * @date: 2019/1/4 15:49
// * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
// * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
// */
//@Configuration
//public class ConfigInitBean {
// @Profile("pro")
// @Bean
// IUrlConfig proiUrlConfig() {
// return new UrlConfig(ConstantProfiles.PRO);
// }
//
// @Profile("test")
// @Bean
// IUrlConfig devOrTestIUrlConfig() {
// return new UrlConfig(ConstantProfiles.TEST);
// }
//
// @Profile("qa")
// @Bean
// IUrlConfig qaIUrlConfig() {
// return new UrlConfig(ConstantProfiles.QA);
// }
//
// @Profile("default")
// @Bean
// IUrlConfig defaultIUrlConfig() {
// return new UrlConfig(ConstantProfiles.TEST);
// }
//
// @Profile("dev")
// @Bean
// IUrlConfig devIUrlConfig() {
// return new UrlConfig(ConstantProfiles.DEV);
// }
//
// @Profile("pre-release")
// @Bean
// IUrlConfig preIUrlConfig() {
// return new UrlConfig(ConstantProfiles.PRE);
// }
//}
shopping-cart-application-service/src/main/java/cn/freemud/service/CouponService.java
......@@ -72,7 +72,7 @@ public interface CouponService {
* @param requestVo
* @return
*/
BaseResponse receiveMemberCoupon(ReceiveMemberCouponRequestVo requestVo);
// BaseResponse receiveMemberCoupon(ReceiveMemberCouponRequestVo requestVo);
/**
* 调用会员接口列表
......@@ -107,16 +107,16 @@ public interface CouponService {
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);
// /**
// * 领券
// *
// * @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);
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/FullPromotionService.java
......@@ -10,7 +10,6 @@ import cn.freemud.enums.GiftTypeEnum;
import cn.freemud.service.ActivityService;
import cn.freemud.service.IPromotionService;
import cn.freemud.utils.WebUtil;
import com.freemud.application.sdk.api.promotioncenter.service.PromotionSdkService;
import lombok.experimental.var;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
......@@ -36,8 +35,8 @@ import java.util.stream.Collectors;
@Slf4j
public class FullPromotionService implements IPromotionService {
@Autowired
private PromotionSdkService promotionSdkService;
// @Autowired
// private PromotionSdkService promotionSdkService;
@Autowired
private ActivityService activityService;
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartCollageServiceImpl.java
......@@ -32,7 +32,7 @@ import com.freemud.application.sdk.api.paymentcenter.client.request.SVCCardAmoun
import com.freemud.application.sdk.api.paymentcenter.client.response.SVCCardAmountResponse;
import com.freemud.application.sdk.api.paymentcenter.client.service.PaymentNewService;
import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
import com.freemud.card.sdk.log.ErrorLog;
//import com.freemud.card.sdk.log.ErrorLog;
import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
import com.freemud.sdk.api.assortment.shoppingcart.domain.CollageMemberState;
import com.freemud.sdk.api.assortment.shoppingcart.domain.CollageOrderDto;
......@@ -41,6 +41,7 @@ import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest;
import com.freemud.sdk.api.assortment.shoppingcart.service.impl.CollageCartBaseServiceImpl;
import com.freemud.sdk.api.assortment.shoppingcart.service.impl.CollageOrderBaseServiceImpl;
import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
import com.freemud.sdk.api.assortment.shoppingcart.util.ErrorLog;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMealServiceImpl.java
......@@ -33,9 +33,10 @@ import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustome
import com.freemud.api.assortment.datamanager.meal.MealCacheManager;
import com.freemud.api.assortment.datamanager.meal.dto.MealNumberDto;
import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
import com.freemud.application.sdk.api.log.ErrorLog;
import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
import com.freemud.card.sdk.log.ErrorLog;
//import com.freemud.card.sdk.log.ErrorLog;
import com.freemud.sdk.api.assortment.shoppingcart.constant.CartResponseConstant;
import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
import com.freemud.sdk.api.assortment.shoppingcart.constant.MealClearOperationEnum;
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/FullSharingService.java
......@@ -17,7 +17,7 @@ import cn.freemud.service.ActivityService;
import cn.freemud.utils.WebUtil;
import com.alibaba.fastjson.JSONObject;
import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.card.sdk.log.ApiLog;
//import com.freemud.card.sdk.log.ApiLog;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/entity/CouponAvailableResp.java
package cn.freemud.service.impl.mcoffee.entity;
import com.freemud.card.sdk.vo.coupon.CouponStateVo;
//import com.freemud.card.sdk.vo.coupon.CouponStateVo;
import lombok.Data;
import java.util.List;
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/entity/CouponState.java
package cn.freemud.service.impl.mcoffee.entity;
import com.freemud.card.sdk.vo.coupon.Product;
//import com.freemud.card.sdk.vo.coupon.Product;
import lombok.Data;
import java.util.List;
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/entity/Product.java 0 → 100644
package cn.freemud.service.impl.mcoffee.entity;
import lombok.Data;
@Data
public class Product {
private String productId;
private Integer amount;
private Integer quantity;
private String brandCode;
private String categoryCode;
}
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityClient.java
......@@ -18,7 +18,6 @@ import cn.freemud.constant.ResponseCodeKeyConstant;
import cn.freemud.entities.dto.*;
import cn.freemud.entities.dto.activity.ActivityQueryResponseDto;
import com.freemud.application.sdk.api.base.BaseResponse;
import com.freemud.application.sdk.api.promotioncenter.response.CalculationDiscountResponseDTO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
......
shopping-cart-application-service/src/test/java/cn.freemud/client/CouoponOnlineTest.java
......@@ -7,7 +7,8 @@ import cn.freemud.service.thirdparty.CardBinClient;
import cn.freemud.service.thirdparty.CouponOnlineClient;
import cn.freemud.utils.LogUtil;
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 lombok.extern.slf4j.Slf4j;
import org.junit.Test;
......@@ -45,7 +46,7 @@ public class CouoponOnlineTest {
requestDto.put("partner_id","1864");
requestDto.put("merchant_id","1864");
requestDto.put("action","code.allDetails");
String sign=SignUtil.createMD5Sign(requestDto,appSecret);
String sign= SignUtil.createMD5Sign(requestDto,appSecret);
requestDto.put("sign",sign);
Object responseDto2 = couponOnlineClient.getCouponDetails(requestDto);
log.info("requestDto"+requestDto);
......
shopping-cart-application-service/src/test/java/cn.freemud/service/CouponServiceTest.java
......@@ -9,9 +9,9 @@ import cn.freemud.entities.vo.*;
import com.alibaba.fastjson.JSON;
import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.storecenter.request.vo.GetOrgTreeListRequest;
import com.freemud.card.sdk.comm.Finals;
import com.freemud.card.sdk.comm.SignUtil;
import com.freemud.card.sdk.vo.coupon.request.MemberAddCouponVo;
//import com.freemud.card.sdk.comm.Finals;
//import com.freemud.card.sdk.comm.SignUtil;
//import com.freemud.card.sdk.vo.coupon.request.MemberAddCouponVo;
import com.google.common.collect.Lists;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
......@@ -102,31 +102,31 @@ public class CouponServiceTest {
assertTrue(CollectionUtils.isNotEmpty(details));
}
@Test
public void receiveMemberCoupon() {
//1617,1617，88600017957134272219
String partnerId = "1864";
String memberId = "115450529962092328";
String code = "88600017957134272219";
ReceiveMemberCouponRequestVo requestVo=new ReceiveMemberCouponRequestVo();
requestVo.setPartnerId(partnerId);
requestVo.setMemberId(memberId);
List<MemberAddCouponVo.Coupons> list= Lists.newArrayList();
MemberAddCouponVo.Coupons couponList=new MemberAddCouponVo.Coupons();
couponList.setCouponCode(code);
couponList.setEncodeCouponCode("123");
couponList.setCouponChannel("63");
couponList.setActivityCode("C2412341233513255515");
couponList.setPromotionCode("C2412341233513255515");
couponList.setCouponName("活动名称");
couponList.setCouponType("1");
couponList.setStartTime("2019-02-26 12:12:12");
couponList.setEndTime("2019-02-28 12:12:12");
list.add(couponList);
requestVo.setReceiveMemberCouponListList(list);
BaseResponse memberCoupon = couponService.receiveMemberCoupon(requestVo);
assertEquals(memberCoupon.getCode(), "100");
}
// @Test
// public void receiveMemberCoupon() {
// //1617,1617，88600017957134272219
// String partnerId = "1864";
// String memberId = "115450529962092328";
// String code = "88600017957134272219";
// ReceiveMemberCouponRequestVo requestVo=new ReceiveMemberCouponRequestVo();
// requestVo.setPartnerId(partnerId);
// requestVo.setMemberId(memberId);
// List<MemberAddCouponVo.Coupons> list= Lists.newArrayList();
// MemberAddCouponVo.Coupons couponList=new MemberAddCouponVo.Coupons();
// couponList.setCouponCode(code);
// couponList.setEncodeCouponCode("123");
// couponList.setCouponChannel("63");
// couponList.setActivityCode("C2412341233513255515");
// couponList.setPromotionCode("C2412341233513255515");
// couponList.setCouponName("活动名称");
// couponList.setCouponType("1");
// couponList.setStartTime("2019-02-26 12:12:12");
// couponList.setEndTime("2019-02-28 12:12:12");
// list.add(couponList);
// requestVo.setReceiveMemberCouponListList(list);
// BaseResponse memberCoupon = couponService.receiveMemberCoupon(requestVo);
// assertEquals(memberCoupon.getCode(), "100");
// }
@Test
public void availableCoupon() {
......@@ -153,16 +153,16 @@ public class CouponServiceTest {
assertTrue(StringUtils.isNotBlank(checkSpqInfoResponseDto.getSkuId()));
}
@Test
public void createCoupon() {
List<ActivityDiscountDto> activityCodes = Lists.newArrayList();
ActivityDiscountDto activityDiscountDto = new ActivityDiscountDto();
activityDiscountDto.setCount(1);
activityDiscountDto.setDiscountId("V234234342");
activityCodes.add(activityDiscountDto);
List<CreateCouponBeanVo> createCouponBeanVos = couponService.createCoupon(activityCodes, "1864", "1011", "13000000000", "1243124412");
assertTrue(CollectionUtils.isNotEmpty(createCouponBeanVos));
}
// @Test
// public void createCoupon() {
// List<ActivityDiscountDto> activityCodes = Lists.newArrayList();
// ActivityDiscountDto activityDiscountDto = new ActivityDiscountDto();
// activityDiscountDto.setCount(1);
// activityDiscountDto.setDiscountId("V234234342");
// activityCodes.add(activityDiscountDto);
// List<CreateCouponBeanVo> createCouponBeanVos = couponService.createCoupon(activityCodes, "1864", "1011", "13000000000", "1243124412");
// assertTrue(CollectionUtils.isNotEmpty(createCouponBeanVos));
// }
@Test
public void couponOrderWay() {
......
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