java/SuperSaveDriving.git

			@@ -16,6 +16,7 @@
			import com.supersavedriving.user.modular.system.util.MallBook.model.InterfaceResponse;
			import com.supersavedriving.user.modular.system.util.MallBook.model.PaymentOrder;
			import com.supersavedriving.user.modular.system.util.MallBook.model.PaymentOrderGood;
			import com.supersavedriving.user.modular.system.util.MallBook.model.QueryOrder;
			import com.supersavedriving.user.modular.system.util.MallBook.util.TrhRequest;
			import com.supersavedriving.user.modular.system.util.PayMoneyUtil;
			import com.supersavedriving.user.modular.system.util.RedisUtil;
			@@ -322,7 +323,7 @@
			PaymentOrder paymentOrder = new PaymentOrder();
			paymentOrder.setBizOrderId(out_trade_no);
			paymentOrder.setAmount(String.valueOf(amount * 100));
			paymentOrder.setOrderName("余额充值");
			paymentOrder.setOrderName("账户充值");
			paymentOrder.setPayType("WX_MINI");
			paymentOrder.setTransferType("0");
			paymentOrder.setAsynSplitFlag("1");
			@@ -331,7 +332,7 @@
			paymentOrder.setTerminalIp(InetAddress.getLocalHost().getHostAddress());
			List<PaymentOrderGood> goodsDetail = new ArrayList<>();
			PaymentOrderGood paymentOrderGood = new PaymentOrderGood();
			paymentOrderGood.setGoodsName("余额充值");
			paymentOrderGood.setGoodsName("账户充值");
			goodsDetail.add(paymentOrderGood);
			paymentOrder.setGoodsDetail(goodsDetail);
			paymentOrder.setFrontUrl("");
			@@ -340,7 +341,7 @@

			TrhRequest<PaymentOrder> request = new TrhRequest();
			InterfaceResponse execute = request.execute(paymentOrder, PaymentOrder.SERVICE_CODE);
			if(!"0000".equals(execute.getResult())){
			if(!"0000".equals(execute.getCode())){
			return ResultUtil.error(execute.getMsg());
			}
			JSONObject jsonObject = JSON.parseObject(execute.getResult());
			@@ -348,10 +349,72 @@
			if("2".equals(status)){
			return ResultUtil.error("失败");
			}
			if("0".equals(status)){
			return ResultUtil.error("处理中");
			}
			String payCode = jsonObject.getString("payCode");
			if(ToolUtil.isNotEmpty(payCode)){
			new Thread(new Runnable() {
			@Override
			public void run() {
			try {
			int num = 1;
			int wait = 0;
			while (num <= 10){
			int min = 5000;
			wait += (min * num);
			RechargeRecord rechargeRecord1 = rechargeRecordService.selectOne(new EntityWrapper<RechargeRecord>().eq("code", out_trade_no));
			if(rechargeRecord1.getPayStatus() != 1){
			return;
			}
			QueryOrder queryOrder = new QueryOrder();
			queryOrder.setOriginalMerOrderId(out_trade_no);
			queryOrder.setQueryType("1");
			TrhRequest<QueryOrder> request = new TrhRequest();
			InterfaceResponse execute1 = request.execute(queryOrder, QueryOrder.SERVICE_CODE);
			if("0000".equals(execute1.getCode())){
			JSONObject jsonObject1 = JSON.parseObject(execute1.getResult());
			String status1 = jsonObject1.getString("status");
			if("0".equals(status1)){//待处理
			Thread.sleep(wait);
			num++;
			}
			if("1".equals(status1)){//成功
			String merOrderId = jsonObject1.getString("merOrderId");
			AppUser appUser1 = AppUserServiceImpl.this.selectById(rechargeRecord1.getUserId());
			AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
			accountChangeDetail.setUserType(1);
			accountChangeDetail.setUserId(appUser1.getId());
			accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
			accountChangeDetail.setChangeType(3);
			accountChangeDetail.setType(1);
			accountChangeDetail.setCreateTime(new Date());
			accountChangeDetail.setExplain("账户充值");
			accountChangeDetail.setOldData(appUser1.getAccountBalance());
			appUser1.setAccountBalance(appUser1.getAccountBalance() + rechargeRecord1.getAmount());
			accountChangeDetail.setNewData(appUser1.getAccountBalance());
			AppUserServiceImpl.this.updateById(appUser1);
			accountChangeDetailService.saveData(accountChangeDetail);

			rechargeRecord1.setPayTime(new Date());
			rechargeRecord1.setPayStatus(2);
			rechargeRecord1.setOrderNumber(merOrderId);
			rechargeRecord1.setSurplusDividedAmount(rechargeRecord1.getAmount());
			rechargeRecordService.updateById(rechargeRecord1);
			break;
			}
			if("2".equals(status1) \|\| 10 == num){//失败
			rechargeRecordService.deleteById(rechargeRecord1.getId());
			break;
			}
			}else{
			Thread.sleep(wait);
			num++;
			}
			}
			}catch (Exception e){
			e.printStackTrace();
			}
			}
			}).start();
			}
			return ResultUtil.success(payCode);
			}

			@@ -387,6 +450,7 @@
			rechargeRecord1.setPayTime(new Date());
			rechargeRecord1.setPayStatus(2);
			rechargeRecord1.setOrderNumber(transaction_id);
			rechargeRecord1.setSurplusDividedAmount(rechargeRecord1.getAmount());
			rechargeRecordService.updateById(rechargeRecord1);
			}