商户

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

@@ -92,6 +92,7 @@ public class ApiMerchantController extends BaseController {
         		data.put("summaryTime", merchant.getComputeTime()!=null ?  format.format(merchant.getComputeTime()) : "");
         		data.put("endSummaryTime", merchant.getComputeTime()!=null ? format.format(DateHelper.getMonthDate(merchant.getComputeTime(),merchant.getLibServiceMonth())) : "");
         		data.put("signType", merchant.getSignType());
+        		data.put("mealType", merchant.getMealType());
         		data.put("libService", merchant.getLibService());
 	            responseEntity.success(data, "获取商户套餐信息成功");
         	}else {

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 signType,Integer num,String endTime) {
+	public static void openApiServiceCRM(Integer type,String libId,Integer signType,Integer mealType,Integer num,String startActiveTime,String computeTime,String endTime) {
 		try {
 			
 			String host=PropertiesUtil.getValue("API_OPEN_URL");
@@ -35,7 +35,10 @@ public class RequestOpenApiUtils {
 			json.put("type", type);
 			json.put("libId", libId);
 			json.put("signType", signType);
+			json.put("mealType", mealType);
 			json.put("num", num);
+			json.put("activateTime", startActiveTime);
+			json.put("beginTime", computeTime);
 			json.put("endTime", endTime);
 		
 			logger.info("调用第三方接口【dealServiceCRM】，请求URL："+url);

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

@@ -1420,6 +1420,7 @@ public class MerchantServiceImpl extends BaseServiceImpl<Merchant, String> imple
 				
 				boolean isLibId=false;
 				boolean isSignType=false;
+				boolean isMealType=false;
 				boolean isServiceMonth=false;
 				Merchant oldmerchant =this.getById(merchant.getId());
 				
@@ -1443,6 +1444,9 @@ public class MerchantServiceImpl extends BaseServiceImpl<Merchant, String> imple
 				if(!oldmerchant.getSignType().equals(merchant.getSignType())) {
 					isSignType=true;
 				}
+				if(!oldmerchant.getMealType().equals(merchant.getMealType())) {
+					isMealType=true;
+				}
 				if(!oldmerchant.getLibServiceMonth().equals(merchant.getLibServiceMonth())) {
 					isServiceMonth=true;
 				}
@@ -1561,7 +1565,7 @@ public class MerchantServiceImpl extends BaseServiceImpl<Merchant, String> imple
 				}
 				
 				
-				if(isSignType || isServiceMonth || isLibId) {
+				if(isSignType || isMealType || isServiceMonth || isLibId) {
 					
 					if(isSignType || isServiceMonth) {
 						//记录套餐更改记录
@@ -1586,8 +1590,11 @@ public class MerchantServiceImpl extends BaseServiceImpl<Merchant, String> imple
 							3,
 							oldmerchant.getLibId(), 
 							oldmerchant.getSignType(),
+							oldmerchant.getMealType(),
 							oldmerchant.getLibService(),
-							format.format(DateHelper.getMonthDate(oldmerchant.getComputeTime(),oldmerchant.getLibServiceMonth())));
+							oldmerchant.getStartActiveTime()!=null ? format.format(oldmerchant.getStartActiveTime()) : "",
+							oldmerchant.getComputeTime()!=null ? format.format(oldmerchant.getComputeTime()) : "",
+							oldmerchant.getComputeTime()!=null ? format.format(DateHelper.getMonthDate(oldmerchant.getComputeTime(),oldmerchant.getLibServiceMonth())) : "");
 				}
 				
 				
@@ -1742,8 +1749,11 @@ public class MerchantServiceImpl extends BaseServiceImpl<Merchant, String> imple
 							3,
 							merchant.getLibId(), 
 							merchant.getSignType(),
+							merchant.getMealType(),
 							merchant.getLibService(),
-							format.format(DateHelper.getMonthDate(merchant.getComputeTime(),merchant.getLibServiceMonth())));
+							merchant.getStartActiveTime()!=null ? format.format(merchant.getStartActiveTime()) : "",
+							merchant.getComputeTime()!=null ? format.format(merchant.getComputeTime()) : "",
+							merchant.getComputeTime()!=null ? format.format(DateHelper.getMonthDate(merchant.getComputeTime(),merchant.getLibServiceMonth())) : "");
 				}
 				
 				this.syncRecordByMerchant(curadmin.getLoginName(), merchant.getId(),"", "新增套餐商户");

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

