erp 同步物流

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinErpService.java

@@ -8,4 +8,6 @@ public interface IGoblinErpService {
 
     ResponseDto<Boolean> pushTrade(String orderId);
 
+    ResponseDto<Boolean> syncErpLogistic();
+
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/manage/IGoblinStoreOrderService.java

@@ -32,7 +32,7 @@ public interface IGoblinStoreOrderService {
 
     ResponseDto<Boolean> refundOrderSku(String orderId, String orderSkuId, BigDecimal price);
 
-    ResponseDto<Boolean> express(String orderId, String orderSkuIds,String mailNo,String uid);
+    ResponseDto<Boolean> express(String orderId, String orderSkuIds,String mailNo,String uid,String orderCode);
 
     ResponseDto<Boolean> changeExpressMailNo(String orderId, String mailId,String mailNo);
 

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

@@ -14,7 +14,7 @@ public class LogisticsListParam implements Cloneable {
     // 回写状态: 0成功 1失败
     private int status;
     // 相关描述信息,可在erp的物流同步界面看到
-    private BigDecimal message;
+    private String message;
 
     private static final LogisticsListParam obj = new LogisticsListParam();
 

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

@@ -6,7 +6,7 @@ import lombok.Data;
 public class LogisticsSyncVo implements Cloneable {
 
     // 主键,用于logistics_sync_ack回写状态
-    private String rec_id;
+    private int rec_id;
     // 代表店铺所有属性的唯一编码，用于店铺区分，ERP内支持自定义（ERP店铺界面设置）
     private String shop_no;
     // 原始订单编号，商城或平台订单号

liquidnet-bus-config/liquidnet-config/liquidnet-service-goblin.yml

@@ -132,6 +132,7 @@ global-auth:
     - ${liquidnet.info.context}/nftGoods/payType
     - ${liquidnet.info.context}/app/mix/list
     - ${liquidnet.info.context}/app/mix/details
+    - ${liquidnet.info.context}/wdt/**
   oncheck-url-pattern:
     -
 # -----------------------------------------------------------

liquidnet-bus-feign/liquidnet-api-feign-platform/src/main/java/com/liquidnet/service/feign/platform/task/FeignPlatformErpTaskClient.java → liquidnet-bus-feign/liquidnet-api-feign-goblin/src/main/java/com/liquidnet/service/feign/goblin/task/FeignGoblinErpTaskClient.java

-package com.liquidnet.service.feign.platform.task;
+package com.liquidnet.service.feign.goblin.task;
 
 import com.liquidnet.service.base.ResponseDto;
 import feign.hystrix.FallbackFactory;
@@ -9,15 +9,22 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 @Component
 @FeignClient(
-        name = "liquidnet-service-platform",
-        contextId = "FeignPlatformErpTaskClient",
-        path = "platform",
-        url = "${liquidnet.service.platform.url}",
+        name = "liquidnet-service-goblin",
+        contextId = "FeignGoblinErpTaskClient",
+        path = "goblin",
+        url = "${liquidnet.service.goblin.url}",
         fallback = FallbackFactory.Default.class
 )
-public interface FeignPlatformErpTaskClient {
+public interface FeignGoblinErpTaskClient {
 
 
     @PostMapping("wdt/syncErpSpuStock")
-    ResponseDto<Boolean> syncErpSpuStock(@RequestParam("spuId") String spuId,@RequestParam("min") Integer min);
+    ResponseDto<Boolean> syncErpSpuStock(@RequestParam("spuId") String spuId, @RequestParam("min") Integer min);
+
+    @PostMapping("wdt/pushErpTrade")
+    ResponseDto<Boolean> pushErpTrade();
+
+    @PostMapping("wdt/syncErpLogistic")
+    ResponseDto<Boolean> syncErpLogistic();
+
 }

liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/java/com/liquidnet/service/executor/main/handler/PlatformErpTaskHandler.java

 package com.liquidnet.service.executor.main.handler;
 
-import com.liquidnet.commons.lang.util.CollectionUtil;
-import com.liquidnet.commons.lang.util.DESUtils;
-import com.liquidnet.commons.lang.util.HttpUtil;
-import com.liquidnet.service.feign.platform.task.FeignPlatformErpTaskClient;
-import com.liquidnet.service.feign.platform.task.FeignPlatformGoblinTaskClient;
+import com.liquidnet.service.feign.goblin.task.FeignGoblinErpTaskClient;
 import com.xxl.job.core.context.XxlJobHelper;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.MediaType;
 import org.springframework.stereotype.Component;
-import org.springframework.util.LinkedMultiValueMap;
 
 /**
  * platform:goblin
@@ -20,12 +12,35 @@ import org.springframework.util.LinkedMultiValueMap;
 @Component
 public class PlatformErpTaskHandler {
     @Autowired
-    private FeignPlatformErpTaskClient feignPlatformErpTaskClient;
+    private FeignGoblinErpTaskClient feignGoblinErpTaskClient;
 
+    //库存
     @XxlJob(value = "sev-platform:syncErpSpuStock")
     public void syncErpSpuStock() {
         try {
-            XxlJobHelper.handleSuccess("结果：" + feignPlatformErpTaskClient.syncErpSpuStock("",Integer.parseInt(XxlJobHelper.getJobParam())).getData());
+            XxlJobHelper.handleSuccess("结果：" + feignGoblinErpTaskClient.syncErpSpuStock("",Integer.parseInt(XxlJobHelper.getJobParam())).getData());
+        } catch (Exception e) {
+            XxlJobHelper.log(e);
+            XxlJobHelper.handleFail();
+        }
+    }
+
+    //订单
+    @XxlJob(value = "sev-platform:syncErpSpuStock")
+    public void pushErpTrade() {
+        try {
+            XxlJobHelper.handleSuccess("结果：" + feignGoblinErpTaskClient.pushErpTrade().getData());
+        } catch (Exception e) {
+            XxlJobHelper.log(e);
+            XxlJobHelper.handleFail();
+        }
+    }
+
+    //物流
+    @XxlJob(value = "sev-platform:syncErpSpuStock")
+    public void syncErpLogistic() {
+        try {
+            XxlJobHelper.handleSuccess("结果：" + feignGoblinErpTaskClient.syncErpLogistic().getData());
         } catch (Exception e) {
             XxlJobHelper.log(e);
             XxlJobHelper.handleFail();

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

@@ -46,4 +46,11 @@ public class WdtController {
         return goblinErpService.pushTrade(orderId);
     }
 
+    @PostMapping("syncErpLogistic")
+    @ApiOperation("同步物流")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<Boolean> syncErpLogistic() {
+        return goblinErpService.syncErpLogistic();
+    }
+
 }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/manage/GoblinStoreOrderController.java

@@ -135,7 +135,7 @@ public class GoblinStoreOrderController {
     public ResponseDto<Boolean> express(@RequestParam(value = "orderId", required = true) @Valid String orderId,
                                         @RequestParam(value = "orderSkuIds", required = false) @Valid String orderSkuIds,
                                         @RequestParam(value = "mailNo", required = true) @Valid String mailNo) {
-        return goblinStoreOrderService.express(orderId, orderSkuIds, mailNo, CurrentUtil.getCurrentUid());
+        return goblinStoreOrderService.express(orderId, orderSkuIds, mailNo, CurrentUtil.getCurrentUid(),"");
     }
 
     @ApiOperation(value = "修改快递单号")

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

@@ -49,7 +49,7 @@ public class GoblinImportServiceImpl implements IGoblinImportService {
                     if (mailNo == null || mailNo.equals("")) {
                         log.error("发货失败 orderId = " + orderId + "skuIds = " + skuIds + " 快递单号空");
                     }
-                    ResponseDto<Boolean> express = iGoblinStoreOrderService.express(orderId, skuIds, mailNo, CurrentUtil.getCurrentUid());
+                    ResponseDto<Boolean> express = iGoblinStoreOrderService.express(orderId, skuIds, mailNo, CurrentUtil.getCurrentUid(),"");
                     if (express.getCode().equals("0")) {
                     } else {
                         log.error("发货失败 orderId = " + orderId + "skuIds = " + skuIds + " mailNo = " + mailNo);

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

@@ -9,19 +9,18 @@ import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.erp.config.ErpWdtClient;
 import com.liquidnet.service.erp.constant.ErpEnum;
+import com.liquidnet.service.erp.param.LogisticsListParam;
 import com.liquidnet.service.erp.param.OrderListParam;
 import com.liquidnet.service.erp.param.TradeListParam;
 import com.liquidnet.service.erp.utils.ErpObjectUtil;
-import com.liquidnet.service.erp.vo.StockQueryBaseVo;
-import com.liquidnet.service.erp.vo.StockQueryVo;
-import com.liquidnet.service.erp.vo.SyncStockVo;
-import com.liquidnet.service.erp.vo.TradePushVo;
+import com.liquidnet.service.erp.vo.*;
 import com.liquidnet.service.goblin.constant.GoblinRedisConst;
 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.goblin.service.manage.IGoblinStoreOrderService;
 import com.liquidnet.service.goblin.util.GoblinRedisUtils;
+import com.liquidnet.service.goblin.util.ObjectUtil;
 import com.liquidnet.service.goblin.util.QueueUtils;
 import com.mongodb.BasicDBObject;
 import lombok.extern.slf4j.Slf4j;
@@ -53,17 +52,15 @@ public class WdtServiceImpl implements IGoblinErpService {
     @Autowired
     ErpWdtClient erpWdtClient;
     @Autowired
-    GoblinGoodsSkuMapper goblinGoodsSkuMapper;
-    @Autowired
     GoblinRedisUtils goblinRedisUtils;
     @Autowired
     MongoTemplate mongoTemplate;
     @Autowired
     MongoConverter mongoConverter;
     @Autowired
+    IGoblinStoreOrderService goblinStoreOrderService;
+    @Autowired
     QueueUtils queueUtils;
-    @Value("${liquidnet.erp.wdt.contentSize}")
-    private int contentSize;
     @Value("${liquidnet.erp.wdt.redisSize}")
     private int redisSize;
     @Value("${liquidnet.erp.wdt.store.shop_no}")
@@ -208,14 +205,13 @@ public class WdtServiceImpl implements IGoblinErpService {
             String json = erpWdtClient.execute(ErpEnum.WdtAPI.TRADE_PUSH.getUri(), param);
             TradePushVo data = JsonUtils.fromJson(json, TradePushVo.class);
             int newCount = data.getNew_count();
-            if(listOrder.size()<newCount){
+            if (listOrder.size() < newCount) {
                 log.error("同步 erp 失败 ");
             }
         }
         return ResponseDto.success();
     }
 
-
     //构建 商品订单数据
     private List<TradeListParam> goblinOrderData(String orderId, List<TradeListParam> listOrder) {
         TradeListParam tradeListParam = TradeListParam.getNew();
@@ -262,14 +258,14 @@ public class WdtServiceImpl implements IGoblinErpService {
         tradeListParam.setPay_time(orderVo.getPayTime());
         tradeListParam.setBuyer_nick(orderVo.getUserName());
         tradeListParam.setPay_id(orderVo.getPayCode());
-        if(orderVo.getOrderAttrVo().getExpressAddress().equals("")){
+        if (orderVo.getOrderAttrVo().getExpressAddress().equals("")) {
             tradeListParam.setReceiver_name("正在映画");
             tradeListParam.setReceiver_province("北京市");
             tradeListParam.setReceiver_city("北京市");
             tradeListParam.setReceiver_district("朝阳区");
             tradeListParam.setReceiver_address("广渠路 创1985园区  3-12");
             tradeListParam.setReceiver_mobile("15901093014");
-        }else {
+        } else {
             tradeListParam.setReceiver_name(orderVo.getOrderAttrVo().getExpressContacts());
             String[] address = orderVo.getOrderAttrVo().getExpressAddress().split(" ");
             if (address.length > 0) {
@@ -345,4 +341,43 @@ public class WdtServiceImpl implements IGoblinErpService {
         }
         return listOrder;
     }
+
+
+    @Override
+    public ResponseDto<Boolean> syncErpLogistic() {
+        Map<String, String> paramSync = CollectionUtil.linkMapStringString();
+        paramSync.put("shop_no", shopNo);
+        paramSync.put("limit", "100");
+        String jsonSyc = erpWdtClient.execute(ErpEnum.WdtAPI.LOGISTICS_SYNC_QUERY.getUri(), paramSync);
+        LogisticSyncBaseVo dataSyc = JsonUtils.fromJson(jsonSyc, LogisticSyncBaseVo.class);
+        //处理平台发货
+        List<LogisticsSyncVo> logisticsSyncVos = dataSyc.getTrades();
+        List<LogisticsListParam> listParams = ObjectUtil.logisticsListParam();
+        for (LogisticsSyncVo vo : logisticsSyncVos) {
+            String orderCode = vo.getTid();
+            String mailNo = vo.getLogistics_no();
+            int recId = vo.getRec_id();
+            ResponseDto<Boolean> response = goblinStoreOrderService.express("", null, mailNo, "ERP", orderCode);
+            boolean result = response.getData();
+            LogisticsListParam ack = LogisticsListParam.getNew();
+            ack.setRec_id(recId);
+            if(result){
+                ack.setStatus(0);
+                ack.setMessage("正在现场物流同步成功");
+            }else{
+                ack.setStatus(1);
+                ack.setMessage("正在现场物流同步失败");
+            }
+            listParams.add(ack);
+        }
+        //确认物流同步 ACK
+        Map<String, String> paramAck = CollectionUtil.linkMapStringString();
+        paramAck.put("shop_no", shopNo);
+        paramAck.put("limit", "100");
+        paramAck.put("logistics_list", JSON.toJSONString(listParams));
+        String jsonAck = erpWdtClient.execute(ErpEnum.WdtAPI.LOGISTICS_SYNC_ACK.getUri(), paramAck);
+        LogisticSyncAckBaseVo dataAck = JsonUtils.fromJson(jsonAck, LogisticSyncAckBaseVo.class);
+
+        return ResponseDto.success();
+    }
 }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreOrderServiceImpl.java

@@ -550,7 +550,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
     }
 
     @Override
-    public ResponseDto<Boolean> express(String orderId, String orderSkuIds, String mailNo, String uid) {
+    public ResponseDto<Boolean> express(String orderId, String orderSkuIds, String mailNo, String uid, String orderCode) {
         LocalDateTime now = LocalDateTime.now();
         String nowStr = DateUtil.getNowTime();
         LinkedList<String> sqls = CollectionUtil.linkedListString();
@@ -560,12 +560,18 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
         sqls.add(SqlMapping.get("goblin_order.store.express"));
         sqls.add(SqlMapping.get("goblin_order.store.orderSkuStatus"));
         sqls.add(SqlMapping.get("goblin_order.mail"));
-        GoblinStoreInfoVo storeInfoVo = redisUtils.getStoreInfoVoByUid(uid);
-        if (storeInfoVo == null) {
-            return ResponseDto.failure("无法查看");
+//        GoblinStoreInfoVo storeInfoVo = redisUtils.getStoreInfoVoByUid(uid);
+//        if (storeInfoVo == null) {
+//            return ResponseDto.failure("无法查看");
+//        }
+        GoblinStoreOrderVo orderVo = null;
+        if (null ==orderCode || "".equals(orderCode)) {
+            orderVo = redisUtils.getGoblinOrder(orderId);
+        } else {
+            orderVo = mongoUtils.getGoblinStoreOrderVoByCode(orderCode);
+            orderId = orderVo.getOrderId();
         }
-        GoblinStoreOrderVo orderVo = redisUtils.getGoblinOrder(orderId);
-        if (orderVo == null || !orderVo.getStoreId().equals(storeInfoVo.getStoreId())) {
+        if (orderVo == null) {//|| !orderVo.getStoreId().equals(storeInfoVo.getStoreId())
             return ResponseDto.failure("无法查看");
         }
         if (orderVo.getStatus() != GoblinStatusConst.Status.ORDER_STATUS_2.getValue()) {

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

@@ -1115,6 +1115,10 @@ public class GoblinMongoUtils {
         return mongoTemplate.insert(vo, GoblinStoreOrderVo.class.getSimpleName());
     }
 
+    public GoblinStoreOrderVo getGoblinStoreOrderVoByCode(String orderCode) {
+        return mongoTemplate.findOne(Query.query(Criteria.where("orderCode").is(orderCode)), GoblinStoreOrderVo.class, GoblinStoreOrderVo.class.getSimpleName());
+    }
+
     public UpdateResult updateGoblinStoreOrderVo(String orderId, GoblinStoreOrderVo data) {
         BasicDBObject object = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(data));
         return mongoTemplate.getCollection(GoblinStoreOrderVo.class.getSimpleName()).updateOne(

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.LogisticsListParam;
 import com.liquidnet.service.erp.param.OrderListParam;
 import com.liquidnet.service.erp.param.TradeListParam;
 import com.liquidnet.service.goblin.dto.GoblinGoodsSpecDto;
@@ -103,6 +104,7 @@ 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<LogisticsListParam> logisticsListParam = new ArrayList<>();
 
     private static final HashMap<String, String[]> mixIdMap = new HashMap();
 
@@ -110,7 +112,9 @@ public class ObjectUtil {
         return (HashMap<String, String[]>) mixIdMap.clone();
     }
 
-
+    public static ArrayList<LogisticsListParam> logisticsListParam() {
+        return (ArrayList<LogisticsListParam>) logisticsListParam.clone();
+    }
 
     public static ArrayList<CouponCountVo> couponCountVos() {
         return (ArrayList<CouponCountVo>) couponCountVos.clone();