alipay

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/AliPayController.java

@@ -58,10 +58,10 @@ public class AliPayController {
 	@RequestMapping(value = "/aliPayOrder/{billInvoiceId}",method = RequestMethod.GET)
 	public ResponseBean wxUnifiedOrder(@PathVariable("billInvoiceId") Integer billInvoiceId, HttpSession session){
 		ResponseBean responseBean = new ResponseBean();
-		//UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
 		String resp = "";
 		try {
-			resp = aliPayService.AliPayOrder(1,null);
+			resp = aliPayService.AliPayOrder(billInvoiceId,userElement);
 		} catch (Exception e) {
 			e.printStackTrace();
 			responseBean.addError(e.getMessage());

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/AliPayServiceImpl.java

@@ -72,23 +72,23 @@ public class AliPayServiceImpl implements AliPayServiceI {
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public String AliPayOrder(Integer billInvoiceId, UserElement userElement) throws Exception {
-		//Integer userId = userElement.getId();
-		//
-		//// 如果是家属/租客, 应该用业主的用户id
-		//TaUser taUser = taUserMapper.selectByPrimaryKey(userId);
-		//TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(userId);
-		//if (null != taSysRole && taSysRole.getId().intValue() != 1) {
-		//	TaUser ownerUser = taUserMapper.selectByPrimaryKey(taUser.getParentId());
-		//	userId = ownerUser.getId();
-		//}
-		//
-		////获取支付金额
-		//TpBillInvoice tpBillInvoice = tpBillInvoiceMapper.selectByIdAndUserId(billInvoiceId,userId,userElement.getCommunityId());
-		//if (null == tpBillInvoice){
-		//	throw new Exception("订单不存在");
-		//}else if (!tpBillInvoice.getBillStatus().equals("3")){
-		//	throw new Exception("不是正在支付的订单");
-		//}
+		Integer userId = userElement.getId();
+
+		// 如果是家属/租客, 应该用业主的用户id
+		TaUser taUser = taUserMapper.selectByPrimaryKey(userId);
+		TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(userId);
+		if (null != taSysRole && taSysRole.getId().intValue() != 1) {
+			TaUser ownerUser = taUserMapper.selectByPrimaryKey(taUser.getParentId());
+			userId = ownerUser.getId();
+		}
+
+		//获取支付金额
+		TpBillInvoice tpBillInvoice = tpBillInvoiceMapper.selectByIdAndUserId(billInvoiceId,userId,userElement.getCommunityId());
+		if (null == tpBillInvoice){
+			throw new Exception("订单不存在");
+		}else if (!tpBillInvoice.getBillStatus().equals("3")){
+			throw new Exception("不是正在支付的订单");
+		}
 		
 		//下单
 		AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", ALI_APP_ID, APP_PRIVATE_KEY, "json", CHARSET_UTF8, ALIPAY_PUBLIC_KEY, "RSA2");
@@ -98,8 +98,7 @@ public class AliPayServiceImpl implements AliPayServiceI {
 		AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
 		model.setBody("我是测试数据");
 		model.setSubject("App支付测试Java");
-		//model.setOutTradeNo(tpBillInvoice.getOutTradeNo());
-		model.setOutTradeNo("1");
+		model.setOutTradeNo(tpBillInvoice.getOutTradeNo());
 		model.setTimeoutExpress("30m");
 		model.setTotalAmount("0.01");
 		model.setProductCode("QUICK_MSECURITY_PAY");