From 9d2babb8bb99d55d76eab0558fd9f510652b270c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 11 六月 2024 15:16:17 +0800
Subject: [PATCH] 6.11
---
UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
index 448ce5a..4ab0aa2 100644
--- a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
+++ b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
@@ -150,7 +150,7 @@
templateCode = "c230a6b92504473c97c17741e1cc0b9d";//修改密码
break;
}
- aLiSendSms.sendSms(phone, "SMS_147415322", "{\"code\":\"" + authCode + "\"}");
+ aLiSendSms.sendSms(phone, "SMS_467580138", "{\"code\":\"" + authCode + "\"}");
// HuaWeiSMSUtil.sendSms("[\"" + authCode + "\"]", phone, "8822061324669", templateCode);
// String sData = aLiSendSms.sendSms(phone, templateCode, "{\"code\":\"" + authCode + "\"}");
//// JSONObject jsonObject = JSON.parseObject(sData);
@@ -223,6 +223,7 @@
userInfo.setConsumption(0D);
userInfo.setBalance(0D);
userInfo.setState(1);
+ userInfo.setAvatar("http://bao-weiqing.oss-cn-hangzhou.aliyuncs.com/img/a9fb2816e36644b292515ffdd6ebb411.jpg");
//用户所属企业
if(null != registAreaCode){
@@ -276,7 +277,11 @@
@Autowired
private ISysCouponRecordService sysCouponRecordService;
public void addnewCoupoun(String phone,UserInfo userInfo){
+ if (redisUtil.getValue("counpon:" + phone)==null){
+ return;
+ }
Integer acId = Integer.valueOf(redisUtil.getValue("counpon:" + phone));
+
TActivityGeneralization tActivityGeneralization = activityGeneralizationService.selectById(acId);
SysCouponRecord sysCouponRecord = sysCouponRecordService.selectById(tActivityGeneralization.getCouponId());
Date date = new Date();
@@ -292,7 +297,7 @@
userCouponRecord.setCouponType(Integer.valueOf(String.valueOf(sysCouponRecord.getCouponType())));
userCouponRecord.setCouponUseType(sysCouponRecord.getCouponUseType());
userCouponRecord.setInsertTime(date);
- userCouponRecord.setFullMoney(Double.valueOf(String.valueOf(sysCouponRecord.getFullMoney())));
+ userCouponRecord.setFullMoney(Double.valueOf(String.valueOf(sysCouponRecord.getFullMoney()==null?0:sysCouponRecord.getFullMoney())));
userCouponRecord.setMoney(Double.valueOf(String.valueOf(sysCouponRecord.getMoney())));
userCouponRecord.setCompanyId(userInfo.getCompanyId());
userCouponRecord.setUserId(userInfo.getId());
@@ -336,6 +341,7 @@
userInfo.setConsumption(0D);
userInfo.setBalance(0D);
userInfo.setState(1);
+ userInfo.setAvatar("http://bao-weiqing.oss-cn-hangzhou.aliyuncs.com/img/a9fb2816e36644b292515ffdd6ebb411.jpg");
//用户所属企业
if(null != registAreaCode){
@@ -1205,7 +1211,7 @@
*/
public String getDefaultName(){
int num = this.selectCount(new EntityWrapper<UserInfo>().ne("flag", 3)) + 1000001;
- return "FB" + String.valueOf(num).substring(1);
+ return "WL" + String.valueOf(num).substring(1);
}
--
Gitblit v1.7.1