商户相关

src/main/java/com/ssj/dao/sys/fx/dao/MerchantSignDao.java

@@ -1,5 +1,6 @@
 package com.ssj.dao.sys.fx.dao;
 
+import java.util.Date;
 import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -14,10 +15,13 @@ public interface MerchantSignDao extends JpaRepository<MerchantSign, String> {
 	@Query(nativeQuery = true, value = " SELECT * FROM `fx_merchant_sign` t WHERE t.`status`=0 AND TO_DAYS(t.end_sign_time)=TO_DAYS(NOW())  ")
 	public List<MerchantSign> findMerchantSignByEndTime();
 	
-	@Query(nativeQuery = true, value = " SELECT * FROM `fx_merchant_sign` t WHERE t.`status`=0 AND TO_DAYS(t.sign_time)=TO_DAYS(NOW())  ")
+	@Query(nativeQuery = true, value = " SELECT * FROM `fx_merchant_sign` t WHERE t.`status`=2 AND TO_DAYS(t.sign_time)=TO_DAYS(NOW())  ")
 	public List<MerchantSign> findMerchantSignByStartTime();
 	
-	@Query(nativeQuery = true, value = " SELECT * FROM `fx_merchant_sign` t WHERE t.merchant_id=?1 and t.`status`=?2   ")
-	public List<MerchantSign> findMerchantSignByMerchantId(String merchantId,Integer status);
+	@Query(nativeQuery = true, value = " SELECT * FROM `fx_merchant_sign` t WHERE t.merchant_id=?1 and t.`status` in (0,2)   ")
+	public List<MerchantSign> findMerchantSignByMerchantId(String merchantId);
+	
+	@Query(nativeQuery = true, value = " SELECT * FROM `fx_merchant_sign` t WHERE t.merchant_id=?1 and TO_DAYS(t.sign_time)>=TO_DAYS(?2) and t.`status`=?3   ")
+	public List<MerchantSign> findMerchantSignByMerchantIdGTTime(String merchantId,Date computeTime,Integer status);
 	
 }

src/main/java/com/ssj/service/sys/fx/service/MerchantSignService.java

