java/SuperSaveDriving.git

			@@ -13,6 +13,11 @@
			import com.supersavedriving.user.modular.system.dao.AppUserMapper;
			import com.supersavedriving.user.modular.system.model.*;
			import com.supersavedriving.user.modular.system.service.*;
			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;
			import com.supersavedriving.user.modular.system.util.ResultUtil;
			@@ -27,11 +32,13 @@
			import org.apache.shiro.crypto.hash.Md5Hash;
			import org.apache.shiro.util.ByteSource;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.stereotype.Service;
			import org.springframework.web.context.request.RequestContextHolder;
			import org.springframework.web.context.request.ServletRequestAttributes;

			import javax.servlet.http.HttpServletRequest;
			import java.net.InetAddress;
			import java.text.SimpleDateFormat;
			import java.util.ArrayList;
			import java.util.Date;
			@@ -66,6 +73,12 @@

			@Autowired
			private IAccountChangeDetailService accountChangeDetailService;

			@Value("${callbackPath}")
			private String callbackPath;//支付回调网关地址

			@Value("${wx.appletsAppid}")
			private String appletsAppid;



			@@ -116,6 +129,7 @@
			key = token.substring(token.length() - 16);
			}
			redisUtil.setStrValue(key, appUser.getId().toString(), 7 * 24 * 60 * 60);
			redisUtil.setStrValue("USER_" + appUser.getPhone(), key, 7 * 24 * 60 * 60);
			return token;
			}
			return null;
			@@ -156,6 +170,7 @@
			if(null == appUser){
			appUser = new AppUser();
			appUser.setNickname("亲爱的用户");
			appUser.setAvatar("https://csxdj.obs.cn-south-1.myhuaweicloud.com:443/66cc269703a84e4da87fb21e2c21ab1f.png");
			appUser.setPhone(purePhoneNumber);
			appUser.setOpenid(openid);
			appUser.setUnionid(code2Session.getUnionid());
			@@ -191,7 +206,8 @@
			* @param userId
			*/
			public List<CouponWarpper> pushCoupon(Integer userId){
			List<Coupon> coupons = couponService.selectList(new EntityWrapper<Coupon>().eq("coupon_type", 2).eq("coupon_state", 1).gt("remaining_quantity", 0));
			List<Coupon> coupons = couponService.selectList(new EntityWrapper<Coupon>().eq("coupon_type", 2)
			.eq("coupon_state", 1).eq("status", 1).gt("remaining_quantity", 0));
			List<CouponWarpper> list = new ArrayList<>();
			for (Coupon coupon : coupons) {
			UserToCoupon userToCoupon = new UserToCoupon();
			@@ -301,8 +317,104 @@
			rechargeRecord.setPayStatus(1);
			rechargeRecord.setPayType(1);
			rechargeRecordService.insert(rechargeRecord);
			ResultUtil weixinpay = payMoneyUtil.weixinpay("余额充值", "", out_trade_no, amount.toString(), "/base/appUser/rechargeBalanceCallback", "JSAPI", appUser.getOpenid());
			return weixinpay;

			PaymentOrder paymentOrder = new PaymentOrder();
			paymentOrder.setBizOrderId(out_trade_no);
			paymentOrder.setAmount(String.valueOf(amount * 100));
			paymentOrder.setOrderName("账户充值");
			paymentOrder.setPayType("WX_MINI");
			paymentOrder.setTransferType("0");
			paymentOrder.setAsynSplitFlag("1");
			paymentOrder.setAppid(appletsAppid);
			paymentOrder.setOpenid(appUser.getOpenid());
			paymentOrder.setTerminalIp(InetAddress.getLocalHost().getHostAddress());
			List<PaymentOrderGood> goodsDetail = new ArrayList<>();
			PaymentOrderGood paymentOrderGood = new PaymentOrderGood();
			paymentOrderGood.setGoodsName("账户充值");
			goodsDetail.add(paymentOrderGood);
			paymentOrder.setGoodsDetail(goodsDetail);
			paymentOrder.setFrontUrl(callbackPath + "/base/appUser/rechargeBalanceCallback");
			paymentOrder.setNotifyUrl(callbackPath + "/base/appUser/rechargeBalanceCallback");
			paymentOrder.setParameter1(out_trade_no);

			TrhRequest<PaymentOrder> request = new TrhRequest();
			InterfaceResponse execute = request.execute(paymentOrder, PaymentOrder.SERVICE_CODE);
			if(!"0000".equals(execute.getCode())){
			return ResultUtil.error(execute.getMsg());
			}
			JSONObject jsonObject = JSON.parseObject(execute.getResult());
			String status = jsonObject.getString("status");
			if("2".equals(status)){
			return ResultUtil.error("失败");
			}
			String merOrderId = jsonObject.getString("merOrderId");
			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(merOrderId);
			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);
			}


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