学生导入批注服务自己选择

src/main/java/com/ssj/service/sys/imlibuser/service/impl/TbClassStudentTempServiceImpl.java

@@ -366,7 +366,7 @@ public class TbClassStudentTempServiceImpl extends BaseServiceImpl<TbClassStuden
 				}
 
 				//给学生增加一个默认的永久校区批改服务
-	            libVipServiceService.insertLibServiceByType(libVip.getId(), libJoin.getId(), libJoin.getEndSignTime(), libJoin.getSignType());
+	            libVipServiceService.insertLibServiceByType(libVip.getId(), libJoin.getId(), libJoin.getEndSignTime(), libJoin.getSignType(),tbLibImStudentTemp.getCorrectType()==null?0:tbLibImStudentTemp.getCorrectType());
 				
 			} catch (Exception e) {
 				e.printStackTrace();

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

@@ -638,7 +638,7 @@ public interface LibVipServiceService extends BaseService<LibVipService, String>
      */
     void openApiServiceCRM(Integer type,String libId,Integer signType,Integer mealType,Integer num,String startActiveTime,String computeTime,String endTime);
     
-    public void insertLibServiceByType(String vipId, String libId, Date endDate, int signType);
+    public void insertLibServiceByType(String vipId, String libId, Date endDate, int signType,int correctType);
     
     public void insertLibCorrectServiceByType(String vipId, String libId, Date endDate, int signType);
 

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

@@ -1698,16 +1698,26 @@ public class LibVipServiceServiceImpl extends BaseServiceImpl<LibVipService, Str
 	
 	
 	@Override
-    public void insertLibServiceByType(String vipId, String libId, Date endDate, int signType) {
+    public void insertLibServiceByType(String vipId, String libId, Date endDate, int signType,int correctType) {
         if (signType > 0) {
             //新套餐，需要给校区服务和批改服务两个，结束时间保持一致
             //查询这个馆下有没有有效的服务
             endDate = this.getEndDate(vipId, libId);
-            //2021-02-07 深圳吴老师学校商户只给平台批改服务
-            Merchant merchant = merchantService.getMerchantByLibId(libId);
-            if(Objects.nonNull(merchant) && merchant.getPosType()==3){
+            //如果导入excel批改服务类型未指定 则按以前流程
+			if(correctType == 0){
+				//2021-02-07 深圳吴老师学校商户只给平台批改服务
+				Merchant merchant = merchantService.getMerchantByLibId(libId);
+				if(Objects.nonNull(merchant) && merchant.getPosType()==3){
+					this.insertCorrectServiceByLibIdAndType(vipId,libId,endDate);
+				}else{
+					this.insertLibCorrectService(vipId, libId, endDate);
+					this.insertLibService(vipId, libId, endDate);
+				}
+			}else if(correctType == 1){
+				//平台批改服务
 				this.insertCorrectServiceByLibIdAndType(vipId,libId,endDate);
 			}else{
+				//2校区批改
 				this.insertLibCorrectService(vipId, libId, endDate);
 				this.insertLibService(vipId, libId, endDate);
 			}

src/main/java/com/ssj/sys/controller/ImLibUserController.java

@@ -248,6 +248,9 @@ public class ImLibUserController extends BaseController {
 					if(map.containsKey("data_11")){
 						tbLibImStudentTemp.setDerver(map.get("data_11"));
 					}
+					if(map.containsKey("data_12")){
+						tbLibImStudentTemp.setCorrectType(Integer.parseInt(map.get("data_12")));
+					}
 					
 					tbLibImStudentTemps.add(tbLibImStudentTemp);