Commit 86373e8b by 徐康

下单和发券

parent d8845837
......@@ -3165,13 +3165,14 @@ public class OrderSdkAdapter {
if (StringUtils.isNotBlank(product.getSplitIndex())){
extInfo.setSplitIndex(product.getSplitIndex());
}
extInfo.setIsMonthCard(product.getIsMonthCard());
extInfo.setIsB3S1Coupon(product.getIsB3S1Coupon());
extInfo.setStapleFood(product.getStapleFood());
extInfo.setOriginalGoodsUid(product.getOriginalGoodsUid());
extInfo.setCartGoodsUid(product.getCartGoodsUid());
// todo 订单行扩展字段商品组
extInfo.setProductGroupList(product.getProductGroupList());
extInfo.setIsSendGoods(product.getIsSendGoods());
// 是否需要积分,农工商发送积分需要判断商品是否是送积分的商品
// 发积分的操作移到消费者,所以这个值需要保存下来
if(product.getNeedBonus() != null){
......
......@@ -251,4 +251,12 @@ public class CreateOrderProductRequest extends BaseConfig {
* 是否赠品
*/
private Boolean isSendGoods;
/**
* 是否是月享卡商品
*/
private int isMonthCard = 0;
/**
* 是否是买3赠1券商品
*/
private int isB3S1Coupon = 0;
}
......@@ -2653,6 +2653,8 @@ public class OrderAdapter {
});
createOrderProductDemoDto.setComboProduct(comboProducts);
} else if(ProductTypeEnum.VIRTUAL_PRODUCT.getCode().equals(cartGoodsDetailDto.getProductType())) {
createOrderProductDemoDto.setIsMonthCard(cartGoodsDetailDto.getIsMonthCard());
createOrderProductDemoDto.setIsB3S1Coupon(cartGoodsDetailDto.getIsB3S1Coupon());
if(cartGoodsDetailDto.getIsMonthCard() == 1) {
createOrderProductDemoDto.setCardId(cartGoodsDetailDto.getMonthCardInfo().getCardNo());
createOrderProductDemoDto.setCardCode(cartGoodsDetailDto.getMonthCardInfo().getCardCode());
......
......@@ -274,10 +274,6 @@ public class ShoppingCartGoodsDto {
*/
private int isMonthCard;
/**
* 是否为种子券商品 1:是;0:否
*/
private int isSeedCouponGoods;
/**
* 月享卡信息
*/
private MonthCardVo monthCardInfo;
......
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