erp 修改 同步库存和推送订单

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/erp/WdtServiceImpl.java

@@ -104,6 +104,8 @@ public class WdtServiceImpl implements IGoblinErpService {
                 ), GoblinGoodsSkuInfoVo.class, GoblinGoodsSkuInfoVo.class.getSimpleName());//总条数
                 int pageCount = (allCount / pageSize) + 1;
                 param.put("page_size", pageSize + "");
+//                param.put("warehouse_no", "mdtk2-test");
+//                param.put("spec_no", "md111-1");
                 for (int i = 0; i < pageCount; i++) {
                     param.put("page_no", i + "");
                     json = erpWdtClient.execute(ErpEnum.WdtAPI.STOCK_QUERY.getUri(), param);
@@ -179,7 +181,7 @@ public class WdtServiceImpl implements IGoblinErpService {
                 }
                 log.info("skuId:{},库存:{}", skuId, stock);
             } catch (Exception e) {
-                e.printStackTrace();
+//                e.printStackTrace();
                 log.error("同步库存失败 skuId:{},erpSpecNo:{},warehouseNo:{}", skuId, vo.getSpecNo(), vo.getWarehouseNo());
             }
         }
@@ -201,7 +203,7 @@ public class WdtServiceImpl implements IGoblinErpService {
             List<String> list = CollectionUtil.arrayListString();
             for (int i = 0; i < contentSize; i++) {
                 String orderId = goblinRedisUtils.erpLeftPop(i);
-                if (orderId != null) {
+                if(orderId!=null) {
                     list.add(orderId);
                 }
             }
@@ -243,6 +245,7 @@ public class WdtServiceImpl implements IGoblinErpService {
         List<OrderListParam> listOrderSku = ErpObjectUtil.orderListParam();
         String warehouseNo = "";
         int erpHosting = 0;
+        BigDecimal priceA = BigDecimal.ZERO;
         //配置sku维度数据
         for (String orderSkuId : orderSkuIds) {
             OrderListParam orderSkuParam = OrderListParam.getNew();
@@ -254,7 +257,7 @@ public class WdtServiceImpl implements IGoblinErpService {
             }
             orderSkuParam.setOid(orderSkuVo.getOrderSkuId());
             orderSkuParam.setNum(BigDecimal.valueOf(orderSkuVo.getNum()));
-            orderSkuParam.setPrice(orderSkuVo.getSkuPrice());
+            orderSkuParam.setPrice(orderSkuVo.getSkuPrice());//.multiply(BigDecimal.valueOf(orderSkuVo.getNum()))
             orderSkuParam.setStatus(ErpEnum.WdtStatus.STATUS_UN_SEND.WdtStatus());
             orderSkuParam.setRefund_status(0);
             orderSkuParam.setGoods_id(orderSkuVo.getSpuId());
@@ -266,6 +269,7 @@ public class WdtServiceImpl implements IGoblinErpService {
             orderSkuParam.setDiscount(BigDecimal.ZERO);
             orderSkuParam.setShare_discount(orderSkuVo.getPriceVoucher());
             warehouseNo = orderSkuVo.getErpWarehouseNo();
+            priceA = priceA.add(orderSkuVo.getSkuPrice());
             listOrderSku.add(orderSkuParam);
         }
         //配置订单维度数据
@@ -303,7 +307,7 @@ public class WdtServiceImpl implements IGoblinErpService {
         tradeListParam.setPost_amount(orderVo.getPriceExpress());
         tradeListParam.setExt_cod_fee(BigDecimal.ZERO);
         tradeListParam.setOther_amount(BigDecimal.ZERO);
-        tradeListParam.setPaid(orderVo.getPriceActual());
+        tradeListParam.setPaid(priceA.add(orderVo.getPriceExpress()));
         tradeListParam.setWarehouse_no(warehouseNo);
         if (erpHosting == 1) {
             listOrder.add(tradeListParam);