上传发票/邮寄发票后修改发票状态条件修改

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderInvoiceServiceImpl.java

@@ -152,8 +152,8 @@ public class OrderInvoiceServiceImpl extends ServiceImpl<OrderInvoiceMapper, Ord
             }
         }
         if(bo.getPeriodStatus()==3){
-            //已上传发票或有快递单号则为已开票
-            if(Validator.isNotEmpty(bo.getInvoiceImg())||Validator.isNotEmpty(bo.getTrackingNum())){
+            //已上传发票或有快递单号且新旧数据开票状态一样则为已开票（若开票状态不一样则为人为标记开票状态不进下面逻辑）
+            if((Validator.isNotEmpty(bo.getInvoiceImg())||Validator.isNotEmpty(bo.getTrackingNum())) && (old.getInvoiceStatus().equals(bo.getInvoiceStatus()))){
                 update.setInvoiceStatus(2);
                 update.setApplyTime(DateUtils.getNowTime());
             }