Skip to content

O
order-group
Commit 617225cf by 周晓航
Options

Merge branch 'feature/zxh/订单新增商品spu数量字段-20220914'

parents 544274fe 81678ede
Showing with 56 additions and 32 deletions
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
......@@ -3230,7 +3230,7 @@ public class OrderSdkAdapter {
orderItemCreateReq.setPhotoUrl(productRequest.getPhotoUrl());
orderItemCreateReq.setPackPrice(productRequest.getPackPrice());
// 拼单加购人信息 add by miaohui 2020.10.12 end
orderItemCreateReq.setProductSpuQuantity(product.getProductSpuQuantity());
orderItemList.add(orderItemCreateReq);
if (product.getTotalDiscountAmount() != null && product.getTotalDiscountAmount() > 0L && !isMaterial) {
//优惠信息转换
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java
......@@ -281,4 +281,9 @@ public class CreateOrderProductRequest extends BaseConfig {
* 【订C，“POS编码”让凌顶那边去匹配商品】 https://www.tapd.cn/43862731/prong/stories/view/1143862731001039549
*/
private String linkedId;
/**
* 订单新增商品SPU数量字段 https://cf.freemudvip.com/pages/viewpage.action?pageId=209356052
*/
private Integer productSpuQuantity;
}
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
......@@ -13,10 +13,7 @@
package cn.freemud.adapter;
import cn.freemud.base.util.DateUtil;
import cn.freemud.constant.CommonsConstant;
import cn.freemud.constant.CustomerScoreConstant;
import cn.freemud.constant.RedisKeyConstant;
import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.constant.*;
import cn.freemud.entities.bo.CreateOrderBONew;
import cn.freemud.entities.dto.*;
import cn.freemud.entities.dto.order.CreateOrderOperateDto;
......@@ -25,6 +22,7 @@ import cn.freemud.entities.dto.order.UnifiedPayResponseDto;
import cn.freemud.entities.dto.pay.*;
import cn.freemud.entities.dto.promotion.OrderBeanRequest;
import cn.freemud.entities.dto.promotion.ShoppingCartGoodsResponse;
import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
import cn.freemud.entities.dto.shoppingCart.ActivityDiscountsDto;
import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
import cn.freemud.entities.ttpay.OrderInfo;
......@@ -32,11 +30,6 @@ import cn.freemud.entities.vo.*;
import cn.freemud.entities.vo.encircle.CreateReserveOrderVo;
import cn.freemud.entities.vo.encircle.PreviewOrderInfoVo;
import cn.freemud.entities.vo.order.CreateOrderUnionPayCardVo;
import cn.freemud.enums.ActivityTypeEnum;
import cn.freemud.enums.OrderChannelType;
import cn.freemud.enums.PayStatus;
import cn.freemud.enums.QueryOrderStatus;
import cn.freemud.enums.RefundStatus;
import cn.freemud.enums.ResponseResult;
import cn.freemud.enums.*;
import cn.freemud.interceptor.ServiceException;
......@@ -55,7 +48,6 @@ import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.ordercenter.adapter.OrderCenterSdkAdapter;
import com.freemud.application.sdk.api.ordercenter.entities.v1.*;
import com.freemud.application.sdk.api.ordercenter.enums.*;
import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderStatusV1;
import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderTypeV1;
import com.freemud.application.sdk.api.ordercenter.request.AfterOrderExtInfoDto;
......@@ -83,7 +75,6 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.gson.Gson;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.io.ByteOrderMark;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.FastDateFormat;
......@@ -100,8 +91,6 @@ import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static cn.freemud.constant.OrderRefundConstant.ALLOW_REFUND;
@Component
public class OrderAdapter {
......@@ -1859,7 +1848,7 @@ public class OrderAdapter {
break;
}
}
canRefund = ALLOW_REFUND.equals(orderRefund);
canRefund = Objects.equals(orderRefund, OrderRefundConstant.ALLOW_REFUND);
// 如果是订单完成状态的 支持退款， 这里还需要校验一下是否在退款时间范围内
if (OrderStatusV1.COMPLETE.getCode().equals(status.getCode()) && canRefund) {
long currentTime = System.currentTimeMillis();
......@@ -2044,6 +2033,7 @@ public class OrderAdapter {
public ProductVo convent2ProductVo(ProductBeanV1 productBean) {
ProductVo productVo = new ProductVo();
productVo.setProductSpuQuantity(productBean.getProductSpuQuantity());
productVo.setId(productBean.getId());
productVo.setPid(StringUtils.isBlank(productBean.getSpecification()) ? productBean.getProductId() : productBean.getSpecification());
String productName = StringUtils.isBlank(productBean.getSpecificationName()) ? productBean.getProductName() : productBean.getSpecificationName();
......@@ -2367,6 +2357,7 @@ public class OrderAdapter {
productBean1.setParentType(productBean.getProductType());
productBean1.setSonProducts(new ArrayList<>());
productBean1.setUnit(productBean.getUnit());
productBean1.setProductSpuQuantity(productBean.getProductSpuQuantity());
return productBean1;
}
......@@ -2392,6 +2383,7 @@ public class OrderAdapter {
public CreateOrderProductRequest convent2OrderProduct(ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto) {
CreateOrderProductRequest createOrderProductDemoDto = convent2OrderProductDemo(cartGoodsDetailDto);
createOrderProductDemoDto.setProductSpuQuantity(createOrderProductDemoDto.getNumber());
//套餐
if (cartGoodsDetailDto.getProductType() != null && (cartGoodsDetailDto.getProductType() == ProductType.SETMEALPRODUCT.getCode() || cartGoodsDetailDto.getProductType() == ProductType.SETMEALPRODUCT_UPPRICE.getCode())) {
List<CreateOrderProductRequest> comboProducts = new ArrayList<>();
......@@ -2400,7 +2392,9 @@ public class OrderAdapter {
product.setUserName(cartGoodsDetailDto.getUserName());
product.setOpenId(cartGoodsDetailDto.getOpenId());
product.setPhotoUrl(cartGoodsDetailDto.getPhotoUrl());
comboProducts.add(convent2OrderProductDemo(product));
CreateOrderProductRequest comboProduct = convent2OrderProductDemo(product);
comboProduct.setProductSpuQuantity(comboProduct.getNumber() / createOrderProductDemoDto.getNumber());
comboProducts.add(comboProduct);
});
createOrderProductDemoDto.setComboProduct(comboProducts);
}
......@@ -2412,7 +2406,9 @@ public class OrderAdapter {
product.setUserName(cartGoodsDetailDto.getUserName());
product.setOpenId(cartGoodsDetailDto.getOpenId());
product.setPhotoUrl(cartGoodsDetailDto.getPhotoUrl());
materialProducts.add(convent2OrderProductMaterial(product));
CreateOrderProductRequest materialProduct = convent2OrderProductMaterial(product);
materialProduct.setProductSpuQuantity(materialProduct.getNumber() / createOrderProductDemoDto.getNumber());
materialProducts.add(materialProduct);
});
createOrderProductDemoDto.setMaterialProduct(materialProducts);
}
......
order-application-service/src/main/java/cn/freemud/adapter/PointsMallOrderAdapter.java
......@@ -167,6 +167,7 @@ public class PointsMallOrderAdapter {
orderItemCreateReq.setExtInfo(JSONObject.toJSONString(orderProductAddInfoDto));
}
orderItemCreateReq.setProductQuantity(1);
orderItemCreateReq.setProductSpuQuantity(1);
return orderItemCreateReq;
}
......
order-application-service/src/main/java/cn/freemud/entities/dto/OrderPrintDto.java
......@@ -132,6 +132,11 @@ public class OrderPrintDto {
private List<ProductsBean> materialProducts;
// 商品单位
private String unit;
/**
* 订单新增商品SPU数量字段 https://cf.freemudvip.com/pages/viewpage.action?pageId=209356052
*/
private Integer productSpuQuantity;
}
}
order-application-service/src/main/java/cn/freemud/entities/vo/ProductVo.java
......@@ -14,7 +14,6 @@ package cn.freemud.entities.vo;
import cn.freemud.entities.dto.ProductGroupDto;
import com.freemud.application.sdk.api.ordercenter.entities.v1.ProductExtInfoV1;
import com.freemud.sdk.api.assortment.order.request.order.ProductBindingCouponType;
import lombok.Data;
import lombok.NoArgsConstructor;
......@@ -205,6 +204,12 @@ public class ProductVo {
private Long score;
/**
* 订单新增商品SPU数量字段 https://cf.freemudvip.com/pages/viewpage.action?pageId=209356052
*/
private Integer productSpuQuantity;
@Data
@NoArgsConstructor
public static class ProductLabel {
......
order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java
......@@ -157,7 +157,7 @@ public class MallOrderServiceImpl implements MallOrderService {
private MemberBlacklistHandler memberBlacklistHandler;
/**
* 创建订单
* 创建订单 微商城
*/
@Override
public BaseResponse createOrder(CreateOrderBONew createOrderBO) {
......
order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
......@@ -619,17 +619,6 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
return ResponseUtil.error(ResponseResult.STORE_ITEM_CHECK_VAILD_ERROR);
}
/*GetProductInfoRequest request = new GetProductInfoRequest();
request.setChannel(menuType);
request.setPartnerId(partnerId);
request.setProductInfoType(ProductInfoType.ALL.getCode());
request.setShopId(storeId);
request.setProductIds(productIds);
//获取商品（里面的活动）
com.freemud.application.sdk.api.base.BaseResponse<GetProductInfosResponse> productInfosByIds = menuService.getProductInfosByIds(request, trackingNo);
if (!ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(productInfosByIds.getCode()) || productInfosByIds.getData() == null || CollectionUtils.isEmpty(productInfosByIds.getData().getProducts())) {
return ResponseUtil.error(ResponseResultEnum.GET_PRODUCT_INFOS_ERROR.getCode(), ResponseResultEnum.GET_PRODUCT_INFOS_ERROR.getMessage());
}*/
//查询商品信息sdk改feign
GetProductInfoDto request = new GetProductInfoDto();
request.setPartnerId(partnerId);
......@@ -893,6 +882,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
orderItemCreateReq.setProductCode(productBean.getProductCode());
orderItemCreateReq.setThirdProductId(productBean.getCustomerCode());
orderItemCreateReq.setProductQuantity(1);
orderItemCreateReq.setProductSpuQuantity(1);
orderItemCreateReq.setOriginalProductType(productBean.getType());
OrderProductAddInfoDto orderProductAddInfoDto = new OrderProductAddInfoDto();
......
order-application-service/src/test/spock/cn/freemud/service/impl/OrderAdapterServiceImplTest.groovy
......@@ -5,6 +5,7 @@ import cn.freemud.entities.bo.CreateOrderBONew
import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto
import cn.freemud.entities.dto.store.StoreMixResponseDto
import cn.freemud.entities.vo.CreateOrderVo
import cn.freemud.handler.MemberBlacklistHandler
import cn.freemud.service.business.impl.OrderBusinessServiceImpl
import com.alibaba.fastjson.JSON
import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo
......@@ -30,11 +31,14 @@ class OrderAdapterServiceImplTest extends Specification {
def orderSdkAdapter = new OrderSdkAdapter()
def memberBlacklistHandler = Mock(MemberBlacklistHandler.class)
void setup() {
orderServiceImpl.orderAdapter = orderAdapter
orderServiceImpl.itemService = itemService
orderBusinessService.orderSdkAdapter = orderSdkAdapter
orderServiceImpl.orderBusinessService = orderBusinessService
orderServiceImpl.memberBlacklistHandler = memberBlacklistHandler
}
......@@ -42,7 +46,7 @@ class OrderAdapterServiceImplTest extends Specification {
given: "参数设置"
def createOrderBO = new CreateOrderBONew()
// 接口请求信息
String createVOStr = "{\"buyType\":0,\"channel\":\"1\",\"channelType\":\"saas\",\"couponCode\":\"88709227085491207040\",\"couponCodes\":[{\"couponCode\":\"88709227085491207040\",\"couponType\":7}],\"expectTime\":\"\",\"latitude\":\"31.293401421440972\",\"longitude\":\"121.30461995442708\",\"menuType\":\"saas\",\"mobile\":\"17327190802\",\"orderRemark\":\"测试单，请勿制作出餐，谢谢！\",\"orderType\":1,\"partnerId\":\"2581\",\"payChannelType\":1,\"reachStoreType\":5,\"sessionId\":\"cef46527f632a961af7a84209bdb8fcd0997c936\",\"sessionKey\":\"hZtQ1Usx/NhEUyoyduF+FQ==\",\"shopId\":\"229830\",\"storeAddress\":\"河南省驻马店市西平县经贸路步行街西段小广场华莱士\",\"storeName\":\"华莱士（西平步行街店）\",\"storeNameEn\":\"\",\"tableNumber\":\"\",\"takeMealFlag\":\"0\",\"takeMealTime\":\"\",\"thirdShopId\":\"EA23\",\"useCustomerScore\":2,\"userId\":\"3614319825989629832\",\"userName\":\"SWEET SUGA\",\"version\":\"2.0.60.6\"}";
String createVOStr = "{\"channelType\":\"saas\",\"channel\":1,\"partnerId\":\"2690\",\"appId\":\"wxa1f272347828dae8\",\"version\":\"3.0.16.2\",\"sessionId\":\"c45e150aa83a17d9c036efa6aafba52af199b6d6\",\"orderType\":1,\"menuType\":\"saas\",\"shopId\":\"QAJIALE001\",\"takeMealFlag\":0,\"takeMealTime\":\"\",\"expectTime\":\"\",\"couponCode\":\"\",\"couponCodes\":[],\"tableNumber\":\"\",\"latitude\":31.37482,\"longitude\":121.26621,\"orderRemark\":\"\",\"useCustomerScore\":2,\"buyMemberCard\":null,\"premiumExchangeActivity\":null,\"cardCode\":null,\"cardCodes\":null,\"payChannelType\":1,\"reachStoreType\":4}";
def createOrderVo = JSON.parseObject(createVOStr, CreateOrderVo.class)
createOrderBO.setCreateOrderVo(createOrderVo)
// 登录信息
......@@ -50,7 +54,7 @@ class OrderAdapterServiceImplTest extends Specification {
, AssortmentCustomerInfoVo.class)
createOrderBO.setUserLoginInfoDto(userLoginInfoDto)
// 购物车信息
def shoppingCartGoodsDto = JSON.parseObject("{\"activityDiscountsDtos\":[{\"activityCode\":\"88709227085491207040\",\"activityName\":\"鸡米花买一送一券\",\"activityType\":32,\"discountAmount\":-800,\"priority\":0}],\"isDiscountDelivery\":false,\"originalTotalAmount\":2400,\"products\":[{\"activityDiscountsDtos\":[{\"activityCode\":\"88709227085491207040\",\"activityName\":\"鸡米花买一送一券\",\"activityType\":32,\"actualActivityGoodsNumber\":1,\"cartGoodsUid\":\"09b125d6-603d-4783-ba01-287073d08e2b\",\"discountAmount\":800}],\"cartGoodsUid\":\"09b125d6-603d-4783-ba01-287073d08e2b\",\"couponCode\":\"88709227085491207040\",\"extraList\":[],\"hasProductCoupon\":false,\"isB3S1Coupon\":0,\"isB3S1CouponGoods\":0,\"isMonthCard\":0,\"isSendGoods\":false,\"isTableware\":0,\"linkedId\":\"\",\"materialList\":[],\"originalPrice\":800,\"originalProductType\":1,\"packPrice\":0,\"picture\":\"https://picture.sandload.cn/1619081297921.jpg\",\"qty\":2,\"salePrice\":800,\"skuId\":\"201889966261817090\",\"skuName\":\"鸡米花T\",\"spuId\":\"201889966261817090\",\"spuName\":\"鸡米花T\",\"stockLimit\":false,\"totalDiscountAmount\":-800,\"unit\":\"\",\"weight\":0.0},{\"activityDiscountsDtos\":[],\"cartGoodsUid\":\"02537906-b09d-4a76-b5b7-2a5842a31a6c\",\"categoryName\":\"缤纷小食\",\"classificationId\":\"0102\",\"classificationName\":\"正价单品\",\"customerCode\":\"hn80017\",\"extraList\":[],\"hasProductCoupon\":false,\"isB3S1Coupon\":0,\"isB3S1CouponGoods\":0,\"isMonthCard\":0,\"isSendGoods\":false,\"isTableware\":0,\"linkedId\":\"\",\"materialList\":[],\"originalPrice\":800,\"originalProductType\":1,\"packPrice\":0,\"picture\":\"https://picture.sandload.cn/1619080995048.jpg\",\"productCode\":\"hn80017\",\"qty\":1,\"salePrice\":800,\"skuForeignName\":\"\",\"skuId\":\"201889966070976307\",\"skuName\":\"薯条(大)T\",\"spuForeignName\":\"\",\"spuId\":\"201889966070976307\",\"spuName\":\"薯条(大)T\",\"stockLimit\":false,\"tax\":0.01,\"taxId\":\"\",\"totalDiscountAmount\":0,\"unit\":\"\",\"weight\":0.0}],\"reduceScore\":0,\"scoreReduceAmount\":0,\"shareDiscountActivityDtos\":[],\"totalAmount\":1600,\"totalDiscountAmount\":800,\"totalScore\":0}"
def shoppingCartGoodsDto = JSON.parseObject("{\"activityDiscountsDtos\":[],\"isDiscountDelivery\":false,\"originalTotalAmount\":910,\"packageAmount\":0,\"packageAmountCollectType\":1,\"products\":[{\"activityDiscountsDtos\":[],\"cartGoodsUid\":\"450a069d-cebb-4620-8365-5e6c633a1aa3\",\"categoryName\":\"套餐\",\"classificationId\":\"\",\"classificationName\":\"\",\"comboProducts\":[{\"customerCode\":\"gl\",\"extraList\":[],\"hasProductCoupon\":false,\"isB3S1Coupon\":0,\"isB3S1CouponGoods\":0,\"isFixedProduct\":true,\"isMonthCard\":0,\"isTableware\":0,\"linkedId\":\"\",\"materialList\":[],\"originalPrice\":40,\"originalProductType\":1,\"parentProductId\":\"251946878491615276\",\"picture\":\"https://picture.sandload.cn/1628587383665.jpg\",\"productType\":6,\"qty\":6,\"skuForeignName\":\"\",\"skuId\":\"215810517496862722\",\"skuName\":\"柚子的果篮\",\"specialExtra\":[],\"spuForeignName\":\"\",\"spuId\":\"215810517496862722\",\"spuName\":\"柚子的果篮\",\"stockLimit\":false,\"tax\":0.0,\"unit\":\"\",\"weight\":0.0},{\"customerCode\":\"lizhi\",\"extraList\":[],\"hasProductCoupon\":false,\"isB3S1Coupon\":0,\"isB3S1CouponGoods\":0,\"isFixedProduct\":true,\"isMonthCard\":0,\"isTableware\":0,\"linkedId\":\"\",\"materialList\":[],\"originalPrice\":10,\"originalProductType\":1,\"parentProductId\":\"251946878491615276\",\"picture\":\"https://picture.sandload.cn/1628586884766.jpg\",\"productType\":6,\"qty\":4,\"skuForeignName\":\"\",\"skuId\":\"215809970724247591\",\"skuName\":\"柚子的荔枝\",\"specialExtra\":[],\"spuForeignName\":\"\",\"spuId\":\"215809970724247591\",\"spuName\":\"柚子的荔枝\",\"stockLimit\":false,\"tax\":0.0,\"unit\":\"\",\"weight\":0.0},{\"customerCode\":\"li\",\"extraList\":[],\"hasProductCoupon\":false,\"isB3S1Coupon\":0,\"isB3S1CouponGoods\":0,\"isFixedProduct\":true,\"isMonthCard\":0,\"isTableware\":0,\"linkedId\":\"\",\"materialList\":[],\"originalPrice\":11,\"originalProductType\":1,\"parentProductId\":\"251946878491615276\",\"picture\":\"https://picture.sandload.cn/1628586848599.jpg\",\"productType\":6,\"qty\":2,\"skuForeignName\":\"\",\"skuId\":\"215809930343585821\",\"skuName\":\"柚子的梨\",\"specialExtra\":[],\"spuForeignName\":\"\",\"spuId\":\"215809930343585821\",\"spuName\":\"柚子的梨\",\"stockLimit\":false,\"tax\":0.0,\"unit\":\"\",\"weight\":0.0},{\"customerCode\":\"jrb\",\"extraList\":[],\"hasProductCoupon\":false,\"isB3S1Coupon\":0,\"isB3S1CouponGoods\":0,\"isFixedProduct\":false,\"isMonthCard\":0,\"isTableware\":0,\"linkedId\":\"\",\"materialList\":[],\"originalPrice\":33,\"originalProductType\":1,\"parentProductId\":\"251946878491615276\",\"picture\":\"https://picture.sandload.cn/1628583566754.jpg\",\"productType\":6,\"qty\":4,\"skuForeignName\":\"\",\"skuId\":\"215806490097850416\",\"skuName\":\"柚子的鸡肉棒\",\"specialExtra\":[],\"spuForeignName\":\"\",\"spuId\":\"215806490097850416\",\"spuName\":\"柚子的鸡肉棒\",\"stockLimit\":false,\"tax\":0.0,\"totalDiscountAmount\":0,\"unit\":\"\",\"weight\":0.0},{\"customerCode\":\"hb\",\"extraList\":[],\"hasProductCoupon\":false,\"isB3S1Coupon\":0,\"isB3S1CouponGoods\":0,\"isFixedProduct\":false,\"isMonthCard\":0,\"isTableware\":0,\"linkedId\":\"\",\"materialList\":[],\"originalPrice\":2,\"originalProductType\":1,\"parentProductId\":\"251946878491615276\",\"picture\":\"https://picture.sandload.cn/1628583887266.png\",\"productType\":6,\"qty\":2,\"skuForeignName\":\"\",\"skuId\":\"215806824348227645\",\"skuName\":\"柚子的汉堡\",\"specialExtra\":[],\"spuForeignName\":\"\",\"spuId\":\"215806824348227645\",\"spuName\":\"柚子的汉堡\",\"stockLimit\":false,\"tax\":0.0,\"totalDiscountAmount\":0,\"unit\":\"\",\"weight\":0.0}],\"customerCode\":\"jialetaocan\",\"extraList\":[],\"hasProductCoupon\":false,\"isB3S1Coupon\":0,\"isB3S1CouponGoods\":0,\"isMonthCard\":0,\"isSendGoods\":false,\"isTableware\":0,\"linkedId\":\"\",\"materialList\":[],\"originalPrice\":168,\"originalProductType\":7,\"picture\":\"https://picture.sandload.cn/1663060775658.jpg\",\"productCode\":\"jialetaocan\",\"productType\":6,\"qty\":2,\"skuForeignName\":\"\",\"skuId\":\"251946878491615276\",\"skuName\":\"迦勒套餐002\",\"specialExtra\":[],\"spuForeignName\":\"\",\"spuId\":\"251946878491615276\",\"spuName\":\"迦勒套餐002\",\"stockLimit\":false,\"tax\":0.0,\"totalDiscountAmount\":0,\"unit\":\"\",\"weight\":0.0},{\"activityDiscountsDtos\":[],\"cartGoodsUid\":\"015b7e93-f194-46d5-8503-577a237593f5\",\"classificationId\":\"\",\"classificationName\":\"\",\"comboProducts\":[],\"customerCode\":\"mg\",\"extraList\":[],\"hasProductCoupon\":false,\"isB3S1Coupon\":0,\"isB3S1CouponGoods\":0,\"isMonthCard\":0,\"isSendGoods\":false,\"isTableware\":0,\"linkedId\":\"\",\"materialList\":[{\"activityDiscountsDtos\":[],\"customerCode\":\"H00301\",\"extraList\":[],\"hasProductCoupon\":false,\"isB3S1Coupon\":0,\"isB3S1CouponGoods\":0,\"isMonthCard\":0,\"isTableware\":0,\"originalPrice\":11,\"originalProductType\":2,\"qty\":2,\"specialExtra\":[],\"spuForeignName\":\"\",\"spuId\":\"215806159829964858\",\"spuName\":\"加珍珠\",\"stockLimit\":false,\"tax\":0.0,\"totalDiscountAmount\":0},{\"activityDiscountsDtos\":[],\"customerCode\":\"H00302\",\"extraList\":[],\"hasProductCoupon\":false,\"isB3S1Coupon\":0,\"isB3S1CouponGoods\":0,\"isMonthCard\":0,\"isTableware\":0,\"originalPrice\":23,\"originalProductType\":2,\"qty\":4,\"specialExtra\":[],\"spuForeignName\":\"\",\"spuId\":\"215806175661365253\",\"spuName\":\"加布丁\",\"stockLimit\":false,\"tax\":0.0,\"totalDiscountAmount\":0},{\"activityDiscountsDtos\":[],\"customerCode\":\"H00303\",\"extraList\":[],\"hasProductCoupon\":false,\"isB3S1Coupon\":0,\"isB3S1CouponGoods\":0,\"isMonthCard\":0,\"isTableware\":0,\"originalPrice\":14,\"originalProductType\":2,\"qty\":6,\"specialExtra\":[],\"spuForeignName\":\"\",\"spuId\":\"215806191862913039\",\"spuName\":\"加芋圆\",\"stockLimit\":false,\"tax\":0.0,\"totalDiscountAmount\":0},{\"activityDiscountsDtos\":[],\"customerCode\":\"H00304\",\"extraList\":[],\"hasProductCoupon\":false,\"isB3S1Coupon\":0,\"isB3S1CouponGoods\":0,\"isMonthCard\":0,\"isTableware\":0,\"originalPrice\":22,\"originalProductType\":2,\"qty\":8,\"specialExtra\":[],\"spuForeignName\":\"\",\"spuId\":\"215806207417489433\",\"spuName\":\"加椰果\",\"stockLimit\":false,\"tax\":0.0,\"totalDiscountAmount\":0}],\"originalPrice\":287,\"originalProductType\":1,\"picture\":\"https://picture.sandload.cn/1628587294259.jpg\",\"productCode\":\"mg\",\"productType\":88,\"qty\":2,\"skuForeignName\":\"\",\"skuId\":\"215810396282525751\",\"skuName\":\"柚子的芒果\",\"specialExtra\":[],\"spuForeignName\":\"\",\"spuId\":\"215810396282525751\",\"spuName\":\"柚子的芒果\",\"stockLimit\":false,\"tax\":0.0,\"totalDiscountAmount\":0,\"unit\":\"\",\"weight\":0.0}],\"reduceScore\":90,\"scoreReduceAmount\":900,\"totalAmount\":910,\"totalDiscountAmount\":0}"
, ShoppingCartGoodsDto.class)
createOrderBO.setShoppingCartGoodsDto(shoppingCartGoodsDto)
......@@ -179,6 +183,9 @@ class OrderAdapterServiceImplTest extends Specification {
, StoreMixResponseDto.class)
createOrderBO.setStoreMixResponseDto(storeMixResponseDto)
and: "默认值设置"
memberBlacklistHandler.checkisTrueBlacklist(_) >> null
when: "调用方法"
def order = orderServiceImpl.sdkCreateOrder(createOrderBO)
......
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/adapter/OrderCenterSdkAdapter.java
......@@ -352,6 +352,7 @@ public class OrderCenterSdkAdapter {
productBean.setProductForeignProperty(orderItemResp.getProductForeignProperty());
productBean.setExtInfo(orderItemResp.getExtInfo());
productBean.setNote(orderItemResp.getNote());
productBean.setProductSpuQuantity(orderItemResp.getProductSpuQuantity());
// 套餐
productBean.setParentProductId(orderItemResp.getParentProductId());
......
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/entities/v1/ProductBeanV1.java
......@@ -188,4 +188,8 @@ public class ProductBeanV1 {
*/
private Boolean isSendGoods;
/**
* 订单新增商品SPU数量字段 https://cf.freemudvip.com/pages/viewpage.action?pageId=209356052
*/
private Integer productSpuQuantity;
}
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/OrderItemCreateReq.java
......@@ -163,4 +163,9 @@ public class OrderItemCreateReq {
*/
private Long packPrice;
/**
* 订单新增商品SPU数量字段 https://cf.freemudvip.com/pages/viewpage.action?pageId=209356052
*/
private Integer productSpuQuantity;
}
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderItemResp.java
......@@ -130,4 +130,9 @@ public class OrderItemResp {
//加购人包装费
private Long packPrice;
/**
* 订单新增商品SPU数量字段 https://cf.freemudvip.com/pages/viewpage.action?pageId=209356052
*/
private Integer productSpuQuantity;
}
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