java/IgoTravel.git

			@@ -476,7 +476,7 @@
			public ResultUtil payLogisticsOrder(Integer payType, Integer bankCardId, Integer orderId, Integer type, Integer language) throws Exception {
			OrderLogistics orderLogistics = this.selectById(orderId);
			if(orderLogistics.getState() != 7){
			return ResultUtil.error("订单已完成支付，不允许重复支付");
			return ResultUtil.error(language == 1 ? "订单已完成支付，不允许重复支付" : language == 2 ? "The order has been paid, no double payment is allowed" : "La commande a été payée, aucun paiement en double n’est autorisé", "");
			}
			Integer uid = orderLogistics.getUserId();
			Double orderMoney = orderLogistics.getOrderMoney();
			@@ -484,7 +484,7 @@
			orderMoney += null != orderLogistics.getTipMoney() ? orderLogistics.getTipMoney() : 0;
			}
			UserInfo userInfo = userInfoService.selectById(uid);
			ResultUtil resultUtil = ResultUtil.success();
			ResultUtil resultUtil = ResultUtil.success("");

			if(payType == 1) {//手机支付
			SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
			@@ -500,13 +500,13 @@
			checkoutRequest.setRequestDescription("Travel completion payment");
			checkoutRequest.setCallbackUrl(callbackPath + "/base/wxPayOrderTaxi");
			checkoutRequest.setPendingRedirectUrl("");
			checkoutRequest.setSuccessRedirectUrl("https://10pz685243.zicp.fun");
			checkoutRequest.setFailRedirectUrl("https://www.baidu.com");
			checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
			checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
			resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
			if(resultUtil.getCode()==200){
			paymentRecordService.saveData(1, null, null, orderId, 4, 1, orderMoney, null, 1);//添加预支付数据
			}else{
			resultUtil = ResultUtil.error("支付失败");
			resultUtil = ResultUtil.error(language == 1 ? "支付失败" : language == 2 ? "Payment failure" : "Paiement échoué", "");
			}
			return resultUtil;
			}
			@@ -526,21 +526,21 @@
			checkoutRequest.setRequestDescription("Travel completion payment");
			checkoutRequest.setCallbackUrl(callbackPath + "/base/wxPayOrderTaxi");
			checkoutRequest.setPendingRedirectUrl("");
			checkoutRequest.setSuccessRedirectUrl("https://10pz685243.zicp.fun");
			checkoutRequest.setFailRedirectUrl("https://www.baidu.com");
			checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
			checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
			resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);

			if(resultUtil.getCode()==200){
			paymentRecordService.saveData(1, null, null, orderId, 4, 2, orderMoney, null, 1);//添加预支付数据
			}else{
			resultUtil = ResultUtil.error("支付失败");
			resultUtil = ResultUtil.error(language == 1 ? "支付失败" : language == 2 ? "Payment failure" : "Paiement échoué", "");
			}
			return resultUtil;
			}

			if(payType == 3){//余额支付
			if(userInfo.getBalance() == null \|\| userInfo.getBalance() < orderMoney){
			return ResultUtil.error(language == 1 ? "账户余额不足" : language == 2 ? "Insufficient account balance" : "Solde de compte insuffisant");
			return ResultUtil.error(language == 1 ? "账户余额不足" : language == 2 ? "Insufficient account balance" : "Solde de compte insuffisant", "");
			}

			userInfo.setBalance(new BigDecimal(userInfo.getBalance()).subtract(new BigDecimal(orderMoney)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			@@ -624,7 +624,7 @@
			end_address_french.text(orderLogistics.getEndAddress());
			}

			EmailUtil.send(userInfo.getEmail(), language == 1 ? "市内小件物流收据" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe", document.html());
			EmailUtil.send(userInfo.getEmail(), language == 1 ? "市内小件物流收据" : language == 2 ? "Delivery receipt for small parts in the city" : "Réception logistique de petites pièces dans la ville", document.html());
			}

			// TODO: 2020/5/24 这里需要给司机和用户推送订单状态
			@@ -719,7 +719,7 @@
			end_address_french.text(orderLogistics.getEndAddress());
			}

			EmailUtil.send(userInfo.getEmail(), language == 1 ? "市内小件物流收据" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe", document.html());
			EmailUtil.send(userInfo.getEmail(), language == 1 ? "市内小件物流收据" : language == 2 ? "Delivery receipt for small parts in the city" : "Réception logistique de petites pièces dans la ville", document.html());
			}


			@@ -776,8 +776,8 @@
			checkoutRequest.setRequestDescription("Travel completion payment");
			checkoutRequest.setCallbackUrl(callbackPath + "/base/wxPayOrderLogisticsSpread");
			checkoutRequest.setPendingRedirectUrl("");
			checkoutRequest.setSuccessRedirectUrl("https://10pz685243.zicp.fun");
			checkoutRequest.setFailRedirectUrl("https://www.baidu.com");
			checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
			checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
			return TinggPayUtil.checkoutRequest(checkoutRequest);
			}
			if(payType == 2){//银行卡支付
			@@ -795,8 +795,8 @@
			checkoutRequest.setRequestDescription("Travel completion payment");
			checkoutRequest.setCallbackUrl(callbackPath + "/base/wxPayOrderLogisticsSpread");
			checkoutRequest.setPendingRedirectUrl("");
			checkoutRequest.setSuccessRedirectUrl("https://10pz685243.zicp.fun");
			checkoutRequest.setFailRedirectUrl("https://www.baidu.com");
			checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
			checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
			return TinggPayUtil.checkoutRequest(checkoutRequest);
			}

			@@ -1013,7 +1013,7 @@
			end_address_french.text(orderLogistics.getEndAddress());
			}

			EmailUtil.send(userInfo.getEmail(), language == 1 ? "市内小件物流收据" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe", document.html());
			EmailUtil.send(userInfo.getEmail(), language == 1 ? "市内小件物流收据" : language == 2 ? "Delivery receipt for small parts in the city" : "Réception logistique de petites pièces dans la ville", document.html());
			}


			@@ -1135,9 +1135,9 @@
			* @throws Exception
			*/
			@Override
			public List<Map<String, Object>> queryMyOrderList(Integer uid, Integer pageNum, Integer size) throws Exception {
			public List<Map<String, Object>> queryMyOrderList(Integer uid, Integer pageNum, Integer size, Integer language) throws Exception {
			pageNum = (pageNum - 1) * size;
			List<Map<String, Object>> maps = orderLogisticsMapper.queryMyOrderList(uid, pageNum, size);
			List<Map<String, Object>> maps = orderLogisticsMapper.queryMyOrderList(uid, pageNum, size, language);
			return maps;
			}