Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -118,7 +118,7 @@ public class OperatingReportServiceImpl extends BaseServiceImpl<Integer, Operati
         //3.6、零星收费（不是充值部分的）
         reports.addAll(sellOrderDao.getSporadicMonthReport(startTime, endTime));
         //乐器更换
-        reports.addAll(sellOrderDao.getSubjectChangeMonthReport(startTime, endTime));
+        //reports.addAll(sellOrderDao.getSubjectChangeMonthReport(startTime, endTime));
         updateFee(organOperating, cooperationOperating, reports);
 
 //        Map<String, Object> params = new HashMap<>();

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

@@ -8,7 +8,6 @@ import com.ym.mec.biz.dal.dto.SporadicChargeInfoDto;
 import com.ym.mec.biz.dal.dto.StudentPaymentOrderExportDto;
 import com.ym.mec.biz.dal.entity.Goods;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
-import com.ym.mec.biz.dal.entity.SubjectChange;
 import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.dal.page.SporadicOrderQueryInfo;
 import com.ym.mec.biz.dal.page.StudentPaymentOrderQueryInfo;
@@ -24,6 +23,7 @@ import com.ym.mec.thirdparty.yqpay.YqPayFeignService;
 import com.ym.mec.thirdparty.yqpay.YqPayUtil;
 import com.ym.mec.util.collection.MapUtil;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -191,10 +191,6 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
                     continue;
                 }
             }
-
-            if (status.equals("pending")) {
-                orderNoList.add(payingOrder.getOrderNo());
-            }
         }
         closeOrders(orderNoList);
     }
@@ -233,7 +229,9 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             order.setMemo(rpMap.get("remarks"));
         }
         order.setStatus(status);
-        order.setTransNo(rpMap.get("orderNo"));
+        if (StringUtils.isBlank(order.getTransNo())) {
+            order.setTransNo(rpMap.get("orderNo"));
+        }
         order.setPaymentBusinessChannel(rpMap.get("channelType"));
 
         if (order.getType().equals(OrderTypeEnum.APPLY)) { //报名订单