Skip to content

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

购物车服务升级券码sdk

parent 625e17f2
Showing with 1016 additions and 517 deletions
assortment-shoppingcart-sdk/pom.xml
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<dependency> <dependency>
<groupId>com.freemud.application.service.sdk</groupId> <groupId>com.freemud.application.service.sdk</groupId>
<artifactId>couponcenter-sdk</artifactId> <artifactId>couponcenter-sdk</artifactId>
<version>1.9.2.RELEASE</version> <version>4.0.0-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<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; ...@@ -4,29 +4,24 @@ import ch.qos.logback.classic.Level;
import cn.freemud.base.entity.BaseResponse; import cn.freemud.base.entity.BaseResponse;
import cn.freemud.redis.RedisCache; import cn.freemud.redis.RedisCache;
import com.alibaba.fastjson.JSONObject; 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.ApiLog;
import com.freemud.application.sdk.api.log.ErrorLog; 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.CartResponseConstant;
import com.freemud.sdk.api.assortment.shoppingcart.constant.RedisKeyConstant; 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.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.exception.ServiceException;
import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService; import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService;
import com.freemud.sdk.api.assortment.shoppingcart.util.CartResponseUtil; import com.freemud.sdk.api.assortment.shoppingcart.util.CartResponseUtil;
import org.springframework.beans.factory.annotation.Autowired; 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.BoundHashOperations;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.util.*; import java.util.*;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.function.Function; import java.util.function.Function;
...@@ -47,10 +42,10 @@ import java.util.stream.Collectors; ...@@ -47,10 +42,10 @@ import java.util.stream.Collectors;
@Service("collageCartBaseService") @Service("collageCartBaseService")
public class CollageCartBaseServiceImpl implements ShoppingCartBaseService { public class CollageCartBaseServiceImpl implements ShoppingCartBaseService {
@Value("${coupon.app.id}") // @Value("${coupon.app.id}")
private String appId; // private String appId;
@Autowired // @Autowired
private FMActiveSdkService fmActiveSdkService; // private FMActiveSdkService fmActiveSdkService;
@Autowired @Autowired
private RedisCache redisCache; private RedisCache redisCache;
......
shopping-cart-application-service/pom.xml
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<dependency> <dependency>
<groupId>com.freemud.application.service.sdk</groupId> <groupId>com.freemud.application.service.sdk</groupId>
<artifactId>couponcenter-sdk</artifactId> <artifactId>couponcenter-sdk</artifactId>
<version>1.9.2.RELEASE</version> <version>4.0.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.freemud</groupId> <groupId>cn.freemud</groupId>
...@@ -53,11 +53,11 @@ ...@@ -53,11 +53,11 @@
<artifactId>ordercenter-sdk</artifactId> <artifactId>ordercenter-sdk</artifactId>
<version>1.9.6-SNAPSHOT</version> <version>1.9.6-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>com.freemud.application.service.sdk</groupId> <!-- <groupId>com.freemud.application.service.sdk</groupId>-->
<artifactId>promotioncenter-sdk</artifactId> <!-- <artifactId>promotioncenter-sdk</artifactId>-->
<version>2.0.RELEASE</version> <!-- <version>2.0.RELEASE</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<artifactId>assortment-data-manager</artifactId> <artifactId>assortment-data-manager</artifactId>
<groupId>com.freemud.sdk.api.assortment</groupId> <groupId>com.freemud.sdk.api.assortment</groupId>
...@@ -227,11 +227,11 @@ ...@@ -227,11 +227,11 @@
<artifactId>commons-amqp</artifactId> <artifactId>commons-amqp</artifactId>
</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>
......
shopping-cart-application-service/src/main/java/cn/freemud/adapter/CouponAdapter.java
...@@ -27,7 +27,7 @@ import cn.freemud.enums.ActivityShareType; ...@@ -27,7 +27,7 @@ import cn.freemud.enums.ActivityShareType;
import cn.freemud.enums.CouponStatus; import cn.freemud.enums.CouponStatus;
import cn.freemud.enums.CouponTypeEnum; import cn.freemud.enums.CouponTypeEnum;
import cn.freemud.utils.BeanUtil; 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.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
...@@ -271,30 +271,30 @@ public class CouponAdapter { ...@@ -271,30 +271,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();
......
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; ...@@ -24,8 +24,9 @@ import cn.freemud.service.thirdparty.CardBinClient;
import cn.freemud.service.thirdparty.CouponOnlineClient; import cn.freemud.service.thirdparty.CouponOnlineClient;
import cn.freemud.utils.RedisUtil; import cn.freemud.utils.RedisUtil;
import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateShopProductType; import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateShopProductType;
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.application.sdk.api.util.SignUtil;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import ma.glasnost.orika.MapperFacade; 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; ...@@ -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.GetProductStock;
import cn.freemud.demo.entities.bo.product.ProductStockBO; import cn.freemud.demo.entities.bo.product.ProductStockBO;
import cn.freemud.demo.entities.bo.promotion.ActivityBO; 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.coupon.CouponService;
import cn.freemud.demo.manager.product.ProductManager; import cn.freemud.demo.manager.product.ProductManager;
import cn.freemud.demo.manager.customer.CustomerManager; 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; ...@@ -2,8 +2,6 @@ package cn.freemud.entities.dto;
import cn.freemud.entities.dto.shoppingCart.SendPoint; import cn.freemud.entities.dto.shoppingCart.SendPoint;
import cn.freemud.entities.vo.SubtractStockVO; 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.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
......
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityResponseDto.java
package cn.freemud.entities.dto; package cn.freemud.entities.dto;
import com.freemud.application.sdk.api.promotioncenter.domain.ActivityBenefitVO;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
......
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/BatchQueryActivityInfoResponseDto.java
package cn.freemud.entities.dto; 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 lombok.Data;
import java.util.List; import java.util.List;
......
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/coupon/Active.java 0 → 100644
package cn.freemud.entities.dto.coupon;
import com.alibaba.fastjson.annotation.JSONField;
import java.math.BigDecimal;
import java.util.Date;
public class Active {
@JSONField(
name = "ActiveId"
)
private Integer ActiveId;
@JSONField(
name = "EBCode"
)
private String EBCode;
@JSONField(
name = "Type"
)
private Integer Type;
@JSONField(
name = "PartnerID"
)
private Integer PartnerID;
@JSONField(
name = "PlatformItemId"
)
private String PlatformItemId;
@JSONField(
name = "State"
)
private Integer State;
@JSONField(
name = "CreateUser"
)
private String CreateUser;
@JSONField(
name = "CreateDate"
)
private String CreateDate;
@JSONField(
name = "LastEditUser"
)
private String LastEditUser;
@JSONField(
name = "LastEditDate"
)
private String LastEditDate;
@JSONField(
name = "ActiveCode"
)
private String ActiveCode;
@JSONField(
name = "ActiveName"
)
private String ActiveName;
@JSONField(
name = "StartDate"
)
private String StartDate;
@JSONField(
name = "EndDate"
)
private String EndDate;
@JSONField(
name = "ShouldRedeemAll"
)
private Boolean ShouldRedeemAll;
@JSONField(
name = "PromotionType"
)
private String PromotionType;
@JSONField(
name = "Exclusive"
)
private Boolean Exclusive;
@JSONField(
name = "MinAmount"
)
private BigDecimal MinAmount;
@JSONField(
name = "MaxRedeemTimes"
)
private Integer MaxRedeemTimes;
@JSONField(
name = "MaxSendOut"
)
private Integer MaxSendOut;
@JSONField(
name = "Cost"
)
private BigDecimal Cost;
@JSONField(
name = "BusinessID"
)
private Integer BusinessID;
@JSONField(
name = "ActiveDesc"
)
private String ActiveDesc;
@JSONField(
name = "Percentage"
)
private Double percentage;
@JSONField(
name = "Inventory"
)
private Integer inventory;
@JSONField(
name = "PercentDiscount"
)
private BigDecimal PercentDiscount;
@JSONField(
name = "MaxDiscount"
)
private Integer MaxDiscount;
@JSONField(
name = "AppId"
)
private String AppId;
@JSONField(
name = "FromDayEffective"
)
private Integer FromDayEffective;
@JSONField(
name = "Effective"
)
private Integer Effective;
@JSONField(
name = "EffectiveStart"
)
private Date EffectiveStart;
@JSONField(
name = "EffectiveEnd"
)
private Date EffectiveEnd;
@JSONField(
name = "RedeemChannel"
)
private String RedeemChannel;
@JSONField(
name = "MerchantDiscountPrice"
)
private BigDecimal MerchantDiscountPrice;
@JSONField(
name = "PlatformDiscountPrice"
)
private BigDecimal PlatformDiscountPrice;
@JSONField(
name = "OtherDiscountPrice"
)
private BigDecimal OtherDiscountPrice;
public Active() {
}
public Integer getActiveId() {
return this.ActiveId;
}
public String getEBCode() {
return this.EBCode;
}
public Integer getType() {
return this.Type;
}
public Integer getPartnerID() {
return this.PartnerID;
}
public String getPlatformItemId() {
return this.PlatformItemId;
}
public Integer getState() {
return this.State;
}
public String getCreateUser() {
return this.CreateUser;
}
public String getCreateDate() {
return this.CreateDate;
}
public String getLastEditUser() {
return this.LastEditUser;
}
public String getLastEditDate() {
return this.LastEditDate;
}
public String getActiveCode() {
return this.ActiveCode;
}
public String getActiveName() {
return this.ActiveName;
}
public String getStartDate() {
return this.StartDate;
}
public String getEndDate() {
return this.EndDate;
}
public Boolean getShouldRedeemAll() {
return this.ShouldRedeemAll;
}
public String getPromotionType() {
return this.PromotionType;
}
public Boolean getExclusive() {
return this.Exclusive;
}
public BigDecimal getMinAmount() {
return this.MinAmount;
}
public Integer getMaxRedeemTimes() {
return this.MaxRedeemTimes;
}
public Integer getMaxSendOut() {
return this.MaxSendOut;
}
public BigDecimal getCost() {
return this.Cost;
}
public Integer getBusinessID() {
return this.BusinessID;
}
public String getActiveDesc() {
return this.ActiveDesc;
}
public Double getPercentage() {
return this.percentage;
}
public Integer getInventory() {
return this.inventory;
}
public BigDecimal getPercentDiscount() {
return this.PercentDiscount;
}
public Integer getMaxDiscount() {
return this.MaxDiscount;
}
public String getAppId() {
return this.AppId;
}
public Integer getFromDayEffective() {
return this.FromDayEffective;
}
public Integer getEffective() {
return this.Effective;
}
public Date getEffectiveStart() {
return this.EffectiveStart;
}
public Date getEffectiveEnd() {
return this.EffectiveEnd;
}
public String getRedeemChannel() {
return this.RedeemChannel;
}
public BigDecimal getMerchantDiscountPrice() {
return this.MerchantDiscountPrice;
}
public BigDecimal getPlatformDiscountPrice() {
return this.PlatformDiscountPrice;
}
public BigDecimal getOtherDiscountPrice() {
return this.OtherDiscountPrice;
}
public void setActiveId(Integer ActiveId) {
this.ActiveId = ActiveId;
}
public void setEBCode(String EBCode) {
this.EBCode = EBCode;
}
public void setType(Integer Type) {
this.Type = Type;
}
public void setPartnerID(Integer PartnerID) {
this.PartnerID = PartnerID;
}
public void setPlatformItemId(String PlatformItemId) {
this.PlatformItemId = PlatformItemId;
}
public void setState(Integer State) {
this.State = State;
}
public void setCreateUser(String CreateUser) {
this.CreateUser = CreateUser;
}
public void setCreateDate(String CreateDate) {
this.CreateDate = CreateDate;
}
public void setLastEditUser(String LastEditUser) {
this.LastEditUser = LastEditUser;
}
public void setLastEditDate(String LastEditDate) {
this.LastEditDate = LastEditDate;
}
public void setActiveCode(String ActiveCode) {
this.ActiveCode = ActiveCode;
}
public void setActiveName(String ActiveName) {
this.ActiveName = ActiveName;
}
public void setStartDate(String StartDate) {
this.StartDate = StartDate;
}
public void setEndDate(String EndDate) {
this.EndDate = EndDate;
}
public void setShouldRedeemAll(Boolean ShouldRedeemAll) {
this.ShouldRedeemAll = ShouldRedeemAll;
}
public void setPromotionType(String PromotionType) {
this.PromotionType = PromotionType;
}
public void setExclusive(Boolean Exclusive) {
this.Exclusive = Exclusive;
}
public void setMinAmount(BigDecimal MinAmount) {
this.MinAmount = MinAmount;
}
public void setMaxRedeemTimes(Integer MaxRedeemTimes) {
this.MaxRedeemTimes = MaxRedeemTimes;
}
public void setMaxSendOut(Integer MaxSendOut) {
this.MaxSendOut = MaxSendOut;
}
public void setCost(BigDecimal Cost) {
this.Cost = Cost;
}
public void setBusinessID(Integer BusinessID) {
this.BusinessID = BusinessID;
}
public void setActiveDesc(String ActiveDesc) {
this.ActiveDesc = ActiveDesc;
}
public void setPercentage(Double percentage) {
this.percentage = percentage;
}
public void setInventory(Integer inventory) {
this.inventory = inventory;
}
public void setPercentDiscount(BigDecimal PercentDiscount) {
this.PercentDiscount = PercentDiscount;
}
public void setMaxDiscount(Integer MaxDiscount) {
this.MaxDiscount = MaxDiscount;
}
public void setAppId(String AppId) {
this.AppId = AppId;
}
public void setFromDayEffective(Integer FromDayEffective) {
this.FromDayEffective = FromDayEffective;
}
public void setEffective(Integer Effective) {
this.Effective = Effective;
}
public void setEffectiveStart(Date EffectiveStart) {
this.EffectiveStart = EffectiveStart;
}
public void setEffectiveEnd(Date EffectiveEnd) {
this.EffectiveEnd = EffectiveEnd;
}
public void setRedeemChannel(String RedeemChannel) {
this.RedeemChannel = RedeemChannel;
}
public void setMerchantDiscountPrice(BigDecimal MerchantDiscountPrice) {
this.MerchantDiscountPrice = MerchantDiscountPrice;
}
public void setPlatformDiscountPrice(BigDecimal PlatformDiscountPrice) {
this.PlatformDiscountPrice = PlatformDiscountPrice;
}
public void setOtherDiscountPrice(BigDecimal OtherDiscountPrice) {
this.OtherDiscountPrice = OtherDiscountPrice;
}
public String toString() {
return "Active(ActiveId=" + this.getActiveId() + ", EBCode=" + this.getEBCode() + ", Type=" + this.getType() + ", PartnerID=" + this.getPartnerID() + ", PlatformItemId=" + this.getPlatformItemId() + ", State=" + this.getState() + ", CreateUser=" + this.getCreateUser() + ", CreateDate=" + this.getCreateDate() + ", LastEditUser=" + this.getLastEditUser() + ", LastEditDate=" + this.getLastEditDate() + ", ActiveCode=" + this.getActiveCode() + ", ActiveName=" + this.getActiveName() + ", StartDate=" + this.getStartDate() + ", EndDate=" + this.getEndDate() + ", ShouldRedeemAll=" + this.getShouldRedeemAll() + ", PromotionType=" + this.getPromotionType() + ", Exclusive=" + this.getExclusive() + ", MinAmount=" + this.getMinAmount() + ", MaxRedeemTimes=" + this.getMaxRedeemTimes() + ", MaxSendOut=" + this.getMaxSendOut() + ", Cost=" + this.getCost() + ", BusinessID=" + this.getBusinessID() + ", ActiveDesc=" + this.getActiveDesc() + ", percentage=" + this.getPercentage() + ", inventory=" + this.getInventory() + ", PercentDiscount=" + this.getPercentDiscount() + ", MaxDiscount=" + this.getMaxDiscount() + ", AppId=" + this.getAppId() + ", FromDayEffective=" + this.getFromDayEffective() + ", Effective=" + this.getEffective() + ", EffectiveStart=" + this.getEffectiveStart() + ", EffectiveEnd=" + this.getEffectiveEnd() + ", RedeemChannel=" + this.getRedeemChannel() + ", MerchantDiscountPrice=" + this.getMerchantDiscountPrice() + ", PlatformDiscountPrice=" + this.getPlatformDiscountPrice() + ", OtherDiscountPrice=" + this.getOtherDiscountPrice() + ")";
}
}
shopping-cart-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;
//
@Data //@Data
public class ReceiveMemberCouponRequestVo { //public class ReceiveMemberCouponRequestVo {
private String partnerId; // private String partnerId;
private String memberId; // private String memberId;
/** // /**
* 优惠券列表 // * 优惠券列表
*/ // */
private List<MemberAddCouponVo.Coupons> receiveMemberCouponListList; // private List<MemberAddCouponVo.Coupons> receiveMemberCouponListList;
@Data // @Data
public static class ReceiveMemberCouponList{ // public static class ReceiveMemberCouponList{
/** // /**
* 优惠券号 // * 优惠券号
*/ // */
private String couponCode; // private String couponCode;
/** // /**
* 券来源 // * 券来源
*/ // */
private String sourceFlag; // private String sourceFlag;
/** // /**
* 活动号 // * 活动号
*/ // */
private String activityCode; // private String activityCode;
/** // /**
* 优惠券名称 // * 优惠券名称
*/ // */
private String activityName; // private String activityName;
/** // /**
* 券使用说明 // * 券使用说明
*/ // */
private String remark; // private String remark;
} // }
} //}
shopping-cart-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.PRE); // return new UrlConfig(ConstantProfiles.PRE);
} // }
} //}
shopping-cart-application-service/src/main/java/cn/freemud/service/CouponService.java
...@@ -72,7 +72,7 @@ public interface CouponService { ...@@ -72,7 +72,7 @@ public interface CouponService {
* @param requestVo * @param requestVo
* @return * @return
*/ */
BaseResponse receiveMemberCoupon(ReceiveMemberCouponRequestVo requestVo); // BaseResponse receiveMemberCoupon(ReceiveMemberCouponRequestVo requestVo);
/** /**
* 调用会员接口列表 * 调用会员接口列表
...@@ -107,16 +107,16 @@ public interface CouponService { ...@@ -107,16 +107,16 @@ public interface CouponService {
GetProductsVo getSpqProductInfo(CheckSpqInfoRequestDto requestDto, String goodsId); GetProductsVo getSpqProductInfo(CheckSpqInfoRequestDto requestDto, String goodsId);
/** // /**
* 领券 // * 领券
* // *
* @param activityCodes // * @param activityCodes
* @param partnerId // * @param partnerId
* @param storeId // * @param storeId
* @param mobile // * @param mobile
* @param userId // * @param userId
*/ // */
List<CreateCouponBeanVo> createCoupon(List<ActivityDiscountDto> activityCodes, String partnerId, String storeId, String mobile, String userId); // List<CreateCouponBeanVo> createCoupon(List<ActivityDiscountDto> activityCodes, String partnerId, String storeId, String mobile, String userId);
GetCouponBarCodeResponseVo getCouponBarCode(String couponCode); GetCouponBarCodeResponseVo getCouponBarCode(String couponCode);
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java
...@@ -20,6 +20,7 @@ import cn.freemud.base.constant.Version; ...@@ -20,6 +20,7 @@ import cn.freemud.base.constant.Version;
import cn.freemud.base.entity.BaseResponse; import cn.freemud.base.entity.BaseResponse;
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.demo.manager.coupon.Finals;
import cn.freemud.entities.dto.*; import cn.freemud.entities.dto.*;
import cn.freemud.entities.dto.activity.ActivityQueryResponseDto; import cn.freemud.entities.dto.activity.ActivityQueryResponseDto;
import cn.freemud.entities.dto.coupon.CouponAvailableRespDto; import cn.freemud.entities.dto.coupon.CouponAvailableRespDto;
...@@ -46,20 +47,21 @@ import com.freemud.application.sdk.api.productcenter.request.product.valid.Valid ...@@ -46,20 +47,21 @@ import com.freemud.application.sdk.api.productcenter.request.product.valid.Valid
import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateShopProductType; import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateShopProductType;
import com.freemud.application.sdk.api.productcenter.response.ProductResponseDTO; import com.freemud.application.sdk.api.productcenter.response.ProductResponseDTO;
import com.freemud.application.sdk.api.productcenter.response.valid.ValiadShopProductResponse; import com.freemud.application.sdk.api.productcenter.response.valid.ValiadShopProductResponse;
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.service.GetCouponService; //import com.freemud.card.sdk.service.GetCouponService;
import com.freemud.card.sdk.service.MemberProductService; //import com.freemud.card.sdk.service.MemberProductService;
import com.freemud.card.sdk.vo.comm.GetCodeRespVo; //import com.freemud.card.sdk.vo.comm.GetCodeRespVo;
import com.freemud.card.sdk.vo.comm.GetCouponVo; //import com.freemud.card.sdk.vo.comm.GetCouponVo;
//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.CreateCouponVo; //import com.freemud.card.sdk.vo.coupon.CreateCouponVo;
import com.freemud.card.sdk.vo.coupon.request.MemberAddCouponVo; //import com.freemud.card.sdk.vo.coupon.request.MemberAddCouponVo;
import com.freemud.card.sdk.vo.coupon.response.MemberBaseRespVo; //import com.freemud.card.sdk.vo.coupon.response.MemberBaseRespVo;
import com.freemud.sdk.api.assortment.shoppingcart.constant.CartResponseConstant; //import com.freemud.sdk.api.assortment.shoppingcart.constant.CartResponseConstant;
import com.freemud.application.sdk.api.util.SignUtil;
import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum; import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
...@@ -92,8 +94,8 @@ public class CouponServiceImpl implements CouponService { ...@@ -92,8 +94,8 @@ public class CouponServiceImpl implements CouponService {
private CustomerExtendClient customerExtendClient; private CustomerExtendClient customerExtendClient;
@Autowired @Autowired
private UserService userService; private UserService userService;
@Autowired // @Autowired
private MemberProductService memberProductService; // private MemberProductService memberProductService;
@Autowired @Autowired
private CouponAdapter couponAdapter; private CouponAdapter couponAdapter;
@Autowired @Autowired
...@@ -102,8 +104,8 @@ public class CouponServiceImpl implements CouponService { ...@@ -102,8 +104,8 @@ public class CouponServiceImpl implements CouponService {
private CouponOnlineClient couponOnlineClient; private CouponOnlineClient couponOnlineClient;
// @Autowired // @Autowired
// private CouponOnlineMCCafeClient couponOnlineMCCafeClient; // private CouponOnlineMCCafeClient couponOnlineMCCafeClient;
@Autowired // @Autowired
private CouponAvailableService couponAvailableService; // private CouponAvailableService couponAvailableService;
@Value("${coupon.app.id}") @Value("${coupon.app.id}")
private String appid; private String appid;
@Autowired @Autowired
...@@ -118,8 +120,8 @@ public class CouponServiceImpl implements CouponService { ...@@ -118,8 +120,8 @@ public class CouponServiceImpl implements CouponService {
private StoreItemAdapter storeItemAdapter; private StoreItemAdapter storeItemAdapter;
@Autowired @Autowired
private CouponServiceImpl couponService; private CouponServiceImpl couponService;
@Autowired // @Autowired
private GetCouponService getCouponService; // private GetCouponService getCouponService;
@Autowired @Autowired
private OpenPlatformClient openPlatformClient; private OpenPlatformClient openPlatformClient;
@Autowired @Autowired
...@@ -236,13 +238,13 @@ public class CouponServiceImpl implements CouponService { ...@@ -236,13 +238,13 @@ public class CouponServiceImpl implements CouponService {
return null; return null;
} }
@Override // @Override
public BaseResponse receiveMemberCoupon(ReceiveMemberCouponRequestVo requestVo) { // public BaseResponse receiveMemberCoupon(ReceiveMemberCouponRequestVo requestVo) {
MemberAddCouponVo memberAddCouponVo = couponAdapter.convert2MemberAddCouponVo(requestVo); // MemberAddCouponVo memberAddCouponVo = couponAdapter.convert2MemberAddCouponVo(requestVo);
MemberBaseRespVo memberBaseRespVo = memberProductService.receiveMemberCoupon(memberAddCouponVo); // MemberBaseRespVo memberBaseRespVo = memberProductService.receiveMemberCoupon(memberAddCouponVo);
LogUtil.info("memberProductService.receiveMemberCoupon***", memberAddCouponVo, memberBaseRespVo); // LogUtil.info("memberProductService.receiveMemberCoupon***", memberAddCouponVo, memberBaseRespVo);
return ResponseUtil.success(memberBaseRespVo); // return ResponseUtil.success(memberBaseRespVo);
} // }
@Override @Override
public GetCouponDetailResponseDto getMemberCoupon(GetMemberCouponRequestVo requestVo) { public GetCouponDetailResponseDto getMemberCoupon(GetMemberCouponRequestVo requestVo) {
...@@ -1081,126 +1083,126 @@ public class CouponServiceImpl implements CouponService { ...@@ -1081,126 +1083,126 @@ public class CouponServiceImpl implements CouponService {
private final static String FORMAT_YYYY_DD_23_59_59 = "yyyy-MM-dd 23:59:59"; private final static String FORMAT_YYYY_DD_23_59_59 = "yyyy-MM-dd 23:59:59";
/** // /**
* 领券 // * 领券
* 领券不需要关心应用和点餐方式 // * 领券不需要关心应用和点餐方式
* // *
* @param activityDiscountDtos // * @param activityDiscountDtos
* @param partnerId // * @param partnerId
* @param storeId // * @param storeId
* @param mobile // * @param mobile
* @param userId // * @param userId
*/ // */
@Override // @Override
public List<CreateCouponBeanVo> createCoupon(List<ActivityDiscountDto> activityDiscountDtos, String partnerId, String storeId, String mobile, String userId) { // public List<CreateCouponBeanVo> createCoupon(List<ActivityDiscountDto> activityDiscountDtos, String partnerId, String storeId, String mobile, String userId) {
Map<String, Integer> activityDiscountMap = activityDiscountDtos.stream().collect(Collectors.toMap(ActivityDiscountDto::getDiscountId, a -> a.getCount(), (k1, k2) -> k1)); // Map<String, Integer> activityDiscountMap = activityDiscountDtos.stream().collect(Collectors.toMap(ActivityDiscountDto::getDiscountId, a -> a.getCount(), (k1, k2) -> k1));
List<String> activityCodes = activityDiscountDtos.stream().map(ActivityDiscountDto::getDiscountId).collect(Collectors.toList()); // List<String> activityCodes = activityDiscountDtos.stream().map(ActivityDiscountDto::getDiscountId).collect(Collectors.toList());
ActivityQueryRequestDto activityQueryRequestDto = ActivityQueryRequestDto.builder() // ActivityQueryRequestDto activityQueryRequestDto = ActivityQueryRequestDto.builder()
.ver(Version.VERSION_1) // .ver(Version.VERSION_1)
.partnerCode(partnerId) // .partnerCode(partnerId)
.storeId(storeId) // .storeId(storeId)
.userId(userId) // .userId(userId)
.application(application) // .application(application)
.activityCodes(activityCodes) // .activityCodes(activityCodes)
.isShowBenefit(1) // .isShowBenefit(1)
.isShowCycles(0) // .isShowCycles(0)
.isShowGoods(1) // .isShowGoods(1)
.isShowSendGoods(0) // .isShowSendGoods(0)
.isShowStore(0) // .isShowStore(0)
.isShowTime(0) // .isShowTime(0)
.build(); // .build();
// 领券调用统一查询接口不需要关心 appid, 和 点餐方式 // // 领券调用统一查询接口不需要关心 appid, 和 点餐方式
ActivityQueryResponseDto activityQueryResponseDto = activityClient.query(activityQueryRequestDto); // ActivityQueryResponseDto activityQueryResponseDto = activityClient.query(activityQueryRequestDto);
LogUtil.debug("CouponServiceImpl_createCoupon", JSON.toJSONString(activityQueryRequestDto), JSON.toJSONString(activityQueryResponseDto)); // LogUtil.debug("CouponServiceImpl_createCoupon", JSON.toJSONString(activityQueryRequestDto), JSON.toJSONString(activityQueryResponseDto));
if (Objects.equals(activityQueryResponseDto.getStatusCode(), ResponseResult.SUCCESS.getCode()) // if (Objects.equals(activityQueryResponseDto.getStatusCode(), ResponseResult.SUCCESS.getCode())
&& CollectionUtils.isNotEmpty(activityQueryResponseDto.getResult())) { // && CollectionUtils.isNotEmpty(activityQueryResponseDto.getResult())) {
Long now = System.currentTimeMillis(); // Long now = System.currentTimeMillis();
// 构建券 // // 构建券
List<CreateCouponVo> coupons = buildCreateCoupons(activityDiscountMap, activityQueryResponseDto, now); // List<CreateCouponVo> coupons = buildCreateCoupons(activityDiscountMap, activityQueryResponseDto, now);
GetCouponVo getCouponVo = new GetCouponVo(); // GetCouponVo getCouponVo = new GetCouponVo();
// // //
getCouponVo.setPartner_id(Integer.valueOf(couponPartnerId)); // getCouponVo.setPartner_id(Integer.valueOf(couponPartnerId));
getCouponVo.setMerchant_id(Integer.valueOf(partnerId)); // getCouponVo.setMerchant_id(Integer.valueOf(partnerId));
if (StringUtils.isBlank(mobile)) { // if (StringUtils.isBlank(mobile)) {
mobile = "18900000000"; // mobile = "18900000000";
} // }
getCouponVo.setMobile(mobile); // getCouponVo.setMobile(mobile);
getCouponVo.setMemberId(userId); // getCouponVo.setMemberId(userId);
getCouponVo.setAppSecret(getAppSecret(couponPartnerId)); // getCouponVo.setAppSecret(getAppSecret(couponPartnerId));
getCouponVo.setCoupons(coupons); // getCouponVo.setCoupons(coupons);
log.info("CouponServiceImpl getCoupons start:{}", JSON.toJSONString(getCouponVo)); // log.info("CouponServiceImpl getCoupons start:{}", JSON.toJSONString(getCouponVo));
GetCodeRespVo getCodeRespVo = getCouponService.getCoupons(getCouponVo); // GetCodeRespVo getCodeRespVo = getCouponService.getCoupons(getCouponVo);
log.info("CouponServiceImpl getCoupons end:{}", JSON.toJSONString(getCodeRespVo)); // log.info("CouponServiceImpl getCoupons end:{}", JSON.toJSONString(getCodeRespVo));
Map<String, ActivityResponseDto> activityResponseDtoMap = activityQueryResponseDto.getResult().stream().collect( // Map<String, ActivityResponseDto> activityResponseDtoMap = activityQueryResponseDto.getResult().stream().collect(
Collectors.toMap(ActivityResponseDto::getActivityCode, a -> a, (k1, k2) -> k1)); // Collectors.toMap(ActivityResponseDto::getActivityCode, a -> a, (k1, k2) -> k1));
if (Objects.equals(String.valueOf(getCodeRespVo.getResult()), ResponseResult.SUCCESS.getCode()) && CollectionUtils.isNotEmpty(getCodeRespVo.getCodeList())) { // if (Objects.equals(String.valueOf(getCodeRespVo.getResult()), ResponseResult.SUCCESS.getCode()) && CollectionUtils.isNotEmpty(getCodeRespVo.getCodeList())) {
List<ActivityResponseDto> activityResponseDtos = Lists.newArrayList(); // List<ActivityResponseDto> activityResponseDtos = Lists.newArrayList();
getCodeRespVo.getCodeList().forEach(code -> { // getCodeRespVo.getCodeList().forEach(code -> {
if (activityResponseDtoMap.get(code.getActiveCode()) != null) { // if (activityResponseDtoMap.get(code.getActiveCode()) != null) {
ActivityResponseDto activityResponseDto = activityResponseDtoMap.get(code.getActiveCode()); // ActivityResponseDto activityResponseDto = activityResponseDtoMap.get(code.getActiveCode());
activityResponseDto.setActivityCode(code.getCode()); // activityResponseDto.setActivityCode(code.getCode());
activityResponseDto.setCode(code.getActiveCode()); // activityResponseDto.setCode(code.getActiveCode());
activityResponseDtos.add(activityResponseDto); // activityResponseDtos.add(activityResponseDto);
} // }
}); // });
List<CreateCouponBeanVo> createCouponBeanVos = convert2CreateCouponBeanVo(activityResponseDtos); // List<CreateCouponBeanVo> createCouponBeanVos = convert2CreateCouponBeanVo(activityResponseDtos);
return createCouponBeanVos; // return createCouponBeanVos;
} // }
} // }
return null; // return null;
} // }
//
private List<CreateCouponVo> buildCreateCoupons(Map<String, Integer> activityDiscountMap, ActivityQueryResponseDto activityQueryResponseDto, Long now) { // private List<CreateCouponVo> buildCreateCoupons(Map<String, Integer> activityDiscountMap, ActivityQueryResponseDto activityQueryResponseDto, Long now) {
List<CreateCouponVo> coupons = Lists.newArrayList(); // List<CreateCouponVo> coupons = Lists.newArrayList();
for (ActivityResponseDto activityResponseDto : activityQueryResponseDto.getResult()) { // for (ActivityResponseDto activityResponseDto : activityQueryResponseDto.getResult()) {
// 多张券送多次 // // 多张券送多次
int count = activityDiscountMap.get(activityResponseDto.getActivityCode()) != null ? activityDiscountMap.get(activityResponseDto.getActivityCode()) : 1; // int count = activityDiscountMap.get(activityResponseDto.getActivityCode()) != null ? activityDiscountMap.get(activityResponseDto.getActivityCode()) : 1;
// 不再可领取有效期范围内直接过 // // 不再可领取有效期范围内直接过
if (activityResponseDto.getStartTime() == null || activityResponseDto.getEndTime() == null) { // if (activityResponseDto.getStartTime() == null || activityResponseDto.getEndTime() == null) {
continue; // continue;
} // }
if (now < activityResponseDto.getStartTime() || now > activityResponseDto.getEndTime()) { // if (now < activityResponseDto.getStartTime() || now > activityResponseDto.getEndTime()) {
continue; // continue;
} // }
// 券活动状态不是已启用得过 // // 券活动状态不是已启用得过
if (!Objects.equals(activityResponseDto.getActivityStatus(), ActivityStatusEnum.START.getCode())) { // if (!Objects.equals(activityResponseDto.getActivityStatus(), ActivityStatusEnum.START.getCode())) {
continue; // continue;
} // }
CreateCouponVo createCouponVo = new CreateCouponVo(); // CreateCouponVo createCouponVo = new CreateCouponVo();
String uuid = UUID.randomUUID().toString().replaceAll("-", ""); // String uuid = UUID.randomUUID().toString().replaceAll("-", "");
createCouponVo.setOrder_id(uuid); // createCouponVo.setOrder_id(uuid);
createCouponVo.setNumber(count); // createCouponVo.setNumber(count);
createCouponVo.setTitle(activityResponseDto.getActivityName()); // createCouponVo.setTitle(activityResponseDto.getActivityName());
createCouponVo.setState(0); // createCouponVo.setState(0);
createCouponVo.setTimestamp(DateUtil.convert2Str(new Date(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS)); // createCouponVo.setTimestamp(DateUtil.convert2Str(new Date(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
createCouponVo.setActive_code(activityResponseDto.getActivityCode()); // createCouponVo.setActive_code(activityResponseDto.getActivityCode());
createCouponVo.setActive_name(activityResponseDto.getActivityName()); // createCouponVo.setActive_name(activityResponseDto.getActivityName());
createCouponVo.setPromotionActiveCode(activityResponseDto.getActivityCode()); // createCouponVo.setPromotionActiveCode(activityResponseDto.getActivityCode());
if (activityResponseDto.getValidityPeriodStart() != null && activityResponseDto.getValidityPeriodEnd() != null) { // if (activityResponseDto.getValidityPeriodStart() != null && activityResponseDto.getValidityPeriodEnd() != null) {
// 根据有效期来计算 // // 根据有效期来计算
createCouponVo.setValid_start(DateUtil.convert2Str(new Date(activityResponseDto.getValidityPeriodStart()), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS)); // createCouponVo.setValid_start(DateUtil.convert2Str(new Date(activityResponseDto.getValidityPeriodStart()), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
createCouponVo.setValid_ends(DateUtil.convert2Str(new Date(activityResponseDto.getValidityPeriodEnd()), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS)); // createCouponVo.setValid_ends(DateUtil.convert2Str(new Date(activityResponseDto.getValidityPeriodEnd()), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
} else { // } else {
// 根据固定时长来计算 天来计算 // // 根据固定时长来计算 天来计算
int delayTimes = activityResponseDto.getDelayTimes() != null ? activityResponseDto.getDelayTimes() : 0; // int delayTimes = activityResponseDto.getDelayTimes() != null ? activityResponseDto.getDelayTimes() : 0;
// 有效期为0 默认传1天，做兼容处理 // // 有效期为0 默认传1天，做兼容处理
int validityPeriod = activityResponseDto.getValidityPeriod() != null ? activityResponseDto.getValidityPeriod() : 1; // int validityPeriod = activityResponseDto.getValidityPeriod() != null ? activityResponseDto.getValidityPeriod() : 1;
createCouponVo.setValid_start(DateUtil.convert2Str(DateUtil.addDays(new Date(), delayTimes), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS)); // createCouponVo.setValid_start(DateUtil.convert2Str(DateUtil.addDays(new Date(), delayTimes), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
createCouponVo.setValid_ends(DateUtil.convert2Str(DateUtil.addDays(new Date(), (delayTimes + validityPeriod - 1)), FORMAT_YYYY_DD_23_59_59)); // createCouponVo.setValid_ends(DateUtil.convert2Str(DateUtil.addDays(new Date(), (delayTimes + validityPeriod - 1)), FORMAT_YYYY_DD_23_59_59));
} // }
createCouponVo.setSourceFlag(SOURCE_FLAG); // createCouponVo.setSourceFlag(SOURCE_FLAG);
createCouponVo.setRemark(activityResponseDto.getActivityName()); // createCouponVo.setRemark(activityResponseDto.getActivityName());
if (Objects.equals(activityResponseDto.getActivityType(), ActivityTypeEnum.TYPE_32.getCode())) { // if (Objects.equals(activityResponseDto.getActivityType(), ActivityTypeEnum.TYPE_32.getCode())) {
createCouponVo.setCouponType(CouponTypeEnum.TYPE_0.getCode() + ""); // createCouponVo.setCouponType(CouponTypeEnum.TYPE_0.getCode() + "");
} else if (Objects.equals(activityResponseDto.getActivityType(), ActivityTypeEnum.TYPE_3.getCode())) { // } else if (Objects.equals(activityResponseDto.getActivityType(), ActivityTypeEnum.TYPE_3.getCode())) {
createCouponVo.setCouponType(CouponTypeEnum.TYPE_1.getCode() + ""); // createCouponVo.setCouponType(CouponTypeEnum.TYPE_1.getCode() + "");
} else if (Objects.equals(activityResponseDto.getActivityType(), ActivityTypeEnum.TYPE_31.getCode())) { // } else if (Objects.equals(activityResponseDto.getActivityType(), ActivityTypeEnum.TYPE_31.getCode())) {
createCouponVo.setCouponType(CouponTypeEnum.TYPE_3.getCode() + ""); // createCouponVo.setCouponType(CouponTypeEnum.TYPE_3.getCode() + "");
} // }
coupons.add(createCouponVo); // coupons.add(createCouponVo);
} // }
return coupons; // return coupons;
} // }
private List<CreateCouponBeanVo> convert2CreateCouponBeanVo(List<ActivityResponseDto> coupons) { private List<CreateCouponBeanVo> convert2CreateCouponBeanVo(List<ActivityResponseDto> coupons) {
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/FullPromotionService.java
...@@ -10,7 +10,6 @@ import cn.freemud.enums.GiftTypeEnum; ...@@ -10,7 +10,6 @@ import cn.freemud.enums.GiftTypeEnum;
import cn.freemud.service.ActivityService; import cn.freemud.service.ActivityService;
import cn.freemud.service.IPromotionService; import cn.freemud.service.IPromotionService;
import cn.freemud.utils.WebUtil; import cn.freemud.utils.WebUtil;
import com.freemud.application.sdk.api.promotioncenter.service.PromotionSdkService;
import lombok.experimental.var; import lombok.experimental.var;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
...@@ -36,8 +35,8 @@ import java.util.stream.Collectors; ...@@ -36,8 +35,8 @@ import java.util.stream.Collectors;
@Slf4j @Slf4j
public class FullPromotionService implements IPromotionService { public class FullPromotionService implements IPromotionService {
@Autowired // @Autowired
private PromotionSdkService promotionSdkService; // private PromotionSdkService promotionSdkService;
@Autowired @Autowired
private ActivityService activityService; 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 ...@@ -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.response.SVCCardAmountResponse;
import com.freemud.application.sdk.api.paymentcenter.client.service.PaymentNewService; import com.freemud.application.sdk.api.paymentcenter.client.service.PaymentNewService;
import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO; 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.constant.CommonsConstant;
import com.freemud.sdk.api.assortment.shoppingcart.domain.CollageMemberState; import com.freemud.sdk.api.assortment.shoppingcart.domain.CollageMemberState;
import com.freemud.sdk.api.assortment.shoppingcart.domain.CollageOrderDto; import com.freemud.sdk.api.assortment.shoppingcart.domain.CollageOrderDto;
...@@ -41,6 +41,7 @@ import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest; ...@@ -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.CollageCartBaseServiceImpl;
import com.freemud.sdk.api.assortment.shoppingcart.service.impl.CollageOrderBaseServiceImpl; 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.service.impl.ShoppingCartBaseServiceImpl;
import com.freemud.sdk.api.assortment.shoppingcart.util.ErrorLog;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils; 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 ...@@ -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.MealCacheManager;
import com.freemud.api.assortment.datamanager.meal.dto.MealNumberDto; import com.freemud.api.assortment.datamanager.meal.dto.MealNumberDto;
import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare; 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.log.LogThreadLocal;
import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO; 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.CartResponseConstant;
import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant; import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
import com.freemud.sdk.api.assortment.shoppingcart.constant.MealClearOperationEnum; 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; ...@@ -17,7 +17,7 @@ import cn.freemud.service.ActivityService;
import cn.freemud.utils.WebUtil; import cn.freemud.utils.WebUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.freemud.application.sdk.api.log.LogThreadLocal; 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.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; 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; 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 lombok.Data;
import java.util.List; 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; 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 lombok.Data;
import java.util.List; 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; ...@@ -18,7 +18,6 @@ import cn.freemud.constant.ResponseCodeKeyConstant;
import cn.freemud.entities.dto.*; import cn.freemud.entities.dto.*;
import cn.freemud.entities.dto.activity.ActivityQueryResponseDto; import cn.freemud.entities.dto.activity.ActivityQueryResponseDto;
import com.freemud.application.sdk.api.base.BaseResponse; 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.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; 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; ...@@ -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.info("requestDto"+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.*; ...@@ -9,9 +9,9 @@ import cn.freemud.entities.vo.*;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.freemud.application.sdk.api.log.LogThreadLocal; import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.storecenter.request.vo.GetOrgTreeListRequest; import com.freemud.application.sdk.api.storecenter.request.vo.GetOrgTreeListRequest;
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.vo.coupon.request.MemberAddCouponVo; //import com.freemud.card.sdk.vo.coupon.request.MemberAddCouponVo;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
...@@ -102,31 +102,31 @@ public class CouponServiceTest { ...@@ -102,31 +102,31 @@ public class CouponServiceTest {
assertTrue(CollectionUtils.isNotEmpty(details)); assertTrue(CollectionUtils.isNotEmpty(details));
} }
@Test // @Test
public void receiveMemberCoupon() { // public void receiveMemberCoupon() {
//1617,1617，88600017957134272219 // //1617,1617，88600017957134272219
String partnerId = "1864"; // String partnerId = "1864";
String memberId = "115450529962092328"; // String memberId = "115450529962092328";
String code = "88600017957134272219"; // String code = "88600017957134272219";
ReceiveMemberCouponRequestVo requestVo=new ReceiveMemberCouponRequestVo(); // ReceiveMemberCouponRequestVo requestVo=new ReceiveMemberCouponRequestVo();
requestVo.setPartnerId(partnerId); // requestVo.setPartnerId(partnerId);
requestVo.setMemberId(memberId); // requestVo.setMemberId(memberId);
List<MemberAddCouponVo.Coupons> list= Lists.newArrayList(); // List<MemberAddCouponVo.Coupons> list= Lists.newArrayList();
MemberAddCouponVo.Coupons couponList=new MemberAddCouponVo.Coupons(); // MemberAddCouponVo.Coupons couponList=new MemberAddCouponVo.Coupons();
couponList.setCouponCode(code); // couponList.setCouponCode(code);
couponList.setEncodeCouponCode("123"); // couponList.setEncodeCouponCode("123");
couponList.setCouponChannel("63"); // couponList.setCouponChannel("63");
couponList.setActivityCode("C2412341233513255515"); // couponList.setActivityCode("C2412341233513255515");
couponList.setPromotionCode("C2412341233513255515"); // couponList.setPromotionCode("C2412341233513255515");
couponList.setCouponName("活动名称"); // couponList.setCouponName("活动名称");
couponList.setCouponType("1"); // couponList.setCouponType("1");
couponList.setStartTime("2019-02-26 12:12:12"); // couponList.setStartTime("2019-02-26 12:12:12");
couponList.setEndTime("2019-02-28 12:12:12"); // couponList.setEndTime("2019-02-28 12:12:12");
list.add(couponList); // list.add(couponList);
requestVo.setReceiveMemberCouponListList(list); // requestVo.setReceiveMemberCouponListList(list);
BaseResponse memberCoupon = couponService.receiveMemberCoupon(requestVo); // BaseResponse memberCoupon = couponService.receiveMemberCoupon(requestVo);
assertEquals(memberCoupon.getCode(), "100"); // assertEquals(memberCoupon.getCode(), "100");
} // }
@Test @Test
public void availableCoupon() { public void availableCoupon() {
...@@ -153,16 +153,16 @@ public class CouponServiceTest { ...@@ -153,16 +153,16 @@ public class CouponServiceTest {
assertTrue(StringUtils.isNotBlank(checkSpqInfoResponseDto.getSkuId())); assertTrue(StringUtils.isNotBlank(checkSpqInfoResponseDto.getSkuId()));
} }
@Test // @Test
public void createCoupon() { // public void createCoupon() {
List<ActivityDiscountDto> activityCodes = Lists.newArrayList(); // List<ActivityDiscountDto> activityCodes = Lists.newArrayList();
ActivityDiscountDto activityDiscountDto = new ActivityDiscountDto(); // ActivityDiscountDto activityDiscountDto = new ActivityDiscountDto();
activityDiscountDto.setCount(1); // activityDiscountDto.setCount(1);
activityDiscountDto.setDiscountId("V234234342"); // activityDiscountDto.setDiscountId("V234234342");
activityCodes.add(activityDiscountDto); // activityCodes.add(activityDiscountDto);
List<CreateCouponBeanVo> createCouponBeanVos = couponService.createCoupon(activityCodes, "1864", "1011", "13000000000", "1243124412"); // List<CreateCouponBeanVo> createCouponBeanVos = couponService.createCoupon(activityCodes, "1864", "1011", "13000000000", "1243124412");
assertTrue(CollectionUtils.isNotEmpty(createCouponBeanVos)); // assertTrue(CollectionUtils.isNotEmpty(createCouponBeanVos));
} // }
@Test @Test
public void couponOrderWay() { public void couponOrderWay() {
......
shopping-cart-application-service/src/test/java/cn.freemud/service/CouponTest.java
...@@ -14,20 +14,20 @@ import cn.freemud.utils.FileUtil; ...@@ -14,20 +14,20 @@ import cn.freemud.utils.FileUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference; import com.alibaba.fastjson.TypeReference;
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.*; //import com.freemud.card.sdk.service.*;
import com.freemud.card.sdk.util.DateUtil; //import com.freemud.card.sdk.util.DateUtil;
import com.freemud.card.sdk.vo.comm.GetCodeRespVo; //import com.freemud.card.sdk.vo.comm.GetCodeRespVo;
import com.freemud.card.sdk.vo.comm.GetCouponVo; //import com.freemud.card.sdk.vo.comm.GetCouponVo;
import com.freemud.card.sdk.vo.coupon.CouponVo; //import com.freemud.card.sdk.vo.coupon.CouponVo;
import com.freemud.card.sdk.vo.coupon.MemberCouponVo; //import com.freemud.card.sdk.vo.coupon.MemberCouponVo;
import com.freemud.card.sdk.vo.coupon.request.ActiveInsertRequest; //import com.freemud.card.sdk.vo.coupon.request.ActiveInsertRequest;
import com.freemud.card.sdk.vo.coupon.request.MemberCardVo; //import com.freemud.card.sdk.vo.coupon.request.MemberCardVo;
import com.freemud.card.sdk.vo.coupon.request.PromotionUserCouponReqVo; //import com.freemud.card.sdk.vo.coupon.request.PromotionUserCouponReqVo;
import com.freemud.card.sdk.vo.coupon.response.ActiveInsertRespVo; //import com.freemud.card.sdk.vo.coupon.response.ActiveInsertRespVo;
import com.freemud.card.sdk.vo.coupon.response.MemberCouponRespVo; //import com.freemud.card.sdk.vo.coupon.response.MemberCouponRespVo;
import com.freemud.card.sdk.vo.coupon.response.PromotionBaseRespVo; //import com.freemud.card.sdk.vo.coupon.response.PromotionBaseRespVo;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.slf4j.Logger; import org.slf4j.Logger;
...@@ -59,18 +59,18 @@ import java.util.Map; ...@@ -59,18 +59,18 @@ import java.util.Map;
public class CouponTest { public class CouponTest {
private static final Logger logger = LoggerFactory.getLogger(CouponTest.class); private static final Logger logger = LoggerFactory.getLogger(CouponTest.class);
@Autowired // @Autowired
private FMCouponService fmCouponService; // private FMCouponService fmCouponService;
@Autowired // @Autowired
private FMActiveService fmActiveService; // private FMActiveService fmActiveService;
@Autowired // @Autowired
private GetCouponService getCouponService; // private GetCouponService getCouponService;
@Autowired // @Autowired
private MemberProductService memberProductService; // private MemberProductService memberProductService;
@Autowired // @Autowired
private PromotionService promotionService; // private PromotionService promotionService;
@Autowired // @Autowired
private RedeemCouponService redeemCouponService; // private RedeemCouponService redeemCouponService;
@Autowired @Autowired
private CouponService couponService; private CouponService couponService;
@Autowired @Autowired
...@@ -80,81 +80,81 @@ public class CouponTest { ...@@ -80,81 +80,81 @@ public class CouponTest {
@Autowired @Autowired
private AdditionSharingService additionSharingService; private AdditionSharingService additionSharingService;
@Test // @Test
public void testGetCoupon() { // public void testGetCoupon() {
String fileName = "getCoupons"; // String fileName = "getCoupons";
GetCouponVo getCouponVo = FileUtil.getObjectFromFile(fileName, GetCouponVo.class); // GetCouponVo getCouponVo = FileUtil.getObjectFromFile(fileName, GetCouponVo.class);
GetCodeRespVo codeRespVo = getCouponService.getCoupons(getCouponVo); // GetCodeRespVo codeRespVo = getCouponService.getCoupons(getCouponVo);
logger.info(JSONObject.toJSONString(codeRespVo)); // logger.info(JSONObject.toJSONString(codeRespVo));
//
} // }
//
@Test // @Test
public void couponCreate() { // public void couponCreate() {
String partnerId = "1864"; // String partnerId = "1864";
MultiValueMap<String, String> couponOnlineMap = new LinkedMultiValueMap<>(); // MultiValueMap<String, String> couponOnlineMap = new LinkedMultiValueMap<>();
couponOnlineMap.add(Finals.PARTNER_ID, partnerId); // couponOnlineMap.add(Finals.PARTNER_ID, partnerId);
couponOnlineMap.add(Finals.MERCHANT_ID, partnerId); // couponOnlineMap.add(Finals.MERCHANT_ID, partnerId);
couponOnlineMap.add(Finals.ORDER_ID, "ISAASTest123456789"); // couponOnlineMap.add(Finals.ORDER_ID, "ISAASTest123456789");
couponOnlineMap.add(Finals.ACTIVECODE, "C201811151617006zhvy"); // couponOnlineMap.add(Finals.ACTIVECODE, "C201811151617006zhvy");
couponOnlineMap.add(Finals.VALID_ENDS, "2019-12-01 00:00:00"); // couponOnlineMap.add(Finals.VALID_ENDS, "2019-12-01 00:00:00");
couponOnlineMap.add(Finals.VALID_START, "2018-12-01 00:00:00"); // couponOnlineMap.add(Finals.VALID_START, "2018-12-01 00:00:00");
String mobile = "15651101234"; // String mobile = "15651101234";
couponOnlineMap.add(Finals.MOBILE, mobile); // couponOnlineMap.add(Finals.MOBILE, mobile);
//
couponOnlineMap.add(Finals.TITLE, "cyj可领5次券"); // couponOnlineMap.add(Finals.TITLE, "cyj可领5次券");
couponOnlineMap.add(Finals.TIMESTAMP, DateUtil.getCurrentDate(DateUtil.FORMAT_YYYY_MM_DD_HHMMSS)); // couponOnlineMap.add(Finals.TIMESTAMP, DateUtil.getCurrentDate(DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
couponOnlineMap.add(Finals.NUMBER, "1"); // couponOnlineMap.add(Finals.NUMBER, "1");
couponOnlineMap.add(Finals.ACTION, "code.create"); // couponOnlineMap.add(Finals.ACTION, "code.create");
//
String appSecret = "C0CB6FCDE7C745F4AEE81A152F77B728"; // String appSecret = "C0CB6FCDE7C745F4AEE81A152F77B728";
Map<String, String> signMap = couponOnlineMap.toSingleValueMap(); // Map<String, String> signMap = couponOnlineMap.toSingleValueMap();
String sign = SignUtil.createMD5Sign(signMap, appSecret); // String sign = SignUtil.createMD5Sign(signMap, appSecret);
couponOnlineMap.add(Finals.SIGN, sign); // couponOnlineMap.add(Finals.SIGN, sign);
//
// CouponCreateResponseVo code = fmCouponService.createCode(couponOnlineMap); //// CouponCreateResponseVo code = fmCouponService.createCode(couponOnlineMap);
// logger.info(JSONObject.toJSONString(code)); //// logger.info(JSONObject.toJSONString(code));
} // }
//
@Test // @Test
public void promotionSaveUserCoupon() { // public void promotionSaveUserCoupon() {
String partnerId = "1864"; // String partnerId = "1864";
String mobile = "15651101234"; // String mobile = "15651101234";
String activityCode = "MEHG2018121719200242839"; // String activityCode = "MEHG2018121719200242839";
String code = "88600017957001943687"; // String code = "88600017957001943687";
PromotionUserCouponReqVo promotionUserCouponReqVo = new PromotionUserCouponReqVo(); // PromotionUserCouponReqVo promotionUserCouponReqVo = new PromotionUserCouponReqVo();
promotionUserCouponReqVo.setVer(1); // promotionUserCouponReqVo.setVer(1);
promotionUserCouponReqVo.setPartnerCode(partnerId); // promotionUserCouponReqVo.setPartnerCode(partnerId);
promotionUserCouponReqVo.setUserId("115393308065249235"); // promotionUserCouponReqVo.setUserId("115393308065249235");
promotionUserCouponReqVo.setMobile(mobile); // promotionUserCouponReqVo.setMobile(mobile);
List<CouponVo> coupons = new ArrayList<>(); // List<CouponVo> coupons = new ArrayList<>();
CouponVo couponVo = new CouponVo(); // CouponVo couponVo = new CouponVo();
couponVo.setCouponCode(code); // couponVo.setCouponCode(code);
couponVo.setActivityCode(activityCode); // couponVo.setActivityCode(activityCode);
String startDate = "2018-12-01 00:00:00"; // String startDate = "2018-12-01 00:00:00";
String endDate = "2019-12-01 00:00:00"; // String endDate = "2019-12-01 00:00:00";
couponVo.setValidityPeriodStart(DateUtil.convert2Date(startDate, DateUtil.FORMAT_YYYY_MM_DD_HHMMSS)); // couponVo.setValidityPeriodStart(DateUtil.convert2Date(startDate, DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
couponVo.setValidityPeriodEnd(DateUtil.convert2Date(endDate, DateUtil.FORMAT_YYYY_MM_DD_HHMMSS)); // couponVo.setValidityPeriodEnd(DateUtil.convert2Date(endDate, DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
coupons.add(couponVo); // coupons.add(couponVo);
promotionUserCouponReqVo.setCoupons(coupons); // promotionUserCouponReqVo.setCoupons(coupons);
//
PromotionBaseRespVo promotionBaseRespVo = promotionService.saveUserCoupon(promotionUserCouponReqVo); // PromotionBaseRespVo promotionBaseRespVo = promotionService.saveUserCoupon(promotionUserCouponReqVo);
logger.info(JSONObject.toJSONString(promotionBaseRespVo)); // logger.info(JSONObject.toJSONString(promotionBaseRespVo));
} // }
//
@Test // @Test
public void getmembercoupon() { // public void getmembercoupon() {
//1617,1617，88600017957134272219 // //1617,1617，88600017957134272219
String partnerId = "1617"; // String partnerId = "1617";
String memberId = "1617"; // String memberId = "1617";
String code = "88600017957134272219"; // String code = "88600017957134272219";
MemberCardVo memberCardVo = new MemberCardVo(); // MemberCardVo memberCardVo = new MemberCardVo();
memberCardVo.setPartnerId(partnerId); // memberCardVo.setPartnerId(partnerId);
memberCardVo.setMemberId(memberId); // memberCardVo.setMemberId(memberId);
memberCardVo.setCouponCode(code); // memberCardVo.setCouponCode(code);
MemberCouponRespVo<MemberCouponVo> memberCoupon = memberProductService.getMemberCoupon(memberCardVo); // MemberCouponRespVo<MemberCouponVo> memberCoupon = memberProductService.getMemberCoupon(memberCardVo);
logger.info(JSONObject.toJSONString(memberCoupon)); // logger.info(JSONObject.toJSONString(memberCoupon));
} // }
@Test @Test
public void getMemberCoupon() { public void getMemberCoupon() {
...@@ -194,64 +194,64 @@ public class CouponTest { ...@@ -194,64 +194,64 @@ public class CouponTest {
logger.info(JSONObject.toJSONString(memberCoupon)); logger.info(JSONObject.toJSONString(memberCoupon));
} }
@Test // @Test
public void addCouponActive() { // public void addCouponActive() {
String req="{\n" + // String req="{\n" +
" \"Active\": {\n" + // " \"Active\": {\n" +
" \"EBCode\": \"0000000517\",\n" + // " \"EBCode\": \"0000000517\",\n" +
" \"Type\": 1,\n" + // " \"Type\": 1,\n" +
" \"PartnerID\": 1864,\n" + // " \"PartnerID\": 1864,\n" +
" \"PlatformItemId\": \"\",\n" + // " \"PlatformItemId\": \"\",\n" +
" \"State\": 1,\n" + // " \"State\": 1,\n" +
" \"ActiveCode\": \"TS201812181845001\",\n" + // " \"ActiveCode\": \"TS201812181845001\",\n" +
" \"ActiveName\": \"SDK代金券测试\",\n" + // " \"ActiveName\": \"SDK代金券测试\",\n" +
" \"ActiveDesc\": \"SDK代金券测试\",\n" + // " \"ActiveDesc\": \"SDK代金券测试\",\n" +
" \"CreateUser\": \"SDKadmin\",\n" + // " \"CreateUser\": \"SDKadmin\",\n" +
" \"CreateDate\": \"2018-12-18T19:05:23\",\n" + // " \"CreateDate\": \"2018-12-18T19:05:23\",\n" +
" \"LastEditUser\": \"SDKadmin\",\n" + // " \"LastEditUser\": \"SDKadmin\",\n" +
" \"LastEditDate\": \"2018-12-18T19:05:23\",\n" + // " \"LastEditDate\": \"2018-12-18T19:05:23\",\n" +
" \"StartDate\": \"2018-12-18T00:00:00\",\n" + // " \"StartDate\": \"2018-12-18T00:00:00\",\n" +
" \"EndDate\": \"2019-12-18T00:00:00\",\n" + // " \"EndDate\": \"2019-12-18T00:00:00\",\n" +
" \"ShouldRedeemAll\": 0,\n" + // " \"ShouldRedeemAll\": 0,\n" +
" \"PromotionType\": \"AAA\",\n" + // " \"PromotionType\": \"AAA\",\n" +
" \"Exclusive\": null,\n" + // " \"Exclusive\": null,\n" +
" \"MinAmount\": 1000,\n" + // " \"MinAmount\": 1000,\n" +
" \"MaxRedeemTimes\": 1000,\n" + // " \"MaxRedeemTimes\": 1000,\n" +
" \"MaxSendOut\": 100,\n" + // " \"MaxSendOut\": 100,\n" +
" \"Cost\": 3.0,\n" + // " \"Cost\": 3.0,\n" +
" \"BusinessID\": 1\n" + // " \"BusinessID\": 1\n" +
" },\n" + // " },\n" +
" \"ActiveProduct\": [\n" + // " \"ActiveProduct\": [\n" +
" {\n" + // " {\n" +
" \"ProductID_Partner\": \"1234567\",\n" + // " \"ProductID_Partner\": \"1234567\",\n" +
" \"Product\": \"SDK3元代金券\",\n" + // " \"Product\": \"SDK3元代金券\",\n" +
" \"Price_Original\": 3,\n" + // " \"Price_Original\": 3,\n" +
" \"Price_Discount\": 3,\n" + // " \"Price_Discount\": 3,\n" +
" \"Amount\": 1,\n" + // " \"Amount\": 1,\n" +
" \"Paid\": 3,\n" + // " \"Paid\": 3,\n" +
" \"Remain\": 0\n" + // " \"Remain\": 0\n" +
" }\n" + // " }\n" +
" ],\n" + // " ],\n" +
" \"ActiveRestrict\": [\n" + // " \"ActiveRestrict\": [\n" +
" {\n" + // " {\n" +
" \"City\": \"\",\n" + // " \"City\": \"\",\n" +
" \"StoreIDPartner\": \"10086\"\n" + // " \"StoreIDPartner\": \"10086\"\n" +
" }\n" + // " }\n" +
" ],\n" + // " ],\n" +
" \"ActiveProductSetting\": [\n" + // " \"ActiveProductSetting\": [\n" +
" {\n" + // " {\n" +
" \"ProductCode\": \"01000009\",\n" + // " \"ProductCode\": \"01000009\",\n" +
" \"CategoryCode\": \"\",\n" + // " \"CategoryCode\": \"\",\n" +
" \"Type\": 0\n" + // " \"Type\": 0\n" +
" }\n" + // " }\n" +
" ]\n" + // " ]\n" +
"}"; // "}";
String appSecret = "C0CB6FCDE7C745F4AEE81A152F77B728"; // String appSecret = "C0CB6FCDE7C745F4AEE81A152F77B728";
ActiveInsertRequest activeInsertRequest = JSONObject.parseObject(req, ActiveInsertRequest.class); // ActiveInsertRequest activeInsertRequest = JSONObject.parseObject(req, ActiveInsertRequest.class);
activeInsertRequest.setAppSecret(appSecret); // activeInsertRequest.setAppSecret(appSecret);
ActiveInsertRespVo activeInsertRespVo = fmActiveService.insertActive(activeInsertRequest); // ActiveInsertRespVo activeInsertRespVo = fmActiveService.insertActive(activeInsertRequest);
logger.info(JSONObject.toJSONString(activeInsertRespVo)); // logger.info(JSONObject.toJSONString(activeInsertRespVo));
} // }
......
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