暂时 提交

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinOrderSkuVo.java

@@ -67,6 +67,18 @@ public class GoblinOrderSkuVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "核销时间")
     private String pushTime;
 
+    @ApiModelProperty(value = "erp-spuNo")
+    private String spuErpCode;
+    @ApiModelProperty(value = "erp-skuNo")
+    private String skuErpCode;
+    @ApiModelProperty(value = "ERP类型[wangdian-旺店通]")
+    private String erpType;
+    @ApiModelProperty(value = "erp-仓库号")
+    private String erpWarehouseNo;
+
+    @ApiModelProperty(value = "仓库编号")
+    private String warehouseNo;
+
     public String getPushTime() {
         return pushTime==null?"":pushTime;
     }
@@ -89,6 +101,12 @@ public class GoblinOrderSkuVo implements Serializable, Cloneable {
         this.setSkuSpecs(source.getSkuSpecs());
         this.setPriceModify(source.getPriceModify());
         this.setPriceVoucher(source.getPriceVoucher());
+
+        this.setSpuErpCode(source.getSpuErpCode());
+        this.setSkuErpCode(source.getSkuErpCode());
+        this.setErpType(source.getErpType());
+        this.setErpWarehouseNo(source.getErpWarehouseNo());
+
         this.setCreatedAt(source.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         return this;
     }

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinOrderSku.java

@@ -125,6 +125,27 @@ public class GoblinOrderSku implements Serializable,Cloneable {
      */
     private BigDecimal cateRate;
 
+    /**
+     * spu ERP 编号
+     */
+    private String spuErpCode;
+
+    /**
+     * sku ERP 编号
+     */
+    private String skuErpCode;
+
+    /**
+     * ERP类型[wangdian-旺店通]
+     */
+    private String erpType;
+
+    /**
+     * ERP 仓库号
+     */
+    private String erpWarehouseNo;
+
+
     private LocalDateTime createdAt;
 
     private LocalDateTime updatedAt;

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/Inner/GoblinInnerZhengzaiController.java

 package com.liquidnet.service.goblin.controller.Inner;
 
+import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.erp.param.TradeListParam;
 import com.liquidnet.service.goblin.dto.manage.GoblinStoreZhengzaiCommonParam;
 import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.goblin.service.manage.IGoblinConsumerService;
 import com.liquidnet.service.goblin.service.manage.IGoblinInnerService;
 import com.liquidnet.service.goblin.service.manage.IGoblinZhengzaiService;
+import com.liquidnet.service.goblin.util.GoblinOrderUtils;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -131,4 +134,19 @@ public class GoblinInnerZhengzaiController {
     public ResponseDto<Boolean> consumerType34(String finalSkuId, Integer finalType, String xlsPath, String oXlsPath, String listId) {
         return goblinConsumerService.consumerType34(finalSkuId, finalType, xlsPath, oXlsPath, listId);
     }
+
+
+    @Autowired
+    GoblinOrderUtils goblinOrderUtils;
+
+    @PostMapping("test112233")
+    @ApiOperation("测试11")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "orderId", value = "orderId"),
+    })
+    public ResponseDto<Boolean> test112233(String orderId) {
+        List<TradeListParam> aa = goblinOrderUtils.getErpOrder(orderId);
+        log.info("data = " + JSON.toJSONString(aa));
+        return ResponseDto.success();
+    }
 }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinOrderUtils.java

@@ -135,6 +135,7 @@ public class GoblinOrderUtils {
         GoblinStoreOrderVo orderVo = redisUtils.getGoblinOrder(orderId);
         List<String> orderSkuIds = orderVo.getOrderSkuVoIds();
         List<OrderListParam> listOrderSku = ObjectUtil.orderListParam();
+        String warehouseNo = "";
         //配置sku维度数据
         for (String orderSkuId : orderSkuIds) {
             OrderListParam orderSkuParam = OrderListParam.getNew();
@@ -146,12 +147,19 @@ public class GoblinOrderUtils {
             orderSkuParam.setRefund_status(0);
             orderSkuParam.setGoods_id(orderSkuVo.getSpuId());
             orderSkuParam.setSpec_id(orderSkuVo.getSkuId());
-//            orderSkuParam.setGoods_no();
-//            orderSkuParam.setSpec_no();
+//            orderSkuParam.setGoods_no(orderSkuVo.getSpuErpCode());
+//            orderSkuParam.setSpec_no(orderSkuVo.getSkuErpCode());
+
+            orderSkuParam.setGoods_no("mdsk01");
+            orderSkuParam.setSpec_no("mdsk01");
+
+
             orderSkuParam.setGoods_name(orderSkuVo.getSpuName());
             orderSkuParam.setAdjust_amount(BigDecimal.ZERO);
-//            orderSkuParam.setDiscount();
+            orderSkuParam.setDiscount(BigDecimal.ZERO);
             orderSkuParam.setShare_discount(orderSkuVo.getPriceVoucher());
+            warehouseNo = orderSkuVo.getWarehouseNo();
+            log.info("sku = " + orderSkuParam);
             listOrderSku.add(orderSkuParam);
         }
         //配置订单维度数据
@@ -181,7 +189,7 @@ public class GoblinOrderUtils {
         tradeListParam.setExt_cod_fee(BigDecimal.ZERO);
         tradeListParam.setOther_amount(BigDecimal.ZERO);
         tradeListParam.setPaid(orderVo.getPriceActual());
-//        tradeListParam.setWarehouse_no();
+        tradeListParam.setWarehouse_no(warehouseNo);
         listOrder.add(tradeListParam);
 
         return listOrder;

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinOrderServiceImpl.java

@@ -287,6 +287,12 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             orderSku.setSkuPriceActual(price);
             orderSku.setSkuName(skuVo.getName());
             orderSku.setSkuNo(skuVo.getSkuNo());
+
+            orderSku.setSpuErpCode(spuVo.getSpuErpCode());
+            orderSku.setSkuErpCode(skuVo.getSkuErpCode());
+            orderSku.setErpType(spuVo.getSpuErpCode());
+            orderSku.setErpWarehouseNo(spuVo.getSpuErpCode());
+
             orderSku.setSkuImage(skuVo.getSkuPic());
             orderSku.setSkuSpecs(JSON.toJSONString(skuVo.getSkuSpecList()));
             orderSku.setPriceVoucher(BigDecimal.ZERO);