调整充值接口

src/main/java/com/minpay/shouhuo/orderaction/PayManageAction.java

@@ -23,6 +23,7 @@ import com.startup.minpay.frame.session.MINSession;
 import com.startup.minpay.frame.target.MINAction;
 import com.startup.minpay.frame.target.MINComponent;
 import com.startup.minpay.frame.target.MINParam;
+import io.netty.util.internal.StringUtil;
 
 import java.util.List;
 import java.util.Map;
@@ -142,6 +143,18 @@ public class PayManageAction implements IMINAction {
 //		IAccountService service = Service.lookup(IAccountService.class);
 //		service.modfiyAccount(user.getChannel(), user.getId(), "01", rechargeAmt, "00", payMentInf.getFlowno(), "充值","");
 
+
+		//查询机器所属机构的收款账户
+		String payeeNo = vmEquipmentInf.getPayeeNo();
+		if(StringUtil.isNullOrEmpty(payeeNo)){
+			throw new MINBusinessException("商户收款账户异常");
+		}
+		VmHlAccount vmHlAccount = Service.lookup(IMINDataBaseService.class).getMybatisMapper(VmHlAccountMapper.class).selectByPrimaryKey(payeeNo);
+		String accNo = vmHlAccount.getNumber();
+		if(StringUtil.isNullOrEmpty(accNo)){
+			throw new MINBusinessException("商户收款账户异常");
+		}
+
 		Map<String, Object> resMap = null;
 		try {
 			VmPaymentInf paymentInf = new VmPaymentInf();
@@ -157,14 +170,7 @@ public class PayManageAction implements IMINAction {
 				String branchid = equipmentInf.getBranchid();
 				//查询商户开通了那个支付渠道
 				String pay_channel = Service.lookup(IPublicService.class).getSysParValue( "PAY_CHANNEL");
-				//查询机器所属机构
-				VmAccountExample accExp = new VmAccountExample();
-				accExp.createCriteria().andChannelEqualTo(user.getChannel()).andUsridEqualTo(branchid).andTypeEqualTo(pay_channel);
-				List<VmAccount> accList = Service.lookup(IMINDataBaseService.class).getMybatisMapper(VmAccountMapper.class).selectByExample(accExp);
-				if(accList.size() != 1 ){
-					throw new MINBusinessException("商户收款账户异常");
-				}
-				String accNo = accList.get(0).getNumber();
+
 
 				//支付后台回调地址
 				String notify_url = Service.lookup(IPublicService.class).getSysParValue(user.getChannel() + "_SHOUHUO_NOTIFY_URL");