商户

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

@@ -1221,6 +1221,7 @@ public class MerchantServiceImpl extends BaseServiceImpl<Merchant, String> imple
 		return dao.findMerchantSignBySummaryTime();
 	}
 
+	//保存旧模式商户
 	@Override
 	@Transactional
 	public Response saveMerchantByUsed(
@@ -1409,6 +1410,7 @@ public class MerchantServiceImpl extends BaseServiceImpl<Merchant, String> imple
 		return response;
 	}
 
+	//保存新模式商户
 	@Override
 	@Transactional
 	public Response saveMerchantByNew(
@@ -1736,6 +1738,28 @@ public class MerchantServiceImpl extends BaseServiceImpl<Merchant, String> imple
 					libJoinConsumeService.save(consume);
 				}
 	
+				//如果激活时间小于当前时间，生成激活流水。
+				if(merchant.getComputeTime()==null && merchant.getActiveTime().getTime()<=new Date().getTime()) {
+					merchant.setCurIsSummary(1);
+					merchant.setCurSummaryTime(new Date());
+					merchant.setNextSummaryTime(DateHelper.getMonthDate(merchant.getCurSummaryTime(),1));
+					this.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.setComputeNum(merchant.getCurIsSummary());
+					consume.setSignType(merchant.getSignType());
+					consume.setRemarks("激活期扣费【服务包扣费】");
+					consume.setCreateTime(new Date());
+					libJoinConsumeService.save(consume);
+				}
+				
+				
 				//调用openApi接口
 				if(StringUtils.isNotEmpty(merchant.getLibId())) {
 					DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
@@ -1762,7 +1786,7 @@ public class MerchantServiceImpl extends BaseServiceImpl<Merchant, String> imple
 	
 	
 
-
+	//保存学校模式商户
 	@Override
 	public Response saveMerchantByNew_Sc(Merchant merchant, String startTime, String endTime,
 			String activeTimeStr, String endActiveTimeStr, String password, String province, String city, String area,