支付

src/main/java/com/huiju/estateagents/controller/WxPayController.java → src/main/java/com/huiju/estateagents/controller/WxPaypaypayController.java

@@ -26,7 +26,7 @@ import java.util.Map;
 @Slf4j
 @RestController
 @RequestMapping("/api")
-public class WxPayController extends BaseController {
+public class WxPaypaypayController extends BaseController {
 
     @Autowired
     private IWxPayService wxPayService;

src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java

@@ -79,6 +79,7 @@ public class AccessInterceptor implements HandlerInterceptor {
             "/clean/buttonrole",
             "/api/admin/taPersonFromRecord",
             "/api/notify",//微信支付所有回调放过
+            "/api/wxBillNotify",//微信支付所有回调放过
             "/api/refund/",//微信退款所有回调放过
             "/api/fadd/",//所有的法大大回调放过
             "/api/third",

src/main/java/com/huiju/estateagents/property/controller/BillInvoiceController.java

@@ -94,9 +94,8 @@ public class BillInvoiceController extends BaseController {
     @RequestMapping(value = "/bill/invoice/offlinePayment", method = RequestMethod.POST)
     public ResponseBean offlinePayment(HttpServletRequest request, @RequestBody List<Integer> ids) {
         ResponseBean responseBean = new ResponseBean();
-        TaUser userElement = getTaUser(request);
 
-        responseBean = iBillInvoiceService.offlinePayment(ids, userElement);
+        responseBean = iBillInvoiceService.offlinePayment(ids, getPersonId(request));
         return responseBean;
     }
 

src/main/java/com/huiju/estateagents/property/controller/WxPayController.java

@@ -0,0 +1,202 @@
+package com.huiju.estateagents.property.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Maps;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.wxpay.WXPayConstants;
+import com.huiju.estateagents.common.wxpay.WXPayUtil;
+import com.huiju.estateagents.property.common.Constant;
+import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.service.WxPayServiceI;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Map;
+
+/**
+ * @author FXF
+ * @date 2019-02-19
+ */
+@RestController
+@RequestMapping("/api")
+@Api(value = "微信支付 API", tags = "微信支付 API")
+public class WxPayController extends BaseController {
+	private Logger log = LoggerFactory.getLogger(WxPayController.class);
+	
+	@Autowired
+	private WxPayServiceI wxPayService;
+	
+	@ApiOperation(value = "统一下单", notes = "统一下单")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataType = "Integer", name = "outTradeNo", value = "订单号"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "type", value = "订单类型： bill 表示订单，car 车缴费"),
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+	})
+	@RequestMapping(value = "/wx/wxUnifiedOrder/{outTradeNo}",method = RequestMethod.GET)
+	public ResponseBean wxUnifiedOrder(@PathVariable("outTradeNo") String outTradeNo,
+									   @RequestParam("type") String type,
+									   HttpServletRequest request){
+		ResponseBean responseBean = new ResponseBean();
+
+		Map<String, String> resp = Maps.newHashMap();
+		try {
+			resp = wxPayService.wxUnifiedOrder(outTradeNo, type, getPersonId(request));
+		} catch (Exception e) {
+			e.printStackTrace();
+			responseBean.addError(e.getMessage());
+			return responseBean;
+		}
+		log.info("调用微信支付参数: {}",resp);
+		responseBean.addSuccess(resp);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "手机订单支付完成后回调 物业缴费", notes = "手机订单支付完成后回调 物业缴费")
+	@RequestMapping(value = "/wxBillNotify",method = RequestMethod.POST)
+	public String wxBillNotify(HttpServletRequest request, HttpServletResponse response){
+		return wxNotify(request, Constant.PAY_TYPE_BILL);
+	}
+
+
+//	@ApiOperation(value = "手机订单支付完成后回调 车缴费", notes = "手机订单支付完成后回调 车缴费")
+	@RequestMapping(value = "/wxCarNotify",method = RequestMethod.POST)
+	public String wxCarNotify(HttpServletRequest request, HttpServletResponse response){
+
+		return wxNotify(request, Constant.PAY_TYPE_CAR);
+	}
+
+	/**
+	 * 微信支付回调
+	 * @param request
+	 * @param type
+	 * @return
+	 */
+	private String wxNotify(HttpServletRequest request, String type) {
+		String failResult = "<xml>" + "<return_code><![CDATA[FAIL]]></return_code>" + "<return_msg><![CDATA[失败]]></return_msg>" + "</xml> ";
+		String successResult = "<xml>" + "<return_code><![CDATA[SUCCESS]]></return_code>" + "<return_msg><![CDATA[OK]]></return_msg>" + "</xml> ";
+		InputStream inStream;
+		try {
+
+			inStream = request.getInputStream();
+			ByteArrayOutputStream outSteam = new ByteArrayOutputStream();
+			byte[] buffer = new byte[1024];
+			int len = 0;
+			while ((len = inStream.read(buffer)) != -1) {
+				outSteam.write(buffer, 0, len);
+			}
+
+			// 获取微信调用我们notify_url的返回信息
+			String result = new String(outSteam.toByteArray(), "utf-8");
+			WXPayUtil.getLogger().info("wxnotify:微信支付----result----=" + result);
+
+			// 关闭流
+			outSteam.close();
+			inStream.close();
+
+			// xml转换为map
+			Map<String, String> resultMap = WXPayUtil.xmlToMap(result);
+			if (WXPayConstants.SUCCESS.equalsIgnoreCase(resultMap.get("result_code"))) {
+				//处理业务逻辑 修改订单状态等
+				resultMap.put("pay_type","0");
+				String state = "";
+				if (Constant.PAY_TYPE_CAR.equals(type)) {
+					state = wxPayService.wxCarNotify(resultMap);
+				} else if (Constant.PAY_TYPE_BILL.equals(type)) {
+					state = wxPayService.wxBillNotify(resultMap);
+				}
+
+				if (state.equals("success")){
+					log.info("微信支付成功。。");
+					return successResult;
+				}
+			}else{
+				return failResult;
+			}
+
+		} catch (Exception e) {
+			log.error("手机支付回调通知失败",e);
+			return failResult;
+
+		}
+
+		return failResult;
+	}
+
+	
+	@ApiOperation(value = "订单查询", notes = "订单查询")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataType = "Integer", name = "outTradeNo", value = "订单号")
+	})
+	@RequestMapping(value = "/wx/wxOrderQuery/{outTradeNo}",method = RequestMethod.GET)
+	public ResponseBean wxOrderQuery(@PathVariable("outTradeNo") String outTradeNo){
+		ResponseBean responseBean = new ResponseBean();
+		Map<String, String> resp = Maps.newHashMap();
+		try {
+			resp = wxPayService.wxOrderQuery(outTradeNo);
+		} catch (Exception e) {
+			e.printStackTrace();
+			responseBean.addError("查询失败");
+			return responseBean;
+		}
+		responseBean.addSuccess(resp);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "准备开始支付", notes = "准备开始支付")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "String", name = "parameter", value = "idArray:账单Id集合, type: 类型(car 车缴费, bill 物业缴费), extensionMonth: 延期月份，也就是延期几个月！只有在 车缴费的时候才有效"),
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+	})
+	@RequestMapping(value = "/wx/wxStartPay",method = RequestMethod.POST)
+	public ResponseBean wxStartPay(@RequestBody String parameter, HttpServletRequest request){
+		ResponseBean responseBean = new ResponseBean();
+		try {
+			JSONObject jsonObject = JSONObject.parseObject(parameter);
+			Integer[] integers = jsonObject.getJSONArray("idArray").toArray(new Integer[]{});
+			String type = jsonObject.getString("type");
+			Integer extensionMonth = jsonObject.getInteger("extensionMonth");
+
+			String outTradeNo = wxPayService.wxStartPay(Arrays.asList(integers), type, extensionMonth,getPersonId(request));
+			Map<String,Object> resultMap = Maps.newHashMap();
+			resultMap.put("outTradeNo", outTradeNo);
+			responseBean.addSuccess(resultMap);
+		} catch (Exception e) {
+			e.printStackTrace();
+			responseBean.addError(e.getMessage());
+			return responseBean;
+		}
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "取消支付", notes = "取消支付")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataType = "String", name = "outTradeNo", value = "订单号"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "type", value = "type: 类型(car 车缴费, bill 物业缴费)"),
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+	})
+	@RequestMapping(value = "/wx/wxCancelPay/{outTradeNo}",method = RequestMethod.GET)
+	public ResponseBean wxCancelPay(@PathVariable("outTradeNo") String outTradeNo, @RequestParam("type") String type, HttpServletRequest request){
+		ResponseBean responseBean = new ResponseBean();
+		try {
+			wxPayService.wxCancelPay(outTradeNo, type,getPersonId(request));
+		} catch (Exception e) {
+			e.printStackTrace();
+			responseBean.addError(e.getMessage());
+			return responseBean;
+		}
+		return responseBean;
+	}
+}

