商品配置三方商品编号是否更换货号

order-application-service/src/main/java/cn/freemud/entities/dto/ProductInfosDto.java

@@ -33,5 +33,8 @@ public class ProductInfosDto {
 
         private Integer count;
         private List<ProductInfo> products;
+
+        //传给pos的商品编号类型（0传三方编号给pos，1传货号给pos，默认传三方编号
+        private Integer toPosProductIdType;
     }
 }
\ No newline at end of file

order-application-service/src/main/java/cn/freemud/service/business/OrderBusinessService.java

@@ -17,7 +17,7 @@ import com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse;
 public interface OrderBusinessService {
     PayAccessResponse payAccess(ConfirmOrderRequest confirmOrderRequest);
 
-    Integer getPaySuccessTimeout(ConfirmOrderRequest confirmOrderRequest, PaySuccessReq request);
+//    Integer getPaySuccessTimeout(ConfirmOrderRequest confirmOrderRequest, PaySuccessReq request);
 
 
     CreateOrderResponse createOrderFlow(CreateOrderRequest createOrderRequest);

order-application-service/src/main/java/cn/freemud/service/business/impl/OrderBusinessServiceImpl.java

@@ -112,7 +112,7 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
         request.setMealCodeRule(confirmOrderRequest.getMealCodeRule());
         request.setPickUpGoodsNo(confirmOrderRequest.getPickUpGoodsNo());
         // 引入门店基础服务 查询自动制作完成配置时间，预约单单独超时任务设置
-        request.setTimeout(getPaySuccessTimeout(confirmOrderRequest, request));
+        request.setTimeout(this.getPaySuccessTimeout(confirmOrderRequest, request));
 
         if (!org.springframework.util.CollectionUtils.isEmpty(confirmOrderRequest.getOrderSettlements())) {
             List<OrderSettlementCreateReq> orderSettlementCreateReqs = new ArrayList<>();
@@ -176,7 +176,6 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
         return orderSdkAdapter.convent2PayAccessResponse(response);
     }
 
-    @Override
     public Integer getPaySuccessTimeout(ConfirmOrderRequest confirmOrderRequest, PaySuccessReq request) {
         // 合阔pos 商户未接单退款超时时间
         if (confirmOrderRequest.getNotAutomaticTwistTime() != null) {

order-application-service/src/main/java/cn/freemud/service/impl/ItemServiceImpl.java

@@ -60,8 +60,10 @@ public class ItemServiceImpl implements ItemService{
         AppLogUtil.infoLog("storeItemClient_listProductInfos", gson.toJson(getProductInfoDto), gson.toJson(productInfosDto));
         if (ResponseCodeConstant.RESPONSE_SUCCESS.equals(productInfosDto.getErrcode()) && productInfosDto.getData() != null
                 && CollectionUtils.isNotEmpty(productInfosDto.getData().getProducts())) {
+            boolean b = productInfosDto.getData().getToPosProductIdType() != null &&  productInfosDto.getData().getToPosProductIdType() == 1 ? true : false;
             productInfosDto.getData().getProducts().forEach(productBean -> {
                 GetProductsVo spuProductsVo = new GetProductsVo();
+
                 spuProductsVo.setCustomerCode(productBean.getCustomerCode());
                 spuProductsVo.setProductCode(productBean.getProductCode());
                 List<AttributeValue> attributeValues  = new ArrayList<>();