fix 发货

netflix-service/src/main/java/com/cyksj/service/mange/impl/CmsOrderDonServiceImpl.java

@@ -62,9 +62,9 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
         orderDonWaybill.setTrackingNumber(reqSetLogisticsPost.getTrackingNumber());
         orderDonWaybill.setOrderId(reqSetLogisticsPost.getOrderId());
         orderDonWaybill.setRemark(reqSetLogisticsPost.getRemark());
+        OrderDon orderDon = getById(orderDonWaybill.getOrderId());
         if(orderDonWaybill.getId() == null){
             orderDonWaybillMapper.insert(orderDonWaybill);
-            OrderDon orderDon = getById(orderDonWaybill.getOrderId());
             orderDon.setStatus(OrderDon.Status.transport);
             updateById(orderDon);
             //发送微信模板消息
@@ -77,6 +77,10 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
                 }
             });
         }else {
+            if (orderDon.getStatus() == OrderDon.Status.hasPayment) {
+                orderDon.setStatus(OrderDon.Status.transport);
+                updateById(orderDon);
+            }
             orderDonWaybillMapper.updateById(orderDonWaybill);
         }
         return orderDonWaybill;