update:推送微信发货留存手动触发接口

fengliang
1 parent c136701e
Showing 4 changed files with 43 additions and 10 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/api/OrderController.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/OrderService.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderDeliveryServiceImpl.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderServiceImpl.java
@@ -774,4 +774,21 @@ public class OrderController {
         }
     }
+    /**
+     * 查询核销状态
+     * @param orderDto
+     * @return
+     */
+    @RequestMapping(value = "/sendToWeChatDelivery",method = {RequestMethod.POST},produces="application/json;charset=UTF-8")
+    public Message sendToWeChatDelivery(@RequestBody   OrderGetDto orderDto){
+        try{
+            return Message.success(orderService.SendToWeChatPay(orderDto));
+        }catch (PlatformServiceException pe) {
+            LOGGER.warn("服务异常{}:{}",pe.getCode(), pe.getMessage());
+            return Message.failure("服务暂时不在线，请稍后");
+        }
+    }
+
+
+
 }
@@ -225,6 +225,13 @@ public interface OrderService {
      * @param weChatPayTradeBackDto
      */
     List<Order> wxChatPayCallBack(WeChatPayTradeCallBackDto weChatPayTradeBackDto);
+
+    /**
+     * 测试推送发货接口
+     * @param orderDto
+     */
+    Integer SendToWeChatPay(OrderGetDto orderDto);
+
     /**
      * 微信支付失败回调
      * @param weChatPayTradeBackDto
@@ -148,11 +148,7 @@ public class OrderDeliveryServiceImpl implements OrderDeliveryService {
         WeChatPayFunctionDto weChatPayFunctionDto = new WeChatPayFunctionDto();
         weChatPayFunctionDto.setMarketId(marketId);
         weChatPayFunctionDto.setPaymentId(paymentId);
-        if(OrderAchieveType.BUYER_SELF.getCodeInteger().equals(deliveryType)){
-            weChatPayFunctionDto.setLogisticsType(WeChatPayDeliverType.SELF_GET.getCode());
-        }else{
-            weChatPayFunctionDto.setLogisticsType(WeChatPayDeliverType.MARKET_SEND.getCode());
-        }
+        weChatPayFunctionDto.setLogisticsType(deliveryType);
         return weChatPayRpcResolver.deliver(weChatPayFunctionDto);
     }
@@ -938,6 +938,23 @@ public class OrderServiceImpl implements OrderService {
         return orderList;
     }
+    @Override
+    public Integer SendToWeChatPay(OrderGetDto orderDto){
+        Order order = getOneOrder(orderDto);
+        if(order.getDeliverySendState()==null||
+                !OrderConstant.SEND_TO_DELIVERY_SUCCESS.equals(order.getDeliverySendState())){
+            OrderPayment orderPayment = orderPaymentService.getOrderPaymentById(order.getId(), order.getMarketId(), OrderPaymentState.FINISH_PAY.getCodeInteger());
+            if(OrderPaymentAllChannel.BUYER_WX_CHANNEL.getCodeInteger().equals(orderPayment.getPayChannel())){
+                Integer sendState = sendToWeChatPayDeliver(order.getMarketId(), orderPayment.getTradeId(), WeChatPayDeliverType.MARKET_SEND.getCode());
+                orderMapper.updateDeliverySendStateByPaymentId(sendState,orderPayment.getTradeId());
+                return sendState;
+            }
+        }else{
+            return OrderConstant.SEND_TO_DELIVERY_SUCCESS;
+        }
+        return OrderConstant.SEND_TO_DELIVERY_FAIL;
+    }
+
     private Integer sendToWeChatPayDeliver(Long marketId, String paymentId, Integer deliveryType) {
         Message<WeChatPayInfoDto> weChatPayInfoDtoMessage = sendToPayRpcDeliver(marketId, paymentId, deliveryType);
         if(!weChatPayInfoDtoMessage.getCode().equals(200)){
@@ -951,11 +968,7 @@ public class OrderServiceImpl implements OrderService {
         WeChatPayFunctionDto weChatPayFunctionDto = new WeChatPayFunctionDto();
         weChatPayFunctionDto.setMarketId(marketId);
         weChatPayFunctionDto.setPaymentId(paymentId);
-        if(OrderAchieveType.BUYER_SELF.getCodeInteger().equals(deliveryType)){
-            weChatPayFunctionDto.setLogisticsType(WeChatPayDeliverType.SELF_GET.getCode());
-        }else{
-            weChatPayFunctionDto.setLogisticsType(WeChatPayDeliverType.MARKET_SEND.getCode());
-        }
+        weChatPayFunctionDto.setLogisticsType(deliveryType);
         return weChatPayRpcResolver.deliver(weChatPayFunctionDto);
     }