Commit 6d9f30d0 by ping.wu

保存商品统计分类编号

parent c98028b2
......@@ -2662,7 +2662,9 @@ public class OrderSdkAdapter {
if (StringUtils.isNotBlank(product.getThirdCategoryId())){
extInfo.setThirdCategoryId(product.getThirdCategoryId());
}
if (StringUtils.isNotBlank(product.getCategory())){
extInfo.setThirdCensusCategoryId(product.getCategory());
}
extInfo.setStapleFood(product.getStapleFood());
//if (product.getStapleFood()!=null && product.getStapleFood()>0) {
// extInfo.setStapleFood(1);
......
......@@ -161,4 +161,7 @@ public class CreateOrderProductRequest extends BaseConfig {
/** 是否主食**/
private Integer stapleFood;
/** 商品统计分类编号**/
private String category;
}
......@@ -51,4 +51,9 @@ public class OrderProductAddInfoDto extends BaseConfig {
/** 是否主食 **/
private Integer stapleFood;
/**
* 商品统计分类编号
*/
private String thirdCensusCategoryId;
}
......@@ -117,7 +117,7 @@ public class OrderAdapter {
* @return
*/
public BaseCreateOrderRequest convent2CreateOrderDto(CreateOrderVo createOrderVo, ShoppingCartGoodsDto shoppingCartGoodsDto,StoreResponse.BizVO storeResponseDto) {
UserDeliveryInfoDto deliveryInfoDto = createOrderVo.getUserDeliveryInfoDto();
// UserDeliveryInfoDto deliveryInfoDto = createOrderVo.getUserDeliveryInfoDto();
BaseCreateOrderRequest createOrderDto = getCreateOrderDto(createOrderVo);
OrderTaskReq orderTask = null;
if(StringUtils.isNotEmpty(createOrderVo.getTakeMealTime())){
......@@ -1987,12 +1987,13 @@ public class OrderAdapter {
createOrderProductDemoDto.setProductType(cartGoodsDetailDto.getProductType());
createOrderProductDemoDto.setParentProductId(cartGoodsDetailDto.getParentProductId());
createOrderProductDemoDto.setIsFixedProduct(cartGoodsDetailDto.getIsFixedProduct());
// createOrderProductDemoDto.setIsFixedProduct(false);
createOrderProductDemoDto.setCustomerCode(cartGoodsDetailDto.getCustomerCode());
//createOrderProductDemoDto.setProductCode(cartGoodsDetailDto.getProductCode());
createOrderProductDemoDto.setHasStockProudct(cartGoodsDetailDto.isStockLimit());
createOrderProductDemoDto.setWeight(cartGoodsDetailDto.getWeight());
createOrderProductDemoDto.setUnit(cartGoodsDetailDto.getUnit());
createOrderProductDemoDto.setStapleFood(0);
createOrderProductDemoDto.setCategory(cartGoodsDetailDto.getCategory());
return createOrderProductDemoDto;
}
......
......@@ -171,6 +171,12 @@ public class ShoppingCartGoodsDto {
* 三方商品编号
*/
private String customerCode;
/**商品货号**/
// private String productCode;
/** 商品统计分类编号**/
private String category;
/**
* 是否限制库存
* 用于创建订单时,是否扣减库存
......
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