src/main/java/com/huiju/estateagents/property/model/TpBillOrder.java

@@ -54,7 +54,7 @@ public class TpBillOrder implements Serializable {
     /**
      * 创建人
      */
-    private Integer createUser;
+    private String createUser;
 
     /**
      * 创建时间
@@ -64,7 +64,7 @@ public class TpBillOrder implements Serializable {
     /**
      * 更新人
      */
-    private Integer updateUser;
+    private String updateUser;
 
     /**
      * 更新时间

src/main/java/com/huiju/estateagents/property/perproties/PayNotifyPerproties.java

@@ -0,0 +1,45 @@
+package com.huiju.estateagents.property.perproties;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 支付回调地址配置
+ * @author weiximei
+ */
+@Component
+@ConfigurationProperties(prefix = "pay-new-notify")
+@Data
+public class PayNotifyPerproties {
+
+    /**
+     * 微信回调 物业缴费
+     */
+    private String wxBillNotify;
+
+    /**
+     * 支付宝回调 物业缴费
+     */
+    private String aliBillNotify;
+
+    /**
+     * 微信回调 车缴费
+     */
+    private String wxCarNotify;
+
+    /**
+     * 支付宝回调 车缴费
+     */
+    private String aliCarNotify;
+    
+    /**
+     * 微信临时车回调
+     */
+    private String wxTmpNotify;
+    
+    /**
+     * 支付宝临时车回调
+     */
+    private String aliTmpNotify;
+}

src/main/java/com/huiju/estateagents/property/service/IBillInvoiceService.java

@@ -38,10 +38,10 @@ public interface IBillInvoiceService extends IService<BillInvoice> {
     /**
      * 设置线下缴费
      * @param ids
-     * @param userElement
+     * @param personId
      * @return
      */
-    ResponseBean offlinePayment(List<Integer> ids, TaUser userElement);
+    ResponseBean offlinePayment(List<Integer> ids, String personId);
 
     /**
      * 由前台批量添加收费单, 默认定为 作废

src/main/java/com/huiju/estateagents/property/service/WxPayServiceI.java

@@ -0,0 +1,64 @@
+package com.huiju.estateagents.property.service;
+
+import java.util.List;
+import java.util.Map;
+
+public interface WxPayServiceI {
+	/**
+	 * 微信支付统一下单
+	 * @return
+	 * @param outTradeNo
+	 * @param type 订单类型  car 车缴费 , bill 物业缴费
+	 * @param personId
+	 */
+	Map<String, String> wxUnifiedOrder(String outTradeNo, String type, String personId) throws Exception;
+	
+	/**
+	 * 支付成功的回调 物业缴费
+	 * @return
+	 * @param resultMap
+	 */
+	String wxBillNotify(Map<String, String> resultMap) throws Exception;
+	
+	/**
+	 * 订单查询
+	 * @return
+	 */
+	Map<String, String> wxOrderQuery(String outTradeNo) throws Exception;
+	
+	/**
+	 * 准备支付
+	 * @param idArray 账单的id
+	 * @param personId
+	 * @param type 订单类型  car 车缴费 , bill 物业缴费
+	 * @param extensionMonth 延期月份，也就是延期几个月！
+	 *                        	只有在 车缴费的时候才有效
+	 * @throws Exception
+	 */
+	String wxStartPay(List<Integer> idArray, String type, Integer extensionMonth, String personId) throws Exception;
+	
+	/**
+	 * 取消支付
+	 * @param outTradeNo 订单号
+	 * @param type  订单类型  car 车缴费 , bill 物业缴费
+	 * @param personId
+	 */
+	void wxCancelPay(String outTradeNo, String type, String personId) throws Exception;
+
+	/**
+	 * 支付成功的回调 车缴费
+	 * @param resultMap
+	 * @return
+	 */
+	String wxCarNotify(Map<String, String> resultMap);
+
+	/**
+	 * 根据订单类型获取 金额 和 回调地址
+	 * @param type
+	 * @param orderNo
+	 * @param notifyType wx 微信, ali 支付宝
+	 * @return
+	 * @throws Exception
+	 */
+	Map<String,Object> getOrderPriceAndNotifyUrl(String type, String orderNo, String notifyType) throws Exception;
+}

src/main/java/com/huiju/estateagents/property/service/impl/BillInvoiceServiceImpl.java

@@ -161,9 +161,9 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean offlinePayment(List<Integer> ids, TaUser userElement) {
+    public ResponseBean offlinePayment(List<Integer> ids, String personId) {
         ResponseBean responseBean = new ResponseBean();
-        if (null == userElement) {
+        if (null == personId) {
             responseBean.addError("请登录后操作");
             return responseBean;
         }
@@ -182,7 +182,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
 
                 // 插入流水
                 BillStatement billStatement = new BillStatement();
-                billStatement.setOrgId(userElement.getOrgId());
+                billStatement.setOrgId(1);
                 billStatement.setBillInvoiceId(billInvoice.getId());
                 billStatement.setTaUserId(billInvoice.getTaUserId());
                 billStatement.setPayPrice(billInvoice.getPayPrice());
@@ -212,7 +212,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
 
                 // 生成订单
                 TpBillOrder tpBillOrder = new TpBillOrder();
-                tpBillOrder.setOrgId(userElement.getOrgId());
+                tpBillOrder.setOrgId(1);
                 tpBillOrder.setTpBillId(billInvoice.getBillId());
                 tpBillOrder.setTpBillInvoiceId(billInvoice.getId());
 
@@ -222,9 +222,9 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
                 // 缴费状态  0：未支付  1: 已支付 2: 正在支付中
                 tpBillOrder.setOrderStatus("1");
                 tpBillOrder.setCreateDate(LocalDateTime.now());
-                tpBillOrder.setCreateUser(userElement.getUserId());
+                tpBillOrder.setCreateUser(personId);
                 tpBillOrder.setUpdateDate(LocalDateTime.now());
-                tpBillOrder.setUpdateUser(userElement.getUserId());
+                tpBillOrder.setUpdateUser(personId);
 
                 tpBillOrderMapper.insert(tpBillOrder);
 
@@ -232,7 +232,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
 
                 // 把相对应的 APP端用户的代办消息进行设置为无效
                 QueryWrapper<Message> messageQueryWrapper = new QueryWrapper<>();
-                messageQueryWrapper.eq("org_id", userElement.getOrgId());
+                messageQueryWrapper.eq("org_id", 1);
                 messageQueryWrapper.eq("bill_id", billInvoice.getId());
                 messageQueryWrapper.eq("uuid_type", "1");
                 messageQueryWrapper.eq("uuid", billInvoice.getTaUserId());

src/main/java/com/huiju/estateagents/property/service/impl/WxPayServiceImpl.java

@@ -0,0 +1,667 @@
+package com.huiju.estateagents.property.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
+import com.huiju.estateagents.common.wxpay.WXPay;
+import com.huiju.estateagents.common.wxpay.WXPayConstants;
+import com.huiju.estateagents.common.wxpay.WXPayUtil;
+import com.huiju.estateagents.common.wxpay.WxConfig;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaWxPayConfig;
+import com.huiju.estateagents.mapper.TaPersonMapper;
+import com.huiju.estateagents.mapper.TaWxPayConfigMapper;
+import com.huiju.estateagents.property.common.Constant;
+import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.dao.*;
+import com.huiju.estateagents.property.exception.WisdomException;
+import com.huiju.estateagents.property.model.*;
+import com.huiju.estateagents.property.perproties.PayNotifyPerproties;
+import com.huiju.estateagents.property.service.WxPayServiceI;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author FXF
+ * @date 2018-10-25
+ */
+@Service("wxPayService")
+@Transactional(rollbackFor = Exception.class)
+public class WxPayServiceImpl implements WxPayServiceI {
+	private Logger log = LoggerFactory.getLogger(WxPayServiceImpl.class);
+	
+	@Autowired
+	private BillInvoiceMapper tpBillInvoiceMapper;
+	
+	@Autowired
+	private BillStatementMapper tpBillStatementMapper;
+
+	@Autowired
+	private BillMapper tpBillMapper;
+
+	@Autowired
+	private TaPersonMapper taPersonMapper;
+
+	@Autowired
+	private TaSysRoleMapper taSysRoleMapper;
+
+	@Autowired
+	private MessageMapper tpMessageMapper;
+
+	@Autowired
+	private TpBillOrderMapper tpBillOrderMapper;
+
+	@Autowired
+	private TaUserVerifyMapper taUserVerifyMapper;
+
+	@Autowired
+	private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
+
+	@Autowired
+	private PayNotifyPerproties payNotifyPerproties;
+
+//	@Autowired
+//	private TaUserLicenseOrderMapper taUserLicenseOrderMapper;
+
+	@Autowired
+	private ApplicationContext applicationContext;
+
+	@Autowired
+	private TaWxPayConfigMapper taWxPayConfigMapper;
+
+//	@Autowired
+//	private IFuShiService iFuShiService;
+
+//	@Autowired
+//	private TaUserLicenseMapper taUserLicenseMapper;
+//
+//	@Autowired
+//	private ITaUserLicenseService iTaUserLicenseService;
+
+//	private IdGen idGen = IdGen.get();
+
+	/**
+	 * 微信支付统一下单
+	 *
+	 * @return
+	 * @param orderNo
+	 * @param
+	 */
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public Map<String, String> wxUnifiedOrder(String orderNo, String type, String personId) throws Exception {
+		//构建微信配置
+		WxConfig config = getWxConfig(1);
+		WXPay wxpay = new WXPay(config);
+
+
+		Map<String, Object> orderPriceAndNotifyUrl = getOrderPriceAndNotifyUrl(type, orderNo, "wx");
+
+		String typeName = Constant.PAY_TYPE_BILL.equals(type) ? "物业缴费" : Constant.PAY_TYPE_CAR.equals(type) ? "车缴费" : "缴费";
+
+		//下单
+		Map<String, String> data = new HashMap<String, String>();
+		data.put("body", typeName);
+		//商品号唯一
+		data.put("out_trade_no", orderNo);
+		data.put("device_info", "");
+		data.put("fee_type", "CNY");
+		//金额 后台计算
+		data.put("total_fee", String.valueOf(orderPriceAndNotifyUrl.get("payPrice")));
+		//终端IP
+		data.put("spbill_create_ip", "123.12.12.123");
+		//回调地址
+		data.put("notify_url", String.valueOf(orderPriceAndNotifyUrl.get("notifyUrl")));
+		// 此处指定为APP支付
+		data.put("trade_type", "APP");
+		Map<String, String> resp = wxpay.unifiedOrder(data);
+		log.info("下单成功：{}", resp);
+		if (resp.get("result_code").equalsIgnoreCase(WXPayConstants.FAIL)){
+			throw new Exception(resp.get("err_code_des"));
+		}
+		//插入下单记录表
+		
+		//第二次重新生成签名
+		Map<String, String> secondSignData = new HashMap<String, String>();
+		long timestamp = Instant.now().getEpochSecond();
+		secondSignData.put("appid", config.getAppID());
+		secondSignData.put("partnerid", config.getMchID());
+		secondSignData.put("prepayid", resp.get("prepay_id"));
+		secondSignData.put("noncestr", resp.get("nonce_str"));
+		secondSignData.put("timestamp", String.valueOf(timestamp));
+		secondSignData.put("package", "Sign=WXPay");
+		secondSignData.put("sign", WXPayUtil.generateSignature(secondSignData, config.getKey(), WXPayConstants.SignType.MD5));
+
+		log.info("订单: {}，订单类型: {}, 状态变更为正在支付", orderNo, type);
+
+		// 更改订单状态 为正在支付
+		updateOrderStatus(orderNo, type, "2");
+		return secondSignData;
+	}
+
+	/**
+	 * 根据订单类型获取 金额 和 回调地址
+	 * @param type
+	 * @param orderNo
+	 * @param notifyType wx 微信, ali 支付宝
+	 * @return
+	 * @throws Exception
+	 */
+	@Override
+	public Map<String,Object> getOrderPriceAndNotifyUrl(String type, String orderNo, String notifyType) throws Exception {
+		Map<String,Object> orderMap = Maps.newHashMap();
+
+		// 物业缴费
+		if (Constant.PAY_TYPE_BILL.equals(type)) {
+			//获取支付金额
+			List<TpBillOrder> billOrderList = tpBillOrderMapper.selectByOrderBumber(orderNo);
+			if (CollectionUtils.isEmpty(billOrderList)){
+				throw new Exception("订单不存在");
+			}
+			// 检测订单是否 已关闭
+			billOrderList.forEach(e-> {
+				if ("3".equals(e.getOrderStatus())) {
+					throw new WisdomException("无法支付已关闭的订单!");
+				}
+			});
+			// 计算金额
+			Long payPrice = billOrderList.stream().mapToLong(e -> tpBillInvoiceMapper.selectById(e.getTpBillInvoiceId()).getPayPrice()).sum();
+			orderMap.put("orderNo", orderNo);
+			orderMap.put("payPrice", String.valueOf(payPrice));
+			orderMap.put("notifyUrl", "wx".equals(notifyType) ? payNotifyPerproties.getWxBillNotify() : payNotifyPerproties.getAliBillNotify());
+
+		} else if (Constant.PAY_TYPE_CAR.equals(type)) { // 车缴费
+//			List<TaUserLicenseOrder> userLicenseOrders = taUserLicenseOrderMapper.selectByOrderNumber(orderNo);
+//			if (CollectionUtils.isEmpty(userLicenseOrders)) {
+//				throw new Exception("订单不存在");
+//			}
+//			// 检测订单是否 已关闭
+//			userLicenseOrders.forEach(e-> {
+//				if ("3".equals(e.getOrderStatus())) {
+//					throw new WisdomException("无法支付已关闭的订单!");
+//				}
+//			});
+//
+//			// 总额
+//			Long payPrice = userLicenseOrders.stream().map(e -> Long.parseLong(e.getExtensionPrice())).count();
+//			orderMap.put("orderNo", orderNo);
+//			orderMap.put("payPrice", String.valueOf(payPrice));
+//			orderMap.put("notifyUrl", "wx".equals(notifyType) ? payNotifyPerproties.getWxCarNotify() : payNotifyPerproties.getAliCarNotify());
+		}
+
+		return orderMap;
+	}
+
+
+
+
+	/**
+	 * 支付成功的回调
+	 *
+	 * @return
+	 * @param resultMap
+	 */
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public String wxBillNotify(Map<String, String> resultMap) throws Exception {
+		String outTradeNo = resultMap.get("out_trade_no");
+		List<TpBillOrder> billOrderList = tpBillOrderMapper.selectByOrderBumber(outTradeNo);
+		if (CollectionUtils.isEmpty(billOrderList)){
+			return "不存在的订单";
+		}
+
+		// 缴费人在准备支付状态下更新, 这里是微信的回调所有没有 token
+
+		for ( TpBillOrder billOrder : billOrderList){
+			BillInvoice tpBillInvoice = tpBillInvoiceMapper.selectById(billOrder.getTpBillInvoiceId());
+
+			// 更新为正在支付状态
+			// 更改收费单的 缴费时间, 修改人, 修改时间
+			tpBillInvoice.setBillStatus("1");
+			tpBillInvoice.setPayDate(new Date());
+			tpBillInvoice.setUpdateDate(new Date());
+			// 缴费方式  0：微信支付  1：线下缴费 2.支付宝支付
+			tpBillInvoice.setPayType(resultMap.get("pay_type"));
+			tpBillInvoiceMapper.updateById(tpBillInvoice);
+
+			//插入流水账单表
+			BillStatement tpBillStatement = new BillStatement();
+			tpBillStatement.setBillInvoiceId(tpBillInvoice.getId());
+			tpBillStatement.setOrgId(1);
+			tpBillStatement.setTaUserId(tpBillInvoice.getTaUserId());
+			tpBillStatement.setPayPrice(tpBillInvoice.getPayPrice());
+			tpBillStatement.setPayName(tpBillInvoice.getPayName());
+			tpBillStatement.setPayRemark(tpBillInvoice.getBillInvoiceExplain());
+			tpBillStatement.setPayType(resultMap.get("pay_type"));
+			tpBillStatement.setCreateTime(new Date());
+			tpBillStatementMapper.insert(tpBillStatement);
+
+			// 更新 收费单流水id
+			tpBillInvoice.setBillStatementId(tpBillStatement.getId());
+			tpBillInvoiceMapper.updateById(tpBillInvoice);
+
+			// 更新收费组的 未交费用户数 和 已缴费用户数
+			Bill tpBill = tpBillMapper.selectById(tpBillInvoice.getBillId());
+			tpBill.setPayedNum(tpBill.getPayedNum() + 1);
+			tpBill.setUnpayedNum(tpBill.getUnpayedNum() - 1);
+			// 如果为零, 表示这个收费组收费完成
+			if (tpBill.getUnpayedNum() <= 0) {
+				tpBill.setBillStatus("1");
+				tpBill.setUnpayedNum(0);
+			}
+			tpBillMapper.updateById(tpBill);
+
+			// 把相对应的APP端, 代办消息设置为无效
+//			Map<String, Object> map = Maps.newHashMap();
+//			map.put("communityId", tpBillInvoice.getCommunityId());
+//			map.put("billInvoiceId", tpBillInvoice.getId());
+//			map.put("userId", tpBillInvoice.getTaUserId());
+//			TpMessage tpMessage = tpMessageMapper.selectBillinvoiceMessage(map);
+//			tpMessage.setStatus("0");
+//			tpMessageMapper.updateByPrimaryKeySelective(tpMessage);
+		}
+
+		log.info("订单: {}，订单类型: {}, 状态变更为支付成功", outTradeNo, Constant.PAY_TYPE_BILL);
+
+		// 更改订单状态 为支付成功
+		updateOrderStatus(outTradeNo, Constant.PAY_TYPE_BILL, "1");
+
+		    // 只取第一条根据订单号去匹配列表
+		    TpBillOrder tpBillOrder = billOrderList.get(0);
+			BillInvoice tpBillInvoice = tpBillInvoiceMapper.selectById(tpBillOrder.getTpBillInvoiceId());
+//			List<TpUser> tpUserList= tpUserMapper.selectCommunityId(tpBillOrder.getCommunityId());
+//
+//			// 推物业端，推这个小区下的所有管理员
+//			TaUser taUser= taUserMapper.selectByPrimaryKey(tpBillOrder.getCreateUser());
+//			for (TpUser tpUser:tpUserList) {
+//				Map<String, Object> mapProp = new HashMap<>();
+//				mapProp.put("communityId", tpBillOrder.getCommunityId());
+//				mapProp.put("tpUserId", tpUser.getId());
+//				mapProp.put("createUserId", tpBillOrder.getCreateUser());
+//				mapProp.put("billInvoiceId", tpBillOrder.getId());
+//				mapProp.put("name", taUser.getUserName());
+//				applicationContext.publishEvent(new MessageEvent(mapProp, Constant.PAY_TYPE_SUCCEED, mapProp));
+//		}
+		return "success";
+	}
+	
+	/**
+	 * 订单查询
+	 *
+	 * @return
+	 */
+	@Override
+	public Map<String, String> wxOrderQuery(String outTradeNo) throws Exception {
+		WxConfig config = getWxConfig(1);
+		WXPay wxpay = new WXPay(config);
+		
+		Map<String, String> data = new HashMap<String, String>();
+		data.put("out_trade_no", outTradeNo);
+		return wxpay.orderQuery(data);
+	}
+	
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public String wxStartPay(List<Integer> idArray, String type, Integer extensionMonth, String personId) throws Exception {
+		if (StringUtils.isBlank(type)) {
+			throw new WisdomException("type 不能为空！");
+		}
+
+		// 缴费的用户
+		TaPerson taPerson = taPersonMapper.selectById(personId);
+
+		Random random = new Random();
+		String orderNo = String.valueOf(System.currentTimeMillis()) + random.nextInt();
+
+		// 创建订单
+		createOrder(idArray, type, taPerson, personId, orderNo, extensionMonth, null);
+
+		return orderNo;
+	}
+
+	/**
+	 * 创建订单
+	 * @param idArray
+	 * @param type
+	 * @param orderNo
+	 * @param extensionMonth 延期月份，也就是延期几个月！
+	 *                       	只有在 车缴费的时候才有效
+	 * @param paymentType 缴费方式 1是支付宝 2是微信支付
+	 * @throws Exception
+	 */
+	private void createOrder(List<Integer> idArray, String type, TaPerson taPerson, String personId, String orderNo, Integer extensionMonth, String paymentType) throws Exception {
+		// 物业缴费
+		if (Constant.PAY_TYPE_BILL.equals(type)) {
+			//获取支付金额
+			for (Integer billInvoiceId : idArray) {
+				BillInvoice tpBillInvoice = tpBillInvoiceMapper.selectById(billInvoiceId);
+				if (null == tpBillInvoice){
+					throw new Exception("订单不存在");
+				}else if (!tpBillInvoice.getBillStatus().equals("0")){
+					throw new Exception("正在支付的订单");
+				}
+
+				TpBillOrder tpBillOrder = new TpBillOrder();
+				tpBillOrder.setOrgId(1);
+				tpBillOrder.setTpBillId(tpBillInvoice.getBillId());
+				tpBillOrder.setTpBillInvoiceId(tpBillInvoice.getId());
+				tpBillOrder.setCreateDate(LocalDateTime.now());
+				tpBillOrder.setCreateUser(personId);
+				tpBillOrder.setUpdateDate(LocalDateTime.now());
+				tpBillOrder.setUpdateUser(personId);
+				tpBillOrder.setOrderBumber(orderNo);
+				tpBillOrder.setPayPhone(taPerson.getPhone());
+				tpBillOrder.setOrderStatus("0");
+
+				tpBillOrderMapper.insert(tpBillOrder);
+
+			}
+			// 修改缴费人, 修改为正在缴费
+			updateBillInvoiceBillStatus(idArray, taPerson.getName(), "3");
+
+			// 车缴费
+		} else if (Constant.PAY_TYPE_CAR.equals(type)) {
+//			if (null == extensionMonth || extensionMonth <= 0) {
+//				throw new Exception("延期月份不能为空，并且要大于0!");
+//			}
+//
+//			for (Integer clicenseId : idArray) {
+//				// 根据车牌id，查询车牌
+//				TaUserLicense taUserLicense = taUserLicenseMapper.selectByPrimaryKey(clicenseId);
+//				// 获取车牌最新信息
+//				ResponseBean responseLicense = iTaUserLicenseService.getLicense(userElement, taUserLicense.getLicensePlate());
+//				Object licenseData = responseLicense.getData();
+//				if (null != licenseData && licenseData instanceof TaUserLicense) {
+//					taUserLicense = (TaUserLicense) licenseData;
+//				}
+//
+//				// 校验车状态
+//				if (taUserLicense.getLicenseType().intValue() != 1) {
+//					throw new WisdomException("异常状态，不能缴月租费!");
+//				}
+//
+//				// 校验是否，超出缴费有效期时间
+//				LocalDateTime expireDateLocalDateTime = LocalDateTime.ofInstant(taUserLicense.getExpireDate().toInstant(), ZoneId.systemDefault());
+//				expireDateLocalDateTime.plusDays(taUserLicense.getRenewTime());
+//				if (taUserLicense.getRenewTime().intValue() > 0 && System.currentTimeMillis() > expireDateLocalDateTime.toEpochSecond(ZoneOffset.of("+8"))) {
+//					throw new WisdomException("已超出续费时间，请找物业处理!");
+//				}
+//
+//				TaUserLicenseOrder taUserLicenseOrder = new TaUserLicenseOrder();
+//				taUserLicenseOrder.setCommunityId(userElement.getCommunityId());
+//				taUserLicenseOrder.setTaUserId(userElement.getId());
+//				taUserLicenseOrder.setOrderNumber(orderNo);
+//				taUserLicenseOrder.setOrderStatus("0");
+//				taUserLicenseOrder.setCreateDate(new Date());
+//				taUserLicenseOrder.setCreateUser(userElement.getId());
+//				taUserLicenseOrder.setExtensionMonth(extensionMonth);
+//
+//				// 费用
+//				String extensionPrice = BigDecimal.valueOf(Double.valueOf(taUserLicense.getUnitPrice()) / 100).multiply(BigDecimal.valueOf(extensionMonth)).toString();
+//				String price = String.valueOf(Double.valueOf(extensionPrice) * 100);
+//				taUserLicenseOrder.setExtensionPrice(price.substring(0, price.lastIndexOf(".")));
+//
+//				taUserLicenseOrder.setPaymentTel(taUser.getLoginName());
+//				taUserLicenseOrder.setPaymentName(taUser.getUserName());
+//				taUserLicenseOrder.setPaymentType(paymentType);
+//
+//				// 到期时间 (具体的到期时候，在支付回调里面以车辆管理系统为准)
+//				LocalDateTime localDateTime = LocalDateTime.ofInstant(taUserLicense.getExpireDate().toInstant(), ZoneId.systemDefault());
+//				localDateTime.plusMonths(extensionMonth);
+//				taUserLicenseOrder.setExpireDate(Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant()));
+//				taUserLicenseOrder.setUnitPrice(taUserLicense.getUnitPrice());
+//				taUserLicenseOrder.setParkingLot(taUserLicense.getParkingLot());
+//				taUserLicenseOrder.setLicensePlate(taUserLicense.getLicensePlate());
+//
+//				// 插入数据
+//				taUserLicenseOrderMapper.insertSelective(taUserLicenseOrder);
+
+//			}
+
+		}
+	}
+
+
+
+	/**
+	 * 取消支付
+	 *
+	 * @param outTradeNo
+	 * @param
+	 */
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void wxCancelPay(String outTradeNo, String type, String personId) throws Exception {
+
+		/**
+		 * 如果是车缴费订单，就只直接更新 订单状态为关闭
+		 */
+		// 如果是车缴费
+//		if (Constant.PAY_TYPE_CAR.equals(type)) {
+//			// 更改订单状态 为订单已关闭
+//			updateOrderStatus(outTradeNo, type, "3");
+//			return;
+//		}
+
+		// --------------------------- 物业缴费 --------------------------------
+
+		//获取支付金额
+		List<TpBillOrder> billOrderList = tpBillOrderMapper.selectByOrderBumber(outTradeNo);
+		if (CollectionUtils.isEmpty(billOrderList)){
+			throw new Exception("订单不存在");
+		}
+
+		List<BillInvoice> billInvoiceList = Lists.newArrayList();
+		for (TpBillOrder tpBillOrder : billOrderList) {
+			BillInvoice billInvoice = tpBillInvoiceMapper.selectById(tpBillOrder.getTpBillInvoiceId());
+			if (!billInvoice.getBillStatus().equals("3")){
+				throw new Exception("不是正在支付的订单");
+			}
+			billInvoiceList.add(billInvoice);
+		}
+
+		// 缴费单id集合
+		List<Integer> billInvoiceIdList = billInvoiceList.stream().map(e -> e.getId()).collect(Collectors.toList());
+
+		//更新为 未支付状态
+		updateBillInvoiceBillStatus(billInvoiceIdList, "","0");
+		log.info("订单: {}， 订单类型: {}, 状态变更为取消支付", outTradeNo, type);
+
+		// 更改订单状态 为订单已关闭
+		updateOrderStatus(outTradeNo, type, "3");
+
+	}
+
+	@Override
+	public String wxCarNotify(Map<String, String> resultMap) {
+//
+//		String outTradeNo = resultMap.get("out_trade_no");
+//		String pay_type = resultMap.get("pay_type");
+//		String payTypeName = pay_type.equals("0") ? "微信支付" : pay_type.equals("2") ? "支付宝" : "未知";
+//
+//		List<TaUserLicenseOrder> userLicenseOrderList = taUserLicenseOrderMapper.selectByOrderNumber(outTradeNo);
+//		if (CollectionUtils.isEmpty(userLicenseOrderList)){
+//			return "不存在的订单";
+//		}
+//
+//		log.info("订单：{},订单类型: {} 开始推送到 车辆管理系统 ", outTradeNo, Constant.PAY_TYPE_CAR);
+//
+//		TaUserLicenseOrder taUserLicenseOrder = userLicenseOrderList.get(0);
+//		TaUser taUser = taUserMapper.selectByPrimaryKey(taUserLicenseOrder.getTaUserId());
+//
+//		ApiThirdPartyMonthCardPay apiThirdPartyMonthCardPay = new ApiThirdPartyMonthCardPay();
+//		apiThirdPartyMonthCardPay.setPhone(taUser.getLoginName());
+//		apiThirdPartyMonthCardPay.setRenewDayType("2");
+//		apiThirdPartyMonthCardPay.setRenewDay(String.valueOf(taUserLicenseOrder.getExtensionMonth()));
+//		apiThirdPartyMonthCardPay.setPayStyle(payTypeName);
+//		apiThirdPartyMonthCardPay.setCarNo(taUserLicenseOrder.getLicensePlate());
+//		apiThirdPartyMonthCardPay.setCardNo(null);
+//		apiThirdPartyMonthCardPay.setRechargeAmt(String.valueOf(Double.valueOf(taUserLicenseOrder.getExtensionPrice()) / 100));
+//		apiThirdPartyMonthCardPay.setDealNo(outTradeNo);
+//
+//		// 推送到车辆管理系统
+//		iFuShiServer.apiThirdPartyMonthCardPay(JSONObject.toJSONString(apiThirdPartyMonthCardPay));
+//
+//		// 推送到车辆管理系统
+////		iFuShiService.apiThirdPartyMonthCardPay(taUser.getLoginName(), "2",
+////				String.valueOf(taUserLicenseOrder.getExtensionMonth()),
+////				payTypeName, taUserLicenseOrder.getLicensePlate(),
+////				null, String.valueOf(Double.valueOf(taUserLicenseOrder.getExtensionPrice()) / 100));
+//
+//
+////		userLicenseOrderList.forEach(e-> {
+////			UserElement userElement = new UserElement();
+////			userElement.setCommunityId(e.getCommunityId());
+////			userElement.setId(e.getTaUserId());
+////			ResponseBean responseLicense = iTaUserLicenseService.getLicense(userElement, e.getLicensePlate());
+////			Object licenseData = responseLicense.getData();
+////			TaUserLicense taUserLicense = null;
+////			if (null != licenseData && licenseData instanceof TaUserLicense) {
+////				taUserLicense = (TaUserLicense) licenseData;
+////				e.setExpireDate(taUserLicense.getExpireDate());
+////			}
+////			e.setPaymentType(pay_type);
+////			e.setUpdateUser(e.getCreateUser());
+////			e.setUpdateDate(new Date());
+////			taUserLicenseOrderMapper.updateByPrimaryKeySelective(e);
+////
+////		});
+//
+//
+//		log.info("订单: {}，订单类型: {}, 状态变更为支付成功", outTradeNo, Constant.PAY_TYPE_CAR);
+//
+//		// 更改订单状态 为支付成功
+//		updateOrderStatus(outTradeNo, Constant.PAY_TYPE_CAR, "1");
+//
+//		// 推物业端，推这个小区下的所有管理员
+//
+//		List<TpUser> tpUserList = tpUserMapper.selectCommunityId(taUserLicenseOrder.getCommunityId());
+//		for (TpUser tpUser : tpUserList) {
+//			Map<String, Object> mapProp = new HashMap<>();
+//			mapProp.put("communityId", taUserLicenseOrder.getCommunityId());
+//			mapProp.put("tpUserId", tpUser.getId());
+//			mapProp.put("createUserId", taUserLicenseOrder.getTaUserId());
+//			mapProp.put("licenseOrderId", taUserLicenseOrder.getId());
+//			mapProp.put("name", taUserLicenseOrder.getPaymentName());
+//			mapProp.put("number", taUserLicenseOrder.getLicensePlate());
+//			applicationContext.publishEvent(new MessageEvent(mapProp, Constant.PAY_MONTH_Bill_SUCCEED, mapProp));
+//		}
+
+		return "success";
+	}
+
+	/**
+	 * 更新支付状态
+	 * @param billInvoiceIdList
+	 * @param status
+	 */
+	private void updateBillInvoiceBillStatus(List<Integer> billInvoiceIdList, String status) {
+		billInvoiceIdList.forEach(e -> {
+			BillInvoice tpBillInvoiceUpdate = new BillInvoice();
+			tpBillInvoiceUpdate.setBillStatus(status);
+			tpBillInvoiceUpdate.setId(e);
+			tpBillInvoiceMapper.updateById(tpBillInvoiceUpdate);
+		});
+
+	}
+
+	/**
+	 * 更新支付状态
+	 * @param billInvoiceIdList
+	 * @param userName 缴费人
+	 * @param status
+	 */
+	private void updateBillInvoiceBillStatus(List<Integer> billInvoiceIdList, String userName, String status) {
+		billInvoiceIdList.forEach(e -> {
+			BillInvoice tpBillInvoiceUpdate = new BillInvoice();
+			tpBillInvoiceUpdate.setBillStatus(status);
+			tpBillInvoiceUpdate.setId(e);
+			tpBillInvoiceUpdate.setPayName(userName);
+			tpBillInvoiceMapper.updateById(tpBillInvoiceUpdate);
+		});
+	}
+
+	/**
+	 * 更改订单状态
+	 * @param orderNumber
+	 * @param type
+	 * @param status
+	 */
+	private void updateOrderStatus(String orderNumber, String type, String status){
+		// 物业缴费
+		if (Constant.PAY_TYPE_BILL.equals(type)) {
+			List<TpBillOrder> billOrders = tpBillOrderMapper.selectByOrderBumber(orderNumber);
+			billOrders.forEach(e-> {
+				e.setOrderStatus(status);
+				tpBillOrderMapper.updateById(e);
+			});
+
+			// 车缴费
+		} else if (Constant.PAY_TYPE_CAR.equals(type)) {
+//			List<TaUserLicenseOrder> taUserLicenseOrders = taUserLicenseOrderMapper.selectByOrderNumber(orderNumber);
+//			taUserLicenseOrders.forEach(e-> {
+//				e.setOrderStatus(status);
+//				taUserLicenseOrderMapper.updateByPrimaryKeySelective(e);
+//			});
+		}
+	}
+
+
+	/**
+	 * 获取每个小程序独立的微信账户
+	 * @param orgId
+	 * @return
+	 */
+	private WxConfig getWxConfig(Integer orgId) throws Exception {
+		//根据orgId获取支付配置
+		QueryWrapper<TaWxPayConfig> taWxPayConfigQueryWrapper = new QueryWrapper<>();
+		taWxPayConfigQueryWrapper.eq("org_id",orgId);
+		TaWxPayConfig taWxPayConfig = taWxPayConfigMapper.selectOne(taWxPayConfigQueryWrapper);
+		if (null == taWxPayConfig){
+			throw new Exception("请先完善支付信息");
+		}
+		log.info("正在配置orgId为{}的微信支付参数，商户号为{}",orgId,taWxPayConfig.getMchId());
+		//把库里的值赋值给微信
+		URL urlConet = new URL(taWxPayConfig.getApiPath());
+		HttpURLConnection con = (HttpURLConnection)urlConet.openConnection();
+		con.setRequestMethod("GET");
+		con.setConnectTimeout(4 * 1000);
+		InputStream inStream = con .getInputStream();
+		ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+		byte[] buffer = new byte[2048];
+		int len = 0;
+		while( (len=inStream.read(buffer)) != -1 ){
+			outStream.write(buffer, 0, len);
+		}
+		inStream.close();
+
+		WxConfig config = new WxConfig();
+		config.setAppid(taWxPayConfig.getAppid());
+		config.setMachId(taWxPayConfig.getMchId());
+		config.setCertData(outStream.toByteArray());
+		config.setKey(taWxPayConfig.getMchKey());
+		return config;
+	}
+}

src/main/resources/application-dev.yml

@@ -78,6 +78,15 @@ pay-notify: https://dev.fangdeal.cn/api/notify/
 #退款回调
 pay-refund: https://dev.fangdeal.cn/api/refund/
 
+# 支付回调
+pay-new-notify:
+  wx-bill-notify: http://106.14.20.193:8086/api/wxBillNotify
+  ali-bill-notify: http://106.14.20.193:8086/api/aliPayBillNotify
+  wx-car-notify: http://106.14.20.193:8086/api/wxCarNotify
+  ali-car-notify: http://106.14.20.193:8086/api/aliPayCarNotify
+  wx-tmp-notify: http://106.14.20.193:8086/api/wxTmpNotify
+  ali-tmp-notify: http://106.14.20.193:8086/api/aliTmpNotify
+
 #法大大服务器地址
 fadada:
   appId: "403057"

src/main/resources/application-prod.yml

@@ -83,6 +83,15 @@ pay-notify: https://wx.fangdeal.cn/api/notify/
 #退款回调
 pay-refund: https://wx.fangdeal.cn/api/refund/
 
+# 支付回调
+pay-new-notify:
+  wx-bill-notify: http://106.14.20.193:8086/api/wxBillNotify
+  ali-bill-notify: http://106.14.20.193:8086/api/aliPayBillNotify
+  wx-car-notify: http://106.14.20.193:8086/api/wxCarNotify
+  ali-car-notify: http://106.14.20.193:8086/api/aliPayCarNotify
+  wx-tmp-notify: http://106.14.20.193:8086/api/wxTmpNotify
+  ali-tmp-notify: http://106.14.20.193:8086/api/aliTmpNotify
+
 #法大大服务器地址
 fadada:
   appId: "500261"