重构

src/main/java/com/ssj/api/controller/ApiMerchantController.java

@@ -37,13 +37,6 @@ public class ApiMerchantController extends BaseController {
 	@Autowired
 	private MerchantService merchantService;
 	
-	@Autowired
-	private ILibJoinConsumeService  libJoinConsumeService;
-	
-	@Autowired
-	private LibVipServiceService  libVipServiceService;
-	
-	
 	//1：激活日期之前，生成一条数据为0的记录，重新设置激活日期，设置下一个结算日。
 	//注：type=1处理
 	
@@ -63,75 +56,75 @@ public class ApiMerchantController extends BaseController {
         try {
         	Merchant merchant=merchantService.getMerchantByLibId(requestVO.getLibId());
         	if(merchant!=null && merchant.getStartActiveTime()!=null) {
-        		if(merchant.getStartActiveTime().getTime()<=new Date().getTime()) {
-        			//1：激活日期之后才可以生成数据，生成一条数据为0的记录，重新设置激活日期，设置下一个结算日。
-        			List<TbLibJoinConsume> consumes=libJoinConsumeService.findTbLibJoinConsumeByStartActiveTime(merchant.getId(), merchant.getStartActiveTime());
-        			if(consumes==null || consumes.size()<=0) {
-        				logger.info("第三方调用接口【service】，商户产生激活期："+merchant.getId());
-        				
-        				if(merchant.getComputeTime()==null) {
-        					merchant.setCurIsSummary(1);
-        				}else {
-        					merchant.setCurIsSummary(0);
-        				}
-	        			merchant.setActiveTime(new Date());
-						merchant.setCurSummaryTime(new Date());
-						merchant.setNextSummaryTime(DateHelper.getMonthDate(merchant.getCurSummaryTime(),1));
-						merchantService.save(merchant);
-						
-						//记录
-						TbLibJoinConsume consume=new TbLibJoinConsume();
-						consume.setFromLibId(merchant.getLibId());
-						consume.setFromMerchantId(merchant.getId());
-						consume.setLibService(merchant.getLibService());
-						consume.setPlatformService(0);
-						consume.setType(7);
-						consume.setSignType(merchant.getSignType());
-						consume.setComputeNum(merchant.getCurIsSummary());
-						consume.setRemarks("激活期扣费【服务包扣费】-来源开放接口");
-						consume.setCreateTime(new Date());
-						libJoinConsumeService.save(consume);
-						
-						
-						if(merchant.getComputeTime()==null) {
-							DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-							//调用openApi接口
-							libVipServiceService.openApiServiceCRM(
-									3,
-									merchant.getLibId(), 
-									merchant.getSignType(),
-									merchant.getMealType(),
-									merchant.getLibService(),
-									merchant.getStartActiveTime()!=null ? format.format(merchant.getStartActiveTime()) : "",
-									merchant.getComputeTime()!=null ? format.format(merchant.getComputeTime()) : format.format(merchant.getActiveTime()),
-									merchant.getEndActiveTime()!=null ? format.format(merchant.getEndActiveTime()) :"" );
-						}
-        			}else {
-        				
-        				//自主激活的第一条都要记录，所以判断之前的数据是否有自主激活的，没有就保存一条。
-        				boolean isActive=false;
-            			for (TbLibJoinConsume tbLibJoinConsume : consumes) {
-    						if(StringUtils.isNotEmpty(tbLibJoinConsume.getRemarks()) && tbLibJoinConsume.getRemarks().contains("来源开放接口")) {
-    							isActive=true;
-    						}
-    					}
-            			if(!isActive) {
-            				//记录
-    						TbLibJoinConsume consume=new TbLibJoinConsume();
-    						consume.setFromLibId(merchant.getLibId());
-    						consume.setFromMerchantId(merchant.getId());
-    						consume.setLibService(merchant.getLibService());
-    						consume.setPlatformService(0);
-    						consume.setType(7);
-    						consume.setSignType(merchant.getSignType());
-    						consume.setComputeNum(merchant.getCurIsSummary());
-    						consume.setRemarks("激活期扣费【服务包扣费】-来源开放接口");
-    						consume.setCreateTime(new Date());
-    						libJoinConsumeService.save(consume);
-            			}
-            			
-            		}
-        		}
+//        		if(merchant.getStartActiveTime().getTime()<=new Date().getTime()) {
+//        			//1：激活日期之后才可以生成数据，生成一条数据为0的记录，重新设置激活日期，设置下一个结算日。
+//        			List<TbLibJoinConsume> consumes=libJoinConsumeService.findTbLibJoinConsumeByStartActiveTime(merchant.getId(), merchant.getStartActiveTime());
+//        			if(consumes==null || consumes.size()<=0) {
+//        				logger.info("第三方调用接口【service】，商户产生激活期："+merchant.getId());
+//        				
+//        				if(merchant.getComputeTime()==null) {
+//        					merchant.setCurIsSummary(1);
+//        				}else {
+//        					merchant.setCurIsSummary(0);
+//        				}
+//	        			merchant.setActiveTime(new Date());
+//						merchant.setCurSummaryTime(new Date());
+//						merchant.setNextSummaryTime(DateHelper.getMonthDate(merchant.getCurSummaryTime(),1));
+//						merchantService.save(merchant);
+//						
+//						//记录
+//						TbLibJoinConsume consume=new TbLibJoinConsume();
+//						consume.setFromLibId(merchant.getLibId());
+//						consume.setFromMerchantId(merchant.getId());
+//						consume.setLibService(merchant.getLibService());
+//						consume.setPlatformService(0);
+//						consume.setType(7);
+//						consume.setSignType(merchant.getSignType());
+//						consume.setComputeNum(merchant.getCurIsSummary());
+//						consume.setRemarks("激活期扣费【服务包扣费】-来源开放接口");
+//						consume.setCreateTime(new Date());
+//						libJoinConsumeService.save(consume);
+//						
+//						
+//						if(merchant.getComputeTime()==null) {
+//							DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+//							//调用openApi接口
+//							libVipServiceService.openApiServiceCRM(
+//									3,
+//									merchant.getLibId(), 
+//									merchant.getSignType(),
+//									merchant.getMealType(),
+//									merchant.getLibService(),
+//									merchant.getStartActiveTime()!=null ? format.format(merchant.getStartActiveTime()) : "",
+//									merchant.getComputeTime()!=null ? format.format(merchant.getComputeTime()) : format.format(merchant.getActiveTime()),
+//									merchant.getEndActiveTime()!=null ? format.format(merchant.getEndActiveTime()) :"" );
+//						}
+//        			}else {
+//        				
+//        				//自主激活的第一条都要记录，所以判断之前的数据是否有自主激活的，没有就保存一条。
+//        				boolean isActive=false;
+//            			for (TbLibJoinConsume tbLibJoinConsume : consumes) {
+//    						if(StringUtils.isNotEmpty(tbLibJoinConsume.getRemarks()) && tbLibJoinConsume.getRemarks().contains("来源开放接口")) {
+//    							isActive=true;
+//    						}
+//    					}
+//            			if(!isActive) {
+//            				//记录
+//    						TbLibJoinConsume consume=new TbLibJoinConsume();
+//    						consume.setFromLibId(merchant.getLibId());
+//    						consume.setFromMerchantId(merchant.getId());
+//    						consume.setLibService(merchant.getLibService());
+//    						consume.setPlatformService(0);
+//    						consume.setType(7);
+//    						consume.setSignType(merchant.getSignType());
+//    						consume.setComputeNum(merchant.getCurIsSummary());
+//    						consume.setRemarks("激活期扣费【服务包扣费】-来源开放接口");
+//    						consume.setCreateTime(new Date());
+//    						libJoinConsumeService.save(consume);
+//            			}
+//            			
+//            		}
+//        		}
 	        	
 	        	DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
         		data.put("id", merchant.getId());