优化

src/main/java/com/minpay/common/action/LoginAction.java

@@ -168,6 +168,10 @@ public class LoginAction implements IMINAction {
 		if(vmEquipmentInf == null){
 			throw new MINBusinessException("机器不存在");
 		}
+		ImBranch imBranch = Service.lookup(IMINDataBaseService.class).getMybatisMapper(ImBranchMapper.class).selectByPrimaryKey(vmEquipmentInf.getBranchid());
+		if(imBranch == null){
+			throw new MINBusinessException("商户不存在");
+		}
 
 		MINActionResult result = null;
 		if("WX".equals(type)){
@@ -251,13 +255,14 @@ public class LoginAction implements IMINAction {
 		sessionUser.setEquipmentNo(equNo);
 		sessionUser.setBranchId(vmEquipmentInf.getBranchid());
 		res.setSessionId(MINServiceLocator.getInstance().lookup(IMINSessionService.class).registerSession(request, sessionUser));
-		res.set("nickName", result.get("nickName"));
+		res.set("nickName", result.get("nickName")); //用户昵称
 		res.set("headImgurl", result.get("headImgurl"));
 		res.set("equipmentAddress", vmEquipmentInf.getAddress());
 		res.set("headImeiaddr", vmEquipmentInf.getImeiAddr());
 		res.set("versionType", vmEquipmentInf.getVersionType());
 		res.set("equType", vmEquipmentInf.getEquType());
-		res.set("payment", vmEquipmentInf.getPayment());  //支付金额
+		res.set("payment", vmEquipmentInf.getPayment());
+		res.set("branchName", imBranch.getName());  //商户名称
 		return res;
 	}