Merge branch 'master' of hyq/ccnet2.0 into master

src/main/java/com/emato/ccnet/biz/req/order/csp/Ceb311CustiomsResponse.java

@@ -44,9 +44,15 @@ public class Ceb311CustiomsResponse implements CebCustomsResponse{
             LOGGER.info("解析响应数据失败");
             return;
         }
+        OrderDto orderDto = orderCustiomsResponse.getClsOrderDto();
+        if(orderDto == null){
+            LOGGER.info("csp返回订单数据获取失败");
+            return;
+        }
+        String orderSn = orderDto.getOrderSn();
 
         //查找电子订单
-        CusOrder cusOrder = cusOrderService.findCusOrder(orderCustiomsResponse.getOrderRequest().getClsOrderDto().getOrderSn());
+        CusOrder cusOrder = cusOrderService.findCusOrder(orderSn);
         if(cusOrder == null){
             LOGGER.info("查找电子订单表数据失败");
             return;
@@ -70,13 +76,13 @@ public class Ceb311CustiomsResponse implements CebCustomsResponse{
         //对响应的数据进行处理
         if(Contants.ORDER_RESPONSE_SUCCESS.equals(orderCustiomsResponse.getCode())){
             cusOrderStatus.setSendStatus(Contants.SUCCESS_STATUS);
-            Map<String, Object> kmallMap = ImmutableMap.of("orderNo", orderCustiomsResponse.getOrderRequest().getClsOrderDto().getOrderNo(), "cusOrderFlag", Contants.SUCCESS_STATUS);
+            Map<String, Object> kmallMap = ImmutableMap.of("orderNo", orderSn, "cusOrderFlag", Contants.SUCCESS_STATUS);
             kmallOrderService.updateCusKmallOrderStatus(kmallMap);
         }
 
         if(Contants.ORDER_RESPONSE_FAIL.equals(orderCustiomsResponse.getCode())){
             cusOrderStatus.setSendStatus(Contants.FAIL_STATUS);
-            Map<String, Object> kmallMap = ImmutableMap.of("orderNo", orderCustiomsResponse.getOrderRequest().getClsOrderDto().getOrderNo(), "cusOrderFlag", Contants.FAIL_STATUS);
+            Map<String, Object> kmallMap = ImmutableMap.of("orderNo", orderSn, "cusOrderFlag", Contants.FAIL_STATUS);
             kmallOrderService.updateCusKmallOrderStatus(kmallMap);
         }
 
@@ -147,8 +153,8 @@ public class Ceb311CustiomsResponse implements CebCustomsResponse{
         LOGGER.info("海关回执 data:"+response);
 
         //解析回执数据
-        List<OrderCustiomsResponse> orderCustiomsResponseList  = JacksonUtil.fromListJson(
-                JacksonUtil.toJson(response.getData()), new TypeReference<List<OrderCustiomsResponse>>() {});
+        String data = JacksonUtil.toJson(response.getData());
+        List<OrderCustiomsResponse> orderCustiomsResponseList  = gson.fromJson(data, List.class);
 
         if(orderCustiomsResponseList == null && orderCustiomsResponseList.size() <= 0){
             LOGGER.info("解析响应数据失败");

src/main/java/com/emato/ccnet/biz/req/order/csp/Ceb311SendDateRequet.java

@@ -166,30 +166,6 @@ public class Ceb311SendDateRequet implements CebReqSendDate {
 
         return response;
     }
-    /**
-     * 发送请求并获取响应信息
-     * @param sPara
-     * @return
-     */
-    private String requestSubmit2(Map<String, String> sPara) {
-        //构造RequestBody
-        RequestBody requestBody = OkHttpUtil.buildRequestBody(sPara);
-
-        //构建Request
-        String url = cus.getOrder().get("order-url");
-        Request request = OkHttpUtil.buildRequest(url,requestBody);
-        LOGGER.info("oms的请求报文：" + request);
-        // 同步访问,返回结果字符串
-        String response = null;
-        try {
-            response = OkHttpUtil.post(request);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        return response;
-    }
-
 
     /**
      * 更新电子订单状态表
@@ -259,22 +235,9 @@ public class Ceb311SendDateRequet implements CebReqSendDate {
         request.setClsOrderDetailDto(cusOrderGoodes);
         request.setClsOrderDto(clsOrderDto);
         String cusOrderGoodesJson = JacksonUtil.toJson(request);
-        //        String json = toJson(clsOrderDto,cusOrderGoodes);
         sPara.put("data", cusOrderGoodesJson);
 
         return sPara;
     }
 
-    private String toJson(OrderDto clsOrderDto, List<CusOrderGoods> cusOrderGoodes){
-        String clsOrderDtoJson = JacksonUtil.toJson(clsOrderDto);
-        String cusOrderGoodesJson = JacksonUtil.toJson(cusOrderGoodes);
-        JSONObject object = new JSONObject();
-        JSONObject jsonObject = new JSONObject();
-        JSONArray jsonArray = new JSONArray();
-        jsonObject.put("clsOrderDto", clsOrderDtoJson);
-        jsonObject.put("cusOrderGoodes", cusOrderGoodesJson);
-        jsonArray.add(jsonObject);
-        object.put("list", jsonArray);
-        return object.toJSONString();
-    }
 }

src/main/java/com/emato/ccnet/dto/OrderCustiomsResponse.java

@@ -16,7 +16,7 @@ public class OrderCustiomsResponse implements Serializable {
     //平台状态
     private EportResultStatusDto eportResultStatusDto;
 
-    private OrderRequest clsOrderDto;
+    private OrderDto clsOrderDto;
 
 
     public String getCode() {
@@ -51,11 +51,11 @@ public class OrderCustiomsResponse implements Serializable {
         this.eportResultStatusDto = eportResultStatusDto;
     }
 
-    public OrderRequest getOrderRequest() {
+    public OrderDto getClsOrderDto() {
         return clsOrderDto;
     }
 
-    public void setOrderRequest(OrderRequest clsOrderDto) {
+    public void setClsOrderDto(OrderDto clsOrderDto) {
         this.clsOrderDto = clsOrderDto;
     }
 }

src/main/java/com/emato/ccnet/rabbitMq/RabbitMqConfig.java

@@ -24,7 +24,8 @@ public class RabbitMqConfig {
     /**
      * 消息交换机的名字
      */
-    public static final String EXCHANGE = "OMS_MQ_EXCHANGE";
+//    public static final String EXCHANGE = "OMS_MQ_EXCHANGE";
+    public static final String EXCHANGE = "e.normal.direct.oms.csp.exchange";
 
     /**
      * 配置链接信息
@@ -55,10 +56,15 @@ public class RabbitMqConfig {
         return new DirectExchange(EXCHANGE, true, false);
     }
 
+//    //ccnet获取csp海关回执数据队列key
+//    public static final String CSP_KEY_RECEIVE_MSG_SEND_OMS_ORDER_CEB311 = "CSP_KEY_RECEIVE_MSG_SEND_OMS_ORDER_CEB311";
+//    //ccnet获取csp海关回执数据队列名称
+//    public static final String CSP_QUEUE_RECEIVE_MSG_SEND_OMS_ORDER_CEB311 = "CSP_QUEUE_RECEIVE_MSG_SEND_OMS_ORDER_CEB311";
+
     //ccnet获取csp海关回执数据队列key
-    public static final String CSP_KEY_RECEIVE_MSG_SEND_OMS_ORDER_CEB311 = "CSP_KEY_RECEIVE_MSG_SEND_OMS_ORDER_CEB311";
+    public static final String CSP_KEY_RECEIVE_MSG_SEND_OMS_ORDER_CEB311 = "k.normal.csp.order.to.zw.order.response";
     //ccnet获取csp海关回执数据队列名称
-    public static final String CSP_QUEUE_RECEIVE_MSG_SEND_OMS_ORDER_CEB311 = "CSP_QUEUE_RECEIVE_MSG_SEND_OMS_ORDER_CEB311";
+    public static final String CSP_QUEUE_RECEIVE_MSG_SEND_OMS_ORDER_CEB311 = "q.normal.csp.order.to.zw.order.response";
 
     /**
      * 配置ccnet获取csp海关回执成功或申报失败消息队列

src/main/java/com/emato/ccnet/service/ccent/impl/CusOrderRespImpl.java

@@ -44,7 +44,7 @@ public class CusOrderRespImpl implements CusOrderRespService{
         CiqResultStatusDto ciqResultStatusDto = orderCustiomsResponse.getCiqResultStatusDto();
         CusResultStatusDto cusResultStatusDto = orderCustiomsResponse.getCusResultStatusDto();
         EportResultStatusDto eportResultStatusDto = orderCustiomsResponse.getEportResultStatusDto();
-        OrderDto orderRequest = orderCustiomsResponse.getOrderRequest().getClsOrderDto();
+        OrderDto orderRequest = orderCustiomsResponse.getClsOrderDto();
         String cusOrderRespSn = Contants.ZWSH + SnowflakeUtil.getSnowNextId();
         cusOrderResp.setCusOrderRespSn(cusOrderRespSn);
         cusOrderResp.setCusOrderSn(cusOrderSn);

src/main/resources/application.yml

@@ -78,7 +78,7 @@ spring:
 
   # 队列配置
   rabbitmq:
-    host: 192.168.1.68
+    host: 192.168.1.113
     port: 5672
     username: admin
     password: admin