java/IgoTravel.git

			@@ -99,13 +99,13 @@
			Driver driver1 = driverService.selectById(driverId);
			SettlementRecord settlementRecord = this.selectOne(new EntityWrapper<SettlementRecord>().eq("driverId", driverId).eq("paymentStatus", 1));
			if(null == settlementRecord){
			return ResultUtil.error(language == 1 ? "暂无需支付" : language == 2 ? "No need to make payments for the time being" : "Pas besoin d’effectuer de paiements pour le moment");
			return ResultUtil.error(language == 1 ? "暂无需支付" : language == 2 ? "No payment is required" : "Aucun paiement n’est requis");
			}
			Double payMoney = settlementRecord.getPayMoney();
			ResultUtil resultUtil = ResultUtil.success("");
			if(payType == 1){//手机支付
			SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
			String merchantTransactionId = sdf.format(new Date()) + language + settlementRecord.getId();
			String merchantTransactionId = sdf.format(new Date()) + language + payType + settlementRecord.getId();
			CheckoutRequest checkoutRequest = new CheckoutRequest();
			checkoutRequest.setMsisdn(Long.valueOf(driver1.getPhone()));
			checkoutRequest.setCustomerEmail(driver1.getEmail());
			@@ -129,7 +129,7 @@
			if(payType == 2){//银行卡支付
			BankCard bankCard = bankCardService.selectById(bankCardId);
			SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
			String merchantTransactionId = sdf.format(new Date()) + language + settlementRecord.getId();
			String merchantTransactionId = sdf.format(new Date()) + language + payType + settlementRecord.getId();
			CheckoutRequest checkoutRequest = new CheckoutRequest();
			checkoutRequest.setMsisdn(Long.valueOf(bankCard.getCode()));
			checkoutRequest.setCustomerEmail(driver1.getEmail());
			@@ -193,7 +193,7 @@
			driver1.setLaveBusinessMoney(new BigDecimal(laveBusinessMoney).subtract(new BigDecimal(payMoney)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			settlementRecord.setPaymentStatus(2);
			settlementRecord.setPayType(payType);
			settlementRecord.setBalanceType(1);
			settlementRecord.setBalanceType(2);
			settlementRecord.setPayTime(new Date());
			this.updateById(settlementRecord);
			balanceUsageRecordService.saveBalanceUsageRecord(settlementRecord.getDriverId(), 2, payMoney, settlementRecord.getType() + 2);
			@@ -233,7 +233,6 @@
			queryHistoricalSettlement.setType(Integer.valueOf(map.get("type").toString()));
			}
			if(null != map.get("payType")){
			Integer balanceType = Integer.valueOf(map.get("balanceType").toString());
			switch (map.get("payType").toString()){
			case "1":
			queryHistoricalSettlement.setPayType(language == 1 ? "手机支付" : language == 2 ? "Mobile Money" : "Paiement mobile");
			@@ -242,6 +241,7 @@
			queryHistoricalSettlement.setPayType(language == 1 ? "线上支付" : language == 2 ? "Bank Card" : "Carte bancaire");
			break;
			default:
			Integer balanceType = Integer.valueOf(map.get("balanceType").toString());
			queryHistoricalSettlement.setPayType(language == 1 ? "余额支付(" + (balanceType == 1 ? "奖励" : "收入") + ")" : language == 2 ? "Wallet (" + (balanceType == 1 ? "Reward" : "Income") + ")" : "Portefeuille (" + (balanceType == 1 ? "Récompense" : "Revenu") + ")");
			break;
			}