Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentRouteOrderServiceImpl.java

@@ -172,11 +172,15 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
         }
 
         Date nowDate = new Date();
+        String orderNo = idGeneratorService.generatorId("payment") + "";
 
         studentPaymentRouteOrder.setUpdateBy(operatorId);
         studentPaymentRouteOrder.setUpdateTime(nowDate);
         studentPaymentRouteOrder.setAuditComment(memo);
         studentPaymentRouteOrder.setAuditStatus(auditStatus);
+        if (auditStatus == AuditStatusEnum.PASS) {
+            studentPaymentRouteOrder.setOrderNo(orderNo);
+        }
 
         studentPaymentRouteOrderDao.update(studentPaymentRouteOrder);
 
@@ -197,6 +201,7 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
             studentPaymentOrder.setUserId(studentPaymentRouteOrder.getUserId());
             studentPaymentOrder.setPayTime(studentPaymentRouteOrder.getPayTime());
             studentPaymentOrder.setTransNo(studentPaymentRouteOrder.getTransNo());
+            studentPaymentOrder.setOrderNo(orderNo);
 
             studentPaymentRouteOrderDao.insertOrder(studentPaymentOrder);