Merge remote-tracking branch 'origin/system_fee' into system_fee

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

@@ -215,7 +215,6 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
 			if (userCashAccount.getBalance().subtract(amount).doubleValue() >= 0) {
 				studentPaymentOrder.setActualAmount(BigDecimal.ZERO);
 				studentPaymentOrder.setBalancePaymentAmount(amount);
-				studentPaymentOrder.setStatus(DealStatusEnum.SUCCESS);
 				sysUserCashAccountService.updateBalance(userId, amount.negate(), PlatformCashAccountDetailTypeEnum.PAY_FEE, "购买会员");
 
 			} else {

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

@@ -150,16 +150,9 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
 		String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
 
 		if (cashAmount.compareTo(BigDecimal.ZERO) == 0) {
-            studentPaymentOrder.setStatus(DealStatusEnum.SUCCESS);
-            studentPaymentOrder.setRoutingOrganId(studentPaymentOrder.getOrganId());
-            studentPaymentOrder.setUpdateTime(date);
-            studentPaymentOrder.setPayTime(date);
-            update(studentPaymentOrder);
 
 			studentPaymentRouteOrderService.addRouteOrder(studentPaymentOrder.getOrderNo(), studentPaymentOrder.getOrganId(), balance);
 
-			callOrderCallBack(studentPaymentOrder);
-
 			Map<String, String> notifyMap = new HashMap<>(4);
 			notifyMap.put("tradeState", "1");
 			notifyMap.put("merOrderNo", studentPaymentOrder.getOrderNo());