java/ZhaoYangChuXing.git

			@@ -30,6 +30,7 @@
			import javax.annotation.Resource;
			import javax.servlet.http.HttpServletRequest;
			import java.math.BigDecimal;
			import java.text.SimpleDateFormat;
			import java.util.*;


			@@ -782,8 +783,11 @@
			return ResultUtil.error("支付金额必须大于0元");
			}
			if(payType == 1){//微信支付
			Integer integer = paymentRecordService.saveData(2, uid, 1, null, null, 1, money, "", 1);//添加预支付数据
			ResultUtil resultUtil = payMoneyUtil.weixinpay("余额充值",integer.toString(),integer.toString(),money+"","/base/wxCancelUserBalance","JSAPI",userInfo.getAppletsOpenId());
			if(ToolUtil.isEmpty(userInfo.getAppletsOpenId())){
			return ResultUtil.error("未授权微信，无法完成支付");
			}
			Integer integer = paymentRecordService.saveData(2, uid, 1, null, null, 1, money, "", 1, "");//添加预支付数据
			ResultUtil resultUtil = payMoneyUtil.weixinpay("余额充值", integer.toString(), integer.toString(),money+"","/base/wxCancelUserBalance","JSAPI",userInfo.getAppletsOpenId());
			if(resultUtil.getCode()==200){
			PaymentRecord paymentRecord = paymentRecordService.selectById(integer);
			paymentRecordService.updateById(paymentRecord);
			@@ -793,7 +797,7 @@
			}
			}
			if(payType == 2){//支付宝支付
			Integer integer = paymentRecordService.saveData(2, uid, 1, null, null, 2, money, "", 1);//添加预支付数据
			Integer integer = paymentRecordService.saveData(2, uid, 1, null, null, 2, money, "", 1, "");//添加预支付数据
			ResultUtil resultUtil = payMoneyUtil.alipay("余额充值","余额充值", "",integer.toString(),money+"","/base/aliCancelUserBalance");
			if(resultUtil.getCode()==200){
			PaymentRecord paymentRecord = paymentRecordService.selectById(integer);
			@@ -1070,8 +1074,9 @@
			* @return
			*/
			public String getDefaultName(){
			int num = this.selectCount(new EntityWrapper<UserInfo>().ne("flag", 3)) + 1000001;
			return "ZY" + String.valueOf(num).substring(1);
			SimpleDateFormat sdf = new SimpleDateFormat("yyMMdd");
			String n = UUIDUtil.getNumberCode(3) + sdf.format(new Date());
			return "ZY" + n;
			}