@@ -1,5 +1,6 @@
 package com.ssj.service.sys.fx.service;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -22,7 +23,8 @@ public interface MerchantSignService extends BaseService<MerchantSign, String> {
 	void insertMerchantSignAndSync(String merchantId,Integer signType,Integer num);
 	
 	//查出商户有效的加油包
-	List<MerchantSign> findMerchantSignByMerchantId(String merchantId,Integer status);
+	List<MerchantSign> findMerchantSignByMerchantId(String merchantId);
+	List<MerchantSign> findMerchantSignByMerchantIdGTTime(String merchantId,Date computeTime,Integer status);
 	
 	//加油包明细列表
 	Page<Map<String, Object>> findMerchantSignByPage(Map<String, Object> params, Pageable initPage);

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

@@ -1519,7 +1519,7 @@ public class MerchantServiceImpl extends BaseServiceImpl<Merchant, String> imple
 				
 				//如果修改了套餐的模式，就重新处理数据 加油包
 				if(!oldmerchant.getSignType().equals(merchant.getSignType())) {
-					List<MerchantSign> merchantSigns=merchantSignService.findMerchantSignByMerchantId(merchant.getId(),0);
+					List<MerchantSign> merchantSigns=merchantSignService.findMerchantSignByMerchantIdGTTime(oldmerchant.getId(),oldmerchant.getComputeTime(),0);
 					Integer signNum=0;
 					for (MerchantSign merchantSign : merchantSigns) {
 						signNum=signNum+merchantSign.getLibService();

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

@@ -133,6 +133,10 @@ public class MerchantSignServiceImpl extends BaseServiceImpl<MerchantSign, Strin
 			List<MerchantSign> merchantStartSigns=dao.findMerchantSignByStartTime();
 			for (MerchantSign merchantSign : merchantStartSigns) {
 				try {
+					merchantSign.setStatus(0);
+					merchantSign.setUpdateTime(new Date());
+					this.save(merchantSign);
+					
 					Merchant merchant = merchantService.getById(merchantSign.getMerchantId());
 					merchant.setLibService(merchant.getLibService()+merchantSign.getLibService());
 					merchantService.save(merchant);
@@ -336,7 +340,7 @@ public class MerchantSignServiceImpl extends BaseServiceImpl<MerchantSign, Strin
 							
 							this.syncMerchantByLibJoin(merchant);
 							
-							List<MerchantSign> signs=this.findMerchantSignByMerchantId(merchant.getId(), 0);
+							List<MerchantSign> signs=this.findMerchantSignByMerchantId(merchant.getId());
 							for (MerchantSign merchantSign : signs) {
 								merchantSign.setRemarks("套餐过期引起加油包过期");
 								merchantSign.setStatus(1);
@@ -392,9 +396,12 @@ public class MerchantSignServiceImpl extends BaseServiceImpl<MerchantSign, Strin
 		Merchant merchant = merchantService.getById(merchantId);
 		List<MerchantSign> merchantSigns=new ArrayList<MerchantSign>();
 		
+		//开始计费时间是否大等于今天。
+		boolean isGTDay=false;
 		Date computeTime=merchant.getComputeTime();
-		if(computeTime.getTime()<new Date().getTime()) {
+		if(computeTime.getTime()<=new Date().getTime()) {
 			computeTime=new Date();
+			isGTDay=true;
 		}
 
 		String remarks="加油包开通【新模式】";
@@ -408,7 +415,12 @@ public class MerchantSignServiceImpl extends BaseServiceImpl<MerchantSign, Strin
 				merchantSign.setMerchantId(merchantId);
 				merchantSign.setSignType(signType);
 				merchantSign.setNum(1);
-				merchantSign.setStatus(0);
+				if(isGTDay && i==1) {
+					merchantSign.setStatus(0);
+				}else {
+					merchantSign.setStatus(2);
+				}
+				
 				merchantSign.setCreateTime(new Date());
 				merchantSign.setLibService(10);
 				
@@ -424,7 +436,11 @@ public class MerchantSignServiceImpl extends BaseServiceImpl<MerchantSign, Strin
 			merchantSign.setMerchantId(merchantId);
 			merchantSign.setSignType(signType);
 			merchantSign.setNum(num);
-			merchantSign.setStatus(0);
+			if(isGTDay) {
+				merchantSign.setStatus(0);
+			}else {
+				merchantSign.setStatus(2);
+			}
 			merchantSign.setCreateTime(new Date());
 			merchantSign.setLibService(10);
 			
@@ -475,7 +491,7 @@ public class MerchantSignServiceImpl extends BaseServiceImpl<MerchantSign, Strin
 			break;
 		}
 		
-		if(merchant.getComputeTime().getTime()<new Date().getTime()) {
+		if(merchant.getComputeTime().getTime()<=new Date().getTime()) {
 			TbLibJoinConsume consume=null;
 			switch (signType) {
 			case 4:
@@ -548,14 +564,19 @@ public class MerchantSignServiceImpl extends BaseServiceImpl<MerchantSign, Strin
 	}
 
 	@Override
-	public List<MerchantSign> findMerchantSignByMerchantId(String merchantId, Integer status) {
-		return dao.findMerchantSignByMerchantId(merchantId, status);
+	public List<MerchantSign> findMerchantSignByMerchantId(String merchantId) {
+		return dao.findMerchantSignByMerchantId(merchantId);
 	}
 
 	@Override
 	public Page<Map<String, Object>> findMerchantSignByPage(Map<String, Object> params, Pageable initPage) {
 		return queryDao.findMerchantSignByPage(params, initPage);
 	}
+
+	@Override
+	public List<MerchantSign> findMerchantSignByMerchantIdGTTime(String merchantId, Date computeTime, Integer status) {
+		return dao.findMerchantSignByMerchantIdGTTime(merchantId, computeTime, status);
+	}
 	
 
 }

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

@@ -480,6 +480,8 @@ public class FxController  extends BaseController {
 	        		map.put("status","服务中");
 	        	}else 	if(map.get("status").toString().equals("1")) {
 	        		map.put("status","已结束");
+	        	}else 	if(map.get("status").toString().equals("2")) {
+	        		map.put("status","未激活");
 	        	}
 	     	}
     		List<ExcelColumn> myColumns3 = new ArrayList<ExcelColumn>();

src/main/resources/templates/sys/fx/merchantSignList.html

@@ -83,8 +83,9 @@
 					<td th:text="${#calendars.format(item.sign_time,'yyyy-MM-dd')}" ></td>  
 					<td th:text="${#calendars.format(item.end_sign_time,'yyyy-MM-dd')}" ></td>  
 					<td  th:switch="${item.status}">
-					   <span th:case="0" >服务中</span>
-					   <span th:case="1" style="color:red">已结束</span>
+					   <span th:case="0" style="color:red">服务中</span>
+					   <span th:case="1" >已结束</span>
+					   <span th:case="2" >未激活</span>
 					</td>
 					<td th:text="${#calendars.format(item.create_time,'yyyy-MM-dd HH:mm:ss')}" ></td>  
 					<td th:text="${item.remarks}" ></td>