update:增加核销时再次确认发货

fengliang
1 parent 17b7d89e
Showing 3 changed files with 4 additions and 3 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/OrderServiceImpl.java
@@ -782,7 +782,7 @@ public class OrderController {
     @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));
+            return Message.success(orderService.sendToWeChatPay(orderDto));
         }catch (PlatformServiceException pe) {
             LOGGER.warn("服务异常{}:{}",pe.getCode(), pe.getMessage());
             return Message.failure("服务暂时不在线，请稍后");
@@ -230,7 +230,7 @@ public interface OrderService {
      * 测试推送发货接口
      * @param orderDto
      */
-    Integer SendToWeChatPay(OrderGetDto orderDto);
+    Integer sendToWeChatPay(OrderGetDto orderDto);
     /**
      * 微信支付失败回调
@@ -486,6 +486,7 @@ public class OrderServiceImpl implements OrderService {
         order.setModifier(orderOperateDto.getOperateName());
         order.setModifiedTime(null);
         updateByOnly(order);
+        sendToWeChatPay(new OrderGetDto(order.getId(),order.getCode(),order.getMarketId()));
     }
     @Transactional
@@ -939,7 +940,7 @@ public class OrderServiceImpl implements OrderService {
     }
     @Override
-    public Integer SendToWeChatPay(OrderGetDto orderDto){
+    public Integer sendToWeChatPay(OrderGetDto orderDto){
         Order order = getOneOrder(orderDto);
         if(order.getDeliverySendState()==null||
                 !OrderConstant.SEND_TO_DELIVERY_SUCCESS.equals(order.getDeliverySendState())){