erp相关方法从 platform迁移到 goblin

liquidnet-bus-common/liquident-common-erp/src/main/java/com/liquidnet/service/erp/vo/LogisticSyncBaseVo.java

@@ -13,5 +13,5 @@ public class LogisticSyncBaseVo {
     // 只有，page_no = 0 时才返回的符合条件的数据总条数，用来分页
     private int total_count;
     // 响应参数的1级数据节点，包含当前页的订单待同步物流订单信息的数据节点,节点下数据字段详见下述“trades”
-    private List<StockQueryVo> stocks;
+    private List<LogisticsSyncVo> trades;
 }

liquidnet-bus-common/liquident-common-erp/src/main/java/com/liquidnet/service/erp/vo/LogisticsSyncVo.java

@@ -6,31 +6,33 @@ import lombok.Data;
 public class LogisticsSyncVo implements Cloneable {
 
     // 主键,用于logistics_sync_ack回写状态
-    private int rec_id;
+    private String rec_id;
     // 代表店铺所有属性的唯一编码，用于店铺区分，ERP内支持自定义（ERP店铺界面设置）
-    private int shop_no;
+    private String shop_no;
     // 原始订单编号，商城或平台订单号
-    private int tid;
+    private String tid;
     // 物流或者快递面单对应的编号
-    private int logistics_no;
+    private String logistics_no;
     // 响应值为代表物流方式的数字，数字对应的物流方式名称单击这里
-    private int logistics_type;
+    private String logistics_type;
     // 发货时间    时间格式：yyyy-MM-dd HH:mm:ss
-    private int consign_time;
+    private int delivery_term;
+    // 1款到发货 2货到付款(包含部分货到付款) 3分期付款
+    private String consign_time;
     // 是否拆分发货,1:拆单发货,0:不进行拆单发货
-    private int is_part_sync;
+    private String is_part_sync;
     // 子订单编号串，以逗号(,) 分隔,并且长度不固定(is_part_sync非0时才有效)
-    private int oids;
+    private String oids;
     // 平台ID，固定值127
-    private int platform_id;
+    private String platform_id;
     // 订单ID
     private int trade_id;
     // 代表物流所有属性的唯一编码，用于物流区分，ERP内支持自定义（ERP物流界面设置）
-    private int logistics_code_erp;
+    private String logistics_code_erp;
     // ERP内自定义的物流名称，（对应ERP设置-基本设置-物流界面的物流名称）
-    private int logistics_name_erp;
+    private String logistics_name_erp;
     // 物流方式类型名称，（ERP设置-基本设置-物流界面的物流类型中文名称）
-    private int logistics_name;
+    private String logistics_name;
     // 出库单id
     private int stockout_id;
     // 1:需要同步,0:不需要同步
@@ -40,25 +42,25 @@ public class LogisticsSyncVo implements Cloneable {
     //  一个订单要多次同步时，最后一个为1,用于同步回写状态
     private int is_last;
     // 默认为0
-    private int shop_id;
+    private String shop_id;
     // 默认为0
     private int logistics_id;
     // 同步说明
-    private int description;
+    private String description;
     // 默认为'0000-00-00 00:00:00'，成功同步时间
-    private int sync_time;
+    private String sync_time;
     // 默认为0，是否使用淘宝在线发货
     private int is_online;
     // 默认为 ''，平台返回的错误码
-    private int error_code;
+    private String error_code;
     // 默认为 ''，平台返回的错误描述
-    private int error_msg;
+    private String error_msg;
     // 默认为0，重试计数(有些同步失败可重试)
     private int try_times;
     // 最后修改时间， 时间格式：yyyy-MM-dd HH:mm:ss
-    private int modified;
+    private String modified;
     // 创建时间，时间格式：yyyy-MM-dd HH:mm:ss
-    private int created;
+    private String created;
     // 序列号（存在序列号时返回序列号，无序列号时返回 flag）
-    private int sn_list;
+    private String sn_list;
 }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/erp/WdtController.java → liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/erp/WdtController.java

-package com.liquidnet.service.platform.controller.erp;
+package com.liquidnet.service.goblin.controller.erp;
 
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.service.IGoblinErpService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 
 @Api(tags = "erp-旺店通")

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

-package com.liquidnet.service.platform.service.impl.erp;
+package com.liquidnet.service.goblin.service.impl.erp;
 
 import com.alibaba.fastjson.JSON;
 import com.liquidnet.commons.lang.util.CollectionUtil;
@@ -21,9 +21,8 @@ import com.liquidnet.service.goblin.constant.GoblinStatusConst;
 import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.goblin.mapper.GoblinGoodsSkuMapper;
 import com.liquidnet.service.goblin.service.IGoblinErpService;
-import com.liquidnet.service.platform.utils.GoblinRedisUtils;
-import com.liquidnet.service.platform.utils.ObjectUtil;
-import com.liquidnet.service.platform.utils.QueueUtils;
+import com.liquidnet.service.goblin.util.GoblinRedisUtils;
+import com.liquidnet.service.goblin.util.QueueUtils;
 import com.mongodb.BasicDBObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -154,7 +153,7 @@ public class WdtServiceImpl implements IGoblinErpService {
                         obj);
                 goblinRedisUtils.del(GoblinRedisConst.BASIC_GOODS_SKU.concat(skuId));
                 //sql 当前库存 增加changeStock
-                queueUtils.sendMsgByGoblinRedis(MQConst.GoblinQueue.GOBLIN_ORDER_CLOSE.getKey(),
+                queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_ORDER_CLOSE.getKey(),
                         SqlMapping.get("goblin_sku.stock", vo.getStockErpNum().intValue(), vo.getStockErpNum().intValue(), LocalDateTime.now(), vo.getSpecNo(), vo.getWarehouseNo()));
                 //redis incr 增加changeStock
                 int stock = 0;
@@ -299,7 +298,7 @@ public class WdtServiceImpl implements IGoblinErpService {
     //构建 nft订单数据
     private List<TradeListParam> nftOrderData(String orderId, List<TradeListParam> listOrder) {
         TradeListParam tradeListParam = TradeListParam.getNew();
-        GoblinNftOrderVo orderVo = goblinRedisUtils.getNftOrder(orderId);
+        GoblinNftOrderVo orderVo = goblinRedisUtils.getGoblinNftOrder(orderId);
         List<OrderListParam> listOrderSku = ErpObjectUtil.orderListParam();
         //配置sku维度数据
         OrderListParam orderSkuParam = OrderListParam.getNew();

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

@@ -2849,6 +2849,28 @@ public class GoblinRedisUtils {
         return map;
     }
 
+
+    //获取erp订单
+    public List<String> getRange(int index) {
+        String rdk = GoblinRedisConst.ERP_GOBLIN_GOODS_LIST.concat(index + "");
+        List<Object> list = redisUtil.getRange(rdk);
+        List<String> data = CollectionUtil.arrayListString();
+        for (Object str :list){
+            data.add((String) str);
+        }
+        return data;
+    }
+
+    public String erpLeftPop(int index) {
+        String rdk = GoblinRedisConst.ERP_GOBLIN_GOODS_LIST.concat(index + "");
+        Object obj  = redisUtil.leftPop(rdk);
+        if(obj==null){
+            return null;
+        }else{
+            return (String) obj;
+        }
+    }
+
     /* ----------------------------------------  ---------------------------------------- */
     /* ----------------------------------------  ---------------------------------------- */
     /* ----------------------------------------  ---------------------------------------- */

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

-package com.liquidnet.service.platform.controller;
+package com.liquidnet.service.platform.controller.erp;
 
 import com.alibaba.fastjson.JSON;
 import com.liquidnet.commons.lang.util.CollectionUtil;

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/erp/IWdtService.java

-package com.liquidnet.service.platform.service.erp;
-
-
-/**
- * <p>
- * 支付订单表 服务类
- * </p>
- *
- * @author liquidnet
- * @since 2021-07-20
- */
-public interface IWdtService {
-
-}

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/GoblinRedisUtils.java

@@ -399,29 +399,6 @@ public class GoblinRedisUtils {
             return vo;
         }
     }
-
-
-    //获取erp订单
-    public List<String> getRange(int index) {
-        String rdk = GoblinRedisConst.ERP_GOBLIN_GOODS_LIST.concat(index + "");
-        List<Object> list = getRedis().getRange(rdk);
-        List<String> data = CollectionUtil.arrayListString();
-        for (Object str :list){
-            data.add((String) str);
-        }
-        return data;
-    }
-
-    public String erpLeftPop(int index) {
-        String rdk = GoblinRedisConst.ERP_GOBLIN_GOODS_LIST.concat(index + "");
-        Object obj  = getRedis().leftPop(rdk);
-        if(obj==null){
-            return null;
-        }else{
-            return (String) obj;
-        }
-    }
-
     /* ----------------------------------------  ---------------------------------------- */
     /* ----------------------------------------  ---------------------------------------- */
     /* ----------------------------------------  ---------------------------------------- */