@@ -1,5 +1,7 @@
 package com.ssj.service.sys.fx.service.impl;
 
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -110,13 +112,17 @@ public class MerchantSignServiceImpl extends BaseServiceImpl<MerchantSign, Strin
 					consume.setCreateTime(new Date());
 					libJoinConsumeService.save(consume);
 					
+					DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
 					//调用openApi接口
 					libVipServiceService.openApiServiceCRM(
 							1,
 							merchant.getLibId(), 
 							merchant.getSignType(),
+							merchant.getMealType(),
 							merchant.getLibService(),
-							null);
+							merchant.getStartActiveTime()!=null ? format.format(merchant.getStartActiveTime()) : "",
+							merchant.getComputeTime()!=null ? format.format(merchant.getComputeTime()) : "",
+							merchant.getComputeTime()!=null ? format.format(DateHelper.getMonthDate(merchant.getComputeTime(),merchant.getLibServiceMonth())) : "" );
 				} catch (Exception e) {
 					e.printStackTrace();
 					logger.error("1：处理加油包过期数据，异常："+e.getMessage());
@@ -144,14 +150,17 @@ public class MerchantSignServiceImpl extends BaseServiceImpl<MerchantSign, Strin
 					consume.setCreateTime(new Date());
 					libJoinConsumeService.save(consume);
 					
-					
+					DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
 					//调用openApi接口
 					libVipServiceService.openApiServiceCRM(
 							1,
 							merchant.getLibId(), 
 							merchant.getSignType(),
+							merchant.getMealType(),
 							merchant.getLibService(),
-							null);
+							merchant.getStartActiveTime()!=null ? format.format(merchant.getStartActiveTime()) : "",
+							merchant.getComputeTime()!=null ? format.format(merchant.getComputeTime()) : "",
+							merchant.getComputeTime()!=null ? format.format(DateHelper.getMonthDate(merchant.getComputeTime(),merchant.getLibServiceMonth())) : "" );
 					
 				} catch (Exception e) {
 					e.printStackTrace();
@@ -510,13 +519,17 @@ public class MerchantSignServiceImpl extends BaseServiceImpl<MerchantSign, Strin
 				//同步商户表与机构表
 				this.syncMerchantByLibJoin(merchant);
 				
+				DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
 				//调用openApi接口
 				libVipServiceService.openApiServiceCRM(
 						1,
 						merchant.getLibId(), 
 						merchant.getSignType(),
+						merchant.getMealType(),
 						merchant.getLibService(),
-						null);
+						merchant.getStartActiveTime()!=null ? format.format(merchant.getStartActiveTime()) : "",
+						merchant.getComputeTime()!=null ? format.format(merchant.getComputeTime()) : "",
+						merchant.getComputeTime()!=null ? format.format(DateHelper.getMonthDate(merchant.getComputeTime(),merchant.getLibServiceMonth())) : "" );
 			}
 		}
 		

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 signType,Integer num,String endTime);
+    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);
     

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

@@ -1809,8 +1809,8 @@ public class LibVipServiceServiceImpl extends BaseServiceImpl<LibVipService, Str
 	
 
 	@Override
-	public void openApiServiceCRM(Integer type,String libId,Integer signType,Integer num,String endTime) {
-		RequestOpenApiUtils.openApiServiceCRM(type, libId,signType, num, endTime);
+	public void openApiServiceCRM(Integer type,String libId,Integer signType,Integer mealType,Integer num,String startActiveTime,String computeTime,String endTime) {
+		RequestOpenApiUtils.openApiServiceCRM(type, libId,signType,mealType, num, startActiveTime, computeTime, endTime);
 	}