Commit ea2fefaa by 周晓航

卖券订单&微商城&积分商城&拼团订单 维护新增字段

parent a72985eb
...@@ -16,7 +16,6 @@ import cn.freemud.entities.vo.CreateOrderResponseVo; ...@@ -16,7 +16,6 @@ import cn.freemud.entities.vo.CreateOrderResponseVo;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo; import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
import com.freemud.application.sdk.api.log.LogThreadLocal; import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
import com.freemud.application.sdk.api.ordercenter.enums.OrderSettlementType; import com.freemud.application.sdk.api.ordercenter.enums.OrderSettlementType;
import com.freemud.application.sdk.api.ordercenter.enums.OrderType; import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
import com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderRequest; import com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderRequest;
...@@ -31,7 +30,10 @@ import org.apache.commons.collections.CollectionUtils; ...@@ -31,7 +30,10 @@ import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.*; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@Component @Component
public class PointsMallOrderAdapter { public class PointsMallOrderAdapter {
...@@ -160,6 +162,7 @@ public class PointsMallOrderAdapter { ...@@ -160,6 +162,7 @@ public class PointsMallOrderAdapter {
orderItemCreateReq.setExtInfo(JSONObject.toJSONString(orderProductAddInfoDto)); orderItemCreateReq.setExtInfo(JSONObject.toJSONString(orderProductAddInfoDto));
} }
orderItemCreateReq.setProductQuantity(1); orderItemCreateReq.setProductQuantity(1);
orderItemCreateReq.setProductSpuQuantity(1);
return orderItemCreateReq; return orderItemCreateReq;
} }
......
...@@ -159,7 +159,7 @@ public class MallOrderServiceImpl implements MallOrderService { ...@@ -159,7 +159,7 @@ public class MallOrderServiceImpl implements MallOrderService {
private MemberBlacklistHandler memberBlacklistHandler; private MemberBlacklistHandler memberBlacklistHandler;
/** /**
* 创建订单 * 创建订单 微商城
*/ */
@Override @Override
public BaseResponse createOrder(CreateOrderBONew createOrderBO) { public BaseResponse createOrder(CreateOrderBONew createOrderBO) {
......
...@@ -619,17 +619,6 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService { ...@@ -619,17 +619,6 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
return ResponseUtil.error(ResponseResult.STORE_ITEM_CHECK_VAILD_ERROR); 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 //查询商品信息sdk改feign
GetProductInfoDto request = new GetProductInfoDto(); GetProductInfoDto request = new GetProductInfoDto();
request.setPartnerId(partnerId); request.setPartnerId(partnerId);
...@@ -893,6 +882,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService { ...@@ -893,6 +882,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
orderItemCreateReq.setProductCode(productBean.getProductCode()); orderItemCreateReq.setProductCode(productBean.getProductCode());
orderItemCreateReq.setThirdProductId(productBean.getCustomerCode()); orderItemCreateReq.setThirdProductId(productBean.getCustomerCode());
orderItemCreateReq.setProductQuantity(1); orderItemCreateReq.setProductQuantity(1);
orderItemCreateReq.setProductSpuQuantity(1);
orderItemCreateReq.setOriginalProductType(productBean.getType()); orderItemCreateReq.setOriginalProductType(productBean.getType());
OrderProductAddInfoDto orderProductAddInfoDto = new OrderProductAddInfoDto(); OrderProductAddInfoDto orderProductAddInfoDto = new OrderProductAddInfoDto();
......
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