zouxuan 6 年之前
父節點
當前提交
aa34bb94d1

+ 2 - 0
src/main/java/com/ym/mec/collectfee/controller/UserController.java

@@ -52,6 +52,8 @@ public class UserController extends BaseController {
             return failed("参数校验异常");
         }
         ApplyInfo userByPhone = applyInfoService.findUserByPhone(phone, clazzId);
+        School school = schoolService.get(clazzId);
+        userByPhone.setPushStatus(school.getStatus());
         return succeed(userByPhone);
     }
 

+ 1 - 1
src/main/java/com/ym/mec/collectfee/entity/RequestHead.java

@@ -26,7 +26,7 @@ public class RequestHead {
     private String ret = "xml";
 
     //加密类型 0不加密(默认),1DES加密,2专用算法1,3专用算法2,4DES加密(Ansi版, ECB模式,PKCS5)
-    private Integer encrypt = 4;
+    private Integer encrypt = 0;
 
     //签名
     private String sign;

+ 9 - 9
src/main/java/com/ym/mec/collectfee/service/impl/ApplyInfoServiceImpl.java

@@ -70,7 +70,7 @@ public class ApplyInfoServiceImpl extends BaseServiceImpl<Integer, ApplyInfo> im
 				String body = xs.toXML(applyInfo);
 				body = body.substring(body.indexOf("<user>")+6,body.indexOf("</user>"));
 				//推送mec注册接口
-				body = getBody(body,12301,null);
+				body = getBody(body,12301,null,null);
 				Date date = new Date();
 				try {
 					applyInfo.setUpdateTime(date);
@@ -81,7 +81,7 @@ public class ApplyInfoServiceImpl extends BaseServiceImpl<Integer, ApplyInfo> im
 					body = xs.toXML(applyClass);
 					body = body.substring(body.indexOf("<body>")+6,body.indexOf("</body>"));
 					//推送mec用户缴费
-					getBody(body,125218,null);
+					getBody(body,125218,null,null);
 					applyInfoDao.update(applyInfo);
 					return true;
 				}catch (Exception e){
@@ -146,7 +146,7 @@ public class ApplyInfoServiceImpl extends BaseServiceImpl<Integer, ApplyInfo> im
 			List<Branch> branchList = branchDao.findAll(null);
 			if(branchList == null || branchList.size() < 1){
 				String body = "<province>0</province>";
-				body = getBody(body,121002,null);
+				body = getBody(body,121002,null,null);
 				body = "<body><branches>" + new String(Base64.getDecoder().decode(body)) + "</branches></body>";
 				ResponseBranchesBean branches = XStreamUtil.xmlToObject("body", ResponseBranchesBean.class, body);
 				branchDao.batchInsert(branches.getBranches());
@@ -169,7 +169,7 @@ public class ApplyInfoServiceImpl extends BaseServiceImpl<Integer, ApplyInfo> im
 					break;
 				}
 				String body = "<branchId>" + branch.getBranchId() + "</branchId>";
-				body = getBody(body,121107,null);
+				body = getBody(body,121107,null,null);
 				body = "<body><schools>" + new String(Base64.getDecoder().decode(body)) + "</schools></body>";
 				ResponseSeminariesBean seminaries = XStreamUtil.xmlToObject("body", ResponseSeminariesBean.class, body);
 				if(seminaries.getSchools() == null || seminaries.getSchools().size() < 1){
@@ -221,7 +221,7 @@ public class ApplyInfoServiceImpl extends BaseServiceImpl<Integer, ApplyInfo> im
 			MecUser mecUser = mecUserDao.get(userId);
 			if(mecUser == null){
 				String body = "<body><userId>" + userId + "</userId></body>";
-				body = getBody(body, 121313,null);
+				body = getBody(body, 121313,null,null);
 				if(!StringUtils.isEmpty(body)){
 					body = new String(Base64.getDecoder().decode(body));
 					mecUser = XStreamUtil.xmlToObject("student", MecUser.class, body);
@@ -268,7 +268,7 @@ public class ApplyInfoServiceImpl extends BaseServiceImpl<Integer, ApplyInfo> im
 //				body = body+"0";
 //			}
 			byte[] encrypt = DES.encrypt(body.getBytes(), key.getBytes());
-			body = getBody(new String(encrypt), 123255, 2);
+			body = getBody(new String(encrypt), 123255, 2,1);
 			body = new String(Base64.getDecoder().decode(body),"UTF-8");
 			if(StringUtils.isEmpty(body)){
 				return false;
@@ -282,7 +282,7 @@ public class ApplyInfoServiceImpl extends BaseServiceImpl<Integer, ApplyInfo> im
 
 
 	private List<MecCourse> getCourses(String body) throws Exception{
-		body = getBody(body,123031,null);
+		body = getBody(body,123031,null,null);
 		if(StringUtils.isEmpty(body)){
 			return null;
 		}
@@ -291,11 +291,11 @@ public class ApplyInfoServiceImpl extends BaseServiceImpl<Integer, ApplyInfo> im
 		return parseMecCourse.getCourses();
 	}
 
-	private String getBody(String body,Integer cmd,Integer uid) throws Exception{
+	private String getBody(String body,Integer cmd,Integer uid,Integer encrypt) throws Exception{
 		body = Base64.getEncoder().encodeToString(body.getBytes());
 		RequestParamBean requestParamBean = new RequestParamBean();
 		requestParamBean.setBody(body);
-		requestParamBean.setHead(XStreamUtil.getOrdersHead(body,cmd,publicKey,uid));
+		requestParamBean.setHead(XStreamUtil.getOrdersHead(body,cmd,publicKey,uid,encrypt));
 		Writer writer = new StringWriter();
 		writer.write("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
 		XStream xs = new XStream();

+ 2 - 2
src/main/java/com/ym/mec/collectfee/service/impl/OrderServiceImpl.java

@@ -65,7 +65,7 @@ public class OrderServiceImpl extends BaseServiceImpl<Integer, Order> implements
 
 			body = Base64.getEncoder().encodeToString(body.getBytes());
 			requestParamBean.setBody(body);
-			requestParamBean.setHead(XStreamUtil.getOrdersHead(body,121512,publicKey,null));
+			requestParamBean.setHead(XStreamUtil.getOrdersHead(body,121512,publicKey,null,null));
 
 			xs.autodetectAnnotations(true);
 			writer = new StringWriter();
@@ -97,7 +97,7 @@ public class OrderServiceImpl extends BaseServiceImpl<Integer, Order> implements
 			String body = "<classId>" + clazzId + "</classId><schoolId>" + schoolId + "</schoolId>";
 			body = Base64.getEncoder().encodeToString(body.getBytes());
 			requestParamBean.setBody(body);
-			requestParamBean.setHead(XStreamUtil.getOrdersHead(body,124005,publicKey,null));
+			requestParamBean.setHead(XStreamUtil.getOrdersHead(body,124005,publicKey,null,null));
 			XStream xs = new XStream();
 			xs.autodetectAnnotations(true);
 			Writer writer = new StringWriter();

+ 4 - 1
src/main/java/com/ym/mec/collectfee/utils/XStreamUtil.java

@@ -16,13 +16,16 @@ public final class XStreamUtil {
 
 	}
 
-	public static RequestHead getOrdersHead(String body,Integer cmd,String publicKey,Integer uid){
+	public static RequestHead getOrdersHead(String body,Integer cmd,String publicKey,Integer uid,Integer encrypt){
 		RequestHead head = new RequestHead();
 		head.setMsgId(getRandom(7));
 		head.setCmd(cmd);
 		if(uid != null){
 			head.setUid(uid);
 		}
+		if(encrypt != null){
+			head.setEncrypt(encrypt);
+		}
 		head.setSign(XStreamUtil.getSign(head, body, publicKey));
 		return head;
 	}