暂时 提交注释代码还需要

liquidnet-bus-common/liquident-common-erp/src/main/java/com/liquidnet/service/erp/param/OrderListParam.java

 package com.liquidnet.service.erp.param;
 
+import com.alibaba.fastjson.JSON;
+import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.service.erp.constant.ErpEnum;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 
 @Data
 public class OrderListParam implements Cloneable{
@@ -69,4 +73,26 @@ public class OrderListParam implements Cloneable{
         map.put("share_discount",BigDecimal.ZERO);
         return map;
     }
+
+
+    public static void main(String[] args) {
+        HashMap<String,Object> map = new HashMap<>();
+        map.put("num",BigDecimal.ONE);
+        map.put("goods_id","testSpu001");
+        map.put("spec_id","testSku001");
+        map.put("refund_status",0);
+        map.put("status",0);
+        List<HashMap<String, Object>> listOrderSku = CollectionUtil.listMapStringObject();
+        listOrderSku.add(map);
+        System.out.println(JSON.toJSONString(listOrderSku));
+        OrderListParam orderSkuParam = OrderListParam.getNew();
+        orderSkuParam.setNum(BigDecimal.ONE);
+        orderSkuParam.setGoods_id("testSpu001");
+        orderSkuParam.setSpec_id("testSku001");
+        orderSkuParam.setRefund_status(0);
+        orderSkuParam.setStatus(0);
+        List<OrderListParam> list2 = new ArrayList<>();
+        list2.add(orderSkuParam);
+        System.out.println(JSON.toJSONString(list2));
+    }
 }

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/CollectionUtil.java

