导入服务

src/main/java/com/ssj/api/request/RequestOpenApiUtils.java

@@ -24,7 +24,7 @@ public class RequestOpenApiUtils {
 	}
 	
 	//调用第三方的删除校区学生服务。
-	public static void openApiServiceCRM(Integer type,String libId,Integer num,String endTime) {
+	public static void openApiServiceCRM(Integer type,String libId,Integer signType,Integer num,String endTime) {
 		try {
 			
 			String host=PropertiesUtil.getValue("API_OPEN_URL");
@@ -34,6 +34,7 @@ public class RequestOpenApiUtils {
 			JSONObject json=new JSONObject();
 			json.put("type", type);
 			json.put("libId", libId);
+			json.put("signType", signType);
 			json.put("num", num);
 			json.put("endTime", endTime);
 		

src/main/java/com/ssj/service/sys/fx/service/impl/MerchantServiceImpl.java

@@ -1547,6 +1547,7 @@ public class MerchantServiceImpl extends BaseServiceImpl<Merchant, String> imple
 					libVipServiceService.openApiServiceCRM(
 							3,
 							oldmerchant.getLibId(), 
+							oldmerchant.getSignType(),
 							oldmerchant.getLibService(),
 							format.format(DateHelper.getMonthDate(oldmerchant.getCurSummaryTime(),oldmerchant.getLibServiceMonth())));
 				}

src/main/java/com/ssj/service/sys/fx/service/impl/MerchantSignServiceImpl.java

@@ -110,6 +110,7 @@ public class MerchantSignServiceImpl extends BaseServiceImpl<MerchantSign, Strin
 					libVipServiceService.openApiServiceCRM(
 							1,
 							merchant.getLibId(), 
+							merchant.getSignType(),
 							merchant.getLibService(),
 							null);
 					
@@ -244,6 +245,7 @@ public class MerchantSignServiceImpl extends BaseServiceImpl<MerchantSign, Strin
 		libVipServiceService.openApiServiceCRM(
 				1,
 				merchant.getLibId(), 
+				merchant.getSignType(),
 				merchant.getLibService(),
 				null);
 	}

src/main/java/com/ssj/service/weixin/sales/service/LibVipServiceService.java

@@ -635,7 +635,7 @@ public interface LibVipServiceService extends BaseService<LibVipService, String>
      * @param libId
      * @param num 降级后的服务数量
      */
-    void openApiServiceCRM(Integer type,String libId,Integer num,String endTime);
+    void openApiServiceCRM(Integer type,String libId,Integer signType,Integer num,String endTime);
     
     public void insertLibServiceByType(String vipId, String libId, Date endDate, int signType);
     

src/main/java/com/ssj/service/weixin/sales/service/impl/LibVipServiceServiceImpl.java

@@ -1696,10 +1696,8 @@ public class LibVipServiceServiceImpl extends BaseServiceImpl<LibVipService, Str
     public void insertLibServiceByType(String vipId, String libId, Date endDate, int signType) {
         if (signType > 0) {
             //新套餐，需要给校区服务和批改服务两个，结束时间保持一致
-            if (endDate == null) {
-                //查询这个馆下有没有有效的服务
-                endDate = this.getEndDate(vipId, libId);
-            }
+            //查询这个馆下有没有有效的服务
+            endDate = this.getEndDate(vipId, libId); 
             this.insertLibCorrectService(vipId, libId, endDate);
             this.insertLibService(vipId, libId, endDate);
         } else {
@@ -1712,16 +1710,14 @@ public class LibVipServiceServiceImpl extends BaseServiceImpl<LibVipService, Str
     public void insertLibCorrectServiceByType(String vipId, String libId, Date endDate, int signType) {
         if (signType > 0) {
             //新套餐，给的这个服务需要和校区服务保持一致的结束时间
-            if (endDate == null) {
-                //查询这个馆下有没有有效的服务
-                endDate = this.getEndDate(vipId, libId);
-            }
+            //查询这个馆下有没有有效的服务
+            endDate = this.getEndDate(vipId, libId);
             this.insertLibCorrectService(vipId, libId, endDate);
         } else {
             //老套餐，直接给永久服务
             this.insertLibCorrectService(vipId, libId, DateUtil.parse_yyyyMMdd("9999-01-01"));
         }
-    }
+    }   
 
     /**
      * 获取馆服务的结束时间
@@ -1813,8 +1809,8 @@ public class LibVipServiceServiceImpl extends BaseServiceImpl<LibVipService, Str
 	
 
 	@Override
-	public void openApiServiceCRM(Integer type,String libId,Integer num,String endTime) {
-		RequestOpenApiUtils.openApiServiceCRM(type, libId, num, endTime);
+	public void openApiServiceCRM(Integer type,String libId,Integer signType,Integer num,String endTime) {
+		RequestOpenApiUtils.openApiServiceCRM(type, libId,signType, num, endTime);
 	}