bug

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

@@ -5417,12 +5417,10 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                 }
             }
         }
-        if(!"36".equals(user.getOrganId())){
-            try {
-                contractService.register(user.getId(),user.getRealName(),user.getIdCardNo(),user.getPhone());
-            } catch (Exception e) {
-                LOGGER.error("[{}]小课购买协议生成错误：{}", practiceGroup.getId(), e.getCause());
-            }
+        try {
+            contractService.register(user.getId(),user.getRealName(),user.getIdCardNo(),user.getPhone());
+        } catch (Exception e) {
+            LOGGER.error("[{}]小课购买协议生成错误：{}", practiceGroup.getId(), e.getCause());
         }
 
         String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");

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

@@ -2705,18 +2705,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 		BigDecimal amount=studentPaymentOrder.getActualAmount();
 		BigDecimal balance = BigDecimal.ZERO;
-		if("36".equals(user.getOrganId())){
-			studentPaymentRouteOrderService.addRouteOrder(orderNo, vipGroup.getOrganId(), amount);
-			studentPaymentOrder.setPaymentChannel("BALANCE");
-			studentPaymentOrder.setActualAmount(new BigDecimal(0));
-			studentPaymentOrder.setBalancePaymentAmount(amount);
-			studentPaymentOrder.setStatus(DealStatusEnum.SUCCESS);
-			studentPaymentOrder.setUpdateTime(date);
-			this.orderCallback(studentPaymentOrder);
-			Map<String,Object> result=new HashMap<>();
-			result.put("orderNo",studentPaymentOrder.getOrderNo());
-			return BaseController.succeed(result);
-		}else if(vipGroupBuyParams.isUseBalancePayment() || amount.doubleValue() == 0){
+		if(vipGroupBuyParams.isUseBalancePayment() || amount.doubleValue() == 0){
 			SysUserCashAccount userCashAccount = sysUserCashAccountService.getLocked(user.getId());
 			if(userCashAccount == null){
 				throw new BizException("用户账户找不到");
@@ -2752,12 +2741,10 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				}
 			}
 		}
-		if(!"36".equals(user.getOrganId())){
-			try {
-				contractService.register(user.getId(),user.getRealName(),user.getIdCardNo(),user.getPhone());
-			} catch (Exception e) {
-				LOGGER.error("[{}]小课购买协议生成错误：{}", vipGroup.getId(), e.getCause());
-			}
+		try {
+			contractService.register(user.getId(),user.getRealName(),user.getIdCardNo(),user.getPhone());
+		} catch (Exception e) {
+			LOGGER.error("[{}]小课购买协议生成错误：{}", vipGroup.getId(), e.getCause());
 		}
 
 		String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");