@@ -19,6 +19,7 @@ public class CollectionUtil {
     private static final LinkedList<Object[]> OBJECTS_LINKED_LIST = new LinkedList<>();
     private static final LinkedMultiValueMap<String, String> STRING_STRING_LINKED_MULTI_VALUE_MAP = new LinkedMultiValueMap<>();
     private static final ArrayList<String> STRING_ARRAY_LIST = new ArrayList<>();
+    private static final ArrayList<HashMap<String,Object>> HASH_MAP_ARRAY_LIST = new ArrayList<>();
     private static final HashSet<String> STRING_ARRAY_SET = new HashSet<>();
     private static final ArrayList<Integer> INTEGER_ARRAY_LIST = new ArrayList<>();
     private static final ArrayList<Object> OBJECT_ARRAY_LIST = new ArrayList<>();
@@ -26,9 +27,15 @@ public class CollectionUtil {
     private static final ArrayList<BigDecimal> BIGDECIMAL_ARRAY_LIST = new ArrayList<>();
     private static final String[] STRING_ARRAY = new String[]{};
 
+
     public static String[] stringArray() {
         return STRING_ARRAY.clone();
     }
+
+    public static List<HashMap<String,Object>> listMapStringObject() {
+        return (List<HashMap<String,Object>>) HASH_MAP_ARRAY_LIST.clone();
+    }
+
     public static HashMap<String, String> mapStringString() {
         return (HashMap<String, String>) STRING_STRING_HASH_MAP.clone();
     }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/pom.xml

@@ -79,6 +79,13 @@
             <scope>compile</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquident-common-erp</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+
 
         <dependency>
             <groupId>com.alibaba</groupId>

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

@@ -10,8 +10,14 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.candy.param.BackCouponParam;
 import com.liquidnet.service.candy.vo.CandyCouponVo;
+import com.liquidnet.service.erp.constant.ErpEnum;
+import com.liquidnet.service.erp.param.OrderListParam;
+import com.liquidnet.service.erp.param.TradeListParam;
 import com.liquidnet.service.goblin.dto.GoblinQueueBizIntegralDto;
 import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinOrderSkuVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinStoreOrderVo;
+import com.liquidnet.service.goblin.param.GoblinNowOrderListParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -23,6 +29,7 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Component
 @Slf4j
@@ -121,4 +128,63 @@ public class GoblinOrderUtils {
         return returnMap;
     }
 
+    public List<TradeListParam> getErpOrder(String orderId) {
+        List<TradeListParam> listOrder = ObjectUtil.tradeListParam();
+
+        TradeListParam tradeListParam = TradeListParam.getNew();
+        GoblinStoreOrderVo orderVo = redisUtils.getGoblinOrder(orderId);
+        List<String> orderSkuIds = orderVo.getOrderSkuVoIds();
+        List<OrderListParam> listOrderSku = ObjectUtil.orderListParam();
+        //配置sku维度数据
+        for (String orderSkuId : orderSkuIds) {
+            OrderListParam orderSkuParam = OrderListParam.getNew();
+            GoblinOrderSkuVo orderSkuVo = redisUtils.getGoblinOrderSkuVo(orderSkuId);
+            orderSkuParam.setOid(orderSkuVo.getOrderSkuId());
+            orderSkuParam.setNum(BigDecimal.valueOf(orderSkuVo.getNum()));
+            orderSkuParam.setPrice(orderSkuVo.getSkuPrice());
+            orderSkuParam.setStatus(ErpEnum.WdtStatus.STATUS_UN_SEND.WdtStatus());
+            orderSkuParam.setRefund_status(0);
+            orderSkuParam.setGoods_id(orderSkuVo.getSpuId());
+            orderSkuParam.setSpec_id(orderSkuVo.getSkuId());
+//            orderSkuParam.setGoods_no();
+//            orderSkuParam.setSpec_no();
+            orderSkuParam.setGoods_name(orderSkuVo.getSpuName());
+            orderSkuParam.setAdjust_amount(BigDecimal.ZERO);
+//            orderSkuParam.setDiscount();
+            orderSkuParam.setShare_discount(orderSkuVo.getPriceVoucher());
+            listOrderSku.add(orderSkuParam);
+        }
+        //配置订单维度数据
+        tradeListParam.setOrder_list(listOrderSku);
+        tradeListParam.setTid(orderVo.getOrderCode());
+        tradeListParam.setTrade_status(ErpEnum.WdtStatus.STATUS_UN_SEND.WdtStatus());
+        tradeListParam.setPay_status(2);
+        tradeListParam.setDelivery_term(1);
+        tradeListParam.setTrade_time(orderVo.getCreatedAt());
+        tradeListParam.setPay_time(orderVo.getPayTime());
+        tradeListParam.setBuyer_nick(orderVo.getUserName());
+        tradeListParam.setPay_id(orderVo.getPayCode());
+        tradeListParam.setReceiver_name(orderVo.getOrderAttrVo().getExpressContacts());
+        String[] address = orderVo.getOrderAttrVo().getExpressAddress().split(" ");
+        if (address.length > 0) {
+            tradeListParam.setReceiver_province(address[0]);
+        }
+        if (address.length > 1) {
+            tradeListParam.setReceiver_city(address[1]);
+        }
+        if (address.length > 2) {
+            tradeListParam.setReceiver_district(address[2]);
+        }
+        tradeListParam.setReceiver_address(orderVo.getOrderAttrVo().getExpressAddress());
+        tradeListParam.setReceiver_mobile(orderVo.getOrderAttrVo().getExpressPhone());
+        tradeListParam.setPost_amount(orderVo.getPriceExpress());
+        tradeListParam.setExt_cod_fee(BigDecimal.ZERO);
+        tradeListParam.setOther_amount(BigDecimal.ZERO);
+        tradeListParam.setPaid(orderVo.getPriceActual());
+//        tradeListParam.setWarehouse_no();
+        listOrder.add(tradeListParam);
+
+        return listOrder;
+    }
+
 }

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

 package com.liquidnet.service.goblin.util;
 
 import com.liquidnet.service.base.PagedResult;
+import com.liquidnet.service.erp.param.OrderListParam;
+import com.liquidnet.service.erp.param.TradeListParam;
 import com.liquidnet.service.goblin.dto.GoblinGoodsSpecDto;
 import com.liquidnet.service.goblin.dto.GoblinStoreMarketDto;
 import com.liquidnet.service.goblin.dto.GoblinStoreMgtCouponListVoExcel;
@@ -101,6 +103,8 @@ public class ObjectUtil {
     private static final ArrayList<GoblinMixAppListVo> goblinMixAppListVo = new ArrayList<>();
     private static final ArrayList<CouponCountVo> couponCountVos = new ArrayList<>();
     private static final ArrayList<GoblinMixDetailsVo> goblinMixDetailsVo = new ArrayList<>();
+    private static final ArrayList<OrderListParam> orderListParam = new ArrayList<>();
+    private static final ArrayList<TradeListParam> tradeListParam = new ArrayList<>();
 
     private static final HashMap<String, String[]> mixIdMap = new HashMap();
 
@@ -108,6 +112,13 @@ public class ObjectUtil {
         return (HashMap<String, String[]>) mixIdMap.clone();
     }
 
+    public static ArrayList<OrderListParam> orderListParam() {
+        return (ArrayList<OrderListParam>) orderListParam.clone();
+    }
+
+    public static ArrayList<TradeListParam> tradeListParam() {
+        return (ArrayList<TradeListParam>) tradeListParam.clone();
+    }
 
     public static ArrayList<CouponCountVo> couponCountVos() {
         return (ArrayList<CouponCountVo>) couponCountVos.clone();

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/ErpTestController.java

@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -52,7 +53,7 @@ public class ErpTestController {
     public ResponseDto<TradePushVo> tradePush(@RequestParam("num") String num) {
         Map<String, String> param = CollectionUtil.linkMapStringString();
         param.put("shop_no", "mdtk2-test");
-        List<Map<String, Object>> tradeList = new ArrayList<>();
+        List<HashMap<String, Object>> tradeList = new ArrayList<>();
         tradeList.add(TradeListParam.getNew().test(num));
         param.put("trade_list", JSON.toJSONString(tradeList));
         String json = erpWdtClient.execute(ErpEnum.WdtAPI.TRADE_PUSH.getUri(), param);