From 06c5eda038f967dc0c0261e16eff0ad1a18e41e7 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 05 六月 2024 15:52:58 +0800
Subject: [PATCH] 6.5
---
UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserCallbackController.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserCallbackController.java b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserCallbackController.java
index 41b3c49..6a22f6d 100644
--- a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserCallbackController.java
+++ b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserCallbackController.java
@@ -7,10 +7,7 @@
import com.stylefeng.guns.modular.system.service.*;
//import com.stylefeng.guns.modular.system.util.ICBCPayUtil;
import com.stylefeng.guns.modular.system.service.impl.UserServiceImpl;
-import com.stylefeng.guns.modular.system.util.ALiSendSms;
-import com.stylefeng.guns.modular.system.util.PayMoneyUtil;
-import com.stylefeng.guns.modular.system.util.RedisUtil;
-import com.stylefeng.guns.modular.system.util.ResultUtil;
+import com.stylefeng.guns.modular.system.util.*;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -133,7 +130,7 @@
//判断验证码是否正确
//判断该手机号是否注册
- UserInfo byAccount = userInfoService.selectList(new EntityWrapper<UserInfo>().ne("flag",3)).get(0);
+ UserInfo byAccount = userInfoService.selectList(new EntityWrapper<UserInfo>().eq("phone",phone).ne("flag",3)).get(0);
//已注册直接添加优惠卷
TActivityGeneralization tActivityGeneralization = activityGeneralizationService.selectById(acId);
SysCouponRecord sysCouponRecord = sysCouponRecordService.selectById(tActivityGeneralization.getCouponId());
@@ -156,7 +153,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(byAccount.getCompanyId());
userCouponRecord.setUserId(byAccount.getId());
@@ -216,8 +213,7 @@
@PostMapping("/get/coupon/info")
@ApiOperation(value = "使用说明", tags = {"线下推广页面"}, notes = "")
@ApiImplicitParams({
- @ApiImplicitParam(value = "电话", name = "phone", required = true, dataType = "String"),
- @ApiImplicitParam(value = "验证码", name = "code", required = true, dataType = "String")
+
})
public ResultUtil coupon(Integer acId){
TActivityGeneralization tActivityGeneralization = activityGeneralizationService.selectById(acId);
@@ -225,6 +221,24 @@
return ResultUtil.success(tActivityGeneralization.getUseExplain());
}
+ @Autowired
+ private WeChatUtil weChatUtil;
+
+ @ResponseBody
+ @PostMapping("/get/coupon/toWe")
+ @ApiOperation(value = "获取微信链接", tags = {"线下推广页面"}, notes = "")
+ @ApiImplicitParams({
+
+ })
+ public ResultUtil toWe(){
+ try {
+ String urlLink = weChatUtil.getUrlLink(null, null);
+ return ResultUtil.success(urlLink);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ return ResultUtil.error("请稍后再试");
+ }
--
Gitblit v1.7.1