提交

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

@@ -58,8 +58,9 @@ public interface WxPayServiceI {
 	 * 根据订单类型获取 金额 和 回调地址
 	 * @param type
 	 * @param orderNo
+	 * @param notifyType wx 微信, ali 支付宝
 	 * @return
 	 * @throws Exception
 	 */
-	Map<String,Object> getOrderPriceAndNotifyUrl(String type, String orderNo) throws Exception;
+	Map<String,Object> getOrderPriceAndNotifyUrl(String type, String orderNo, String notifyType) throws Exception;
 }

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

@@ -86,7 +86,7 @@ public class AliPayServiceImpl implements AliPayServiceI {
 	public String AliPayOrder(String outTradeNo, String type, UserElement userElement) throws Exception {
 
 		String typeName = Constant.PAY_TYPE_BILL.equals(type) ? "物业缴费" : Constant.PAY_TYPE_CAR.equals(type) ? "车缴费" : "缴费";
-		Map<String, Object> orderPriceAndNotifyUrl = wxPayServiceI.getOrderPriceAndNotifyUrl(type, outTradeNo);
+		Map<String, Object> orderPriceAndNotifyUrl = wxPayServiceI.getOrderPriceAndNotifyUrl(type, outTradeNo, "ali");
 		
 		//下单
 		AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", ALI_APP_ID, APP_PRIVATE_KEY, "json", CHARSET_UTF8, ALIPAY_PUBLIC_KEY, "RSA2");

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

@@ -98,7 +98,7 @@ public class WxPayServiceImpl implements WxPayServiceI {
 		HfWxConfig config = new HfWxConfig();
 		WXPay wxpay = new WXPay(config);
 
-		Map<String, Object> orderPriceAndNotifyUrl = getOrderPriceAndNotifyUrl(type, orderNo);
+		Map<String, Object> orderPriceAndNotifyUrl = getOrderPriceAndNotifyUrl(type, orderNo, "wx");
 
 		String typeName = Constant.PAY_TYPE_BILL.equals(type) ? "物业缴费" : Constant.PAY_TYPE_CAR.equals(type) ? "车缴费" : "缴费";
 
@@ -146,11 +146,12 @@ public class WxPayServiceImpl implements WxPayServiceI {
 	 * 根据订单类型获取 金额 和 回调地址
 	 * @param type
 	 * @param orderNo
+	 * @param notifyType wx 微信, ali 支付宝
 	 * @return
 	 * @throws Exception
 	 */
 	@Override
-	public Map<String,Object> getOrderPriceAndNotifyUrl(String type, String orderNo) throws Exception {
+	public Map<String,Object> getOrderPriceAndNotifyUrl(String type, String orderNo, String notifyType) throws Exception {
 		Map<String,Object> orderMap = Maps.newHashMap();
 
 		// 物业缴费
@@ -170,7 +171,7 @@ public class WxPayServiceImpl implements WxPayServiceI {
 			Long payPrice = billOrderList.stream().mapToLong(e -> tpBillInvoiceMapper.selectByPrimaryKey(e.getTpBillInvoiceId()).getPayPrice()).sum();
 			orderMap.put("orderNo", orderNo);
 			orderMap.put("payPrice", String.valueOf(payPrice));
-			orderMap.put("notifyUrl", payNotifyPerproties.getWxBillNotify());
+			orderMap.put("notifyUrl", "wx".equals(notifyType) ? payNotifyPerproties.getWxBillNotify() : payNotifyPerproties.getAliBillNotify());
 
 		} else if (Constant.PAY_TYPE_CAR.equals(type)) { // 车缴费
 			List<TaUserLicenseOrder> userLicenseOrders = taUserLicenseOrderMapper.selectByOrderNumber(orderNo);
@@ -188,7 +189,7 @@ public class WxPayServiceImpl implements WxPayServiceI {
 			Long payPrice = userLicenseOrders.stream().map(e -> Long.parseLong(e.getExtensionPrice())).count();
 			orderMap.put("orderNo", orderNo);
 			orderMap.put("payPrice", String.valueOf(payPrice));
-			orderMap.put("notifyUrl", payNotifyPerproties.getWxCarNotify());
+			orderMap.put("notifyUrl", "wx".equals(notifyType) ? payNotifyPerproties.getWxCarNotify() : payNotifyPerproties.getAliCarNotify());
 		}
 
 		return orderMap;