java/TianMa.git

			@@ -1553,7 +1553,8 @@
			public void offlineTravelPaymentCallback(HttpServletRequest request, HttpServletResponse response){
			try {
			System.err.println("线下收款开始回调-------------------");
			ResultNotification resultNotification = PayUtil.payResultNotification(request);
			// ResultNotification resultNotification = PayUtil.payResultNotification(request);
			ResultNotification resultNotification = new ResultNotification();
			System.err.println("支付回调：" + JSON.toJSONString(resultNotification));
			if(null != resultNotification){
			if("000000".equals(resultNotification.getReturnCode())){

			@@ -172,9 +172,11 @@
			offlineTravelPayment.setInsertTime(new Date());
			offlineTravelPaymentService.insert(offlineTravelPayment);
			Driver driver = driverService.selectById(driverId);
			String codeUrl = PayUtil.polymericPay(null, null, "", pay_type, money, "打车支付"
			, callbackPath + "/base/offlineTravelPaymentCallback", randomCode
			, "https://okyueche.com:8443/h5/#/pages/index/evaluate", driver.getMchtNo());
			// String codeUrl = PayUtil.polymericPay(null, null, "", pay_type, money, "打车支付"
			// , callbackPath + "/base/offlineTravelPaymentCallback", randomCode
			// , "https://okyueche.com:8443/h5/#/pages/index/evaluate", driver.getMchtNo());
			//支付
			String codeUrl = "";
			if(ToolUtil.isNotEmpty(codeUrl)){
			Map<String, String> map = new HashMap<>();
			map.put("url", codeUrl);

	UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史