From 2a25a4792b7d3c5c2c3d1b7ebe3c52103f520f92 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 26 Dec 2024 15:01:53 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=B3=A8=E5=86=8C=20=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/app/AppLoginController.java | 2 +- .../app/service/impl/UserServiceImpl.java | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/sqx/modules/app/controller/app/AppLoginController.java b/src/main/java/com/sqx/modules/app/controller/app/AppLoginController.java index 96895f23..19ff76ea 100644 --- a/src/main/java/com/sqx/modules/app/controller/app/AppLoginController.java +++ b/src/main/java/com/sqx/modules/app/controller/app/AppLoginController.java @@ -144,7 +144,7 @@ public class AppLoginController { @RequestMapping(value = "/registerCode", method = RequestMethod.POST) @ApiOperation("app或h5注册或登录") @ResponseBody -// @Debounce(interval = 2500, value = "phone") + @Debounce(interval = 2500, value = "#phone") public Result registerCode(@RequestParam String phone,String msg,String platform,Integer sysPhone, String password,String inviterCode,String wxId,String qdCode) { return userService.registerCode(phone,msg,platform,sysPhone,password,inviterCode,wxId,qdCode); diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java index 13bd79fb..ba435901 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java @@ -50,6 +50,8 @@ import com.sqx.modules.file.utils.Md5Utils; import com.sqx.modules.invite.service.InviteService; import com.sqx.modules.message.entity.MessageInfo; import com.sqx.modules.message.service.MessageService; +import com.sqx.modules.sys.entity.SysUserEntity; +import com.sqx.modules.sys.service.SysUserService; import com.sqx.modules.utils.HttpClientUtil; import com.sqx.modules.utils.InvitationCodeUtil; import com.sqx.modules.utils.MD5Util; @@ -110,6 +112,8 @@ public class UserServiceImpl extends ServiceImpl implements private CommonInfoService commonRepository; @Autowired private DiscSpinningService discSpinningService; + @Autowired + private SysUserService sysUserService; private ReentrantReadWriteLock reentrantReadWriteLock = new ReentrantReadWriteLock(true); @Override @@ -896,12 +900,9 @@ public class UserServiceImpl extends ServiceImpl implements if (StringUtils.isEmpty(msg)) { return Result.error("验证码不能为空！"); } - Msg msg1 = null; - if (!"147258".equals(msg)) { - msg1 = msgDao.findByPhoneAndCode(phone, msg); - if (msg1 == null) { - return Result.error("验证码不正确！"); - } + Msg msg1 = msgDao.findByPhoneAndCode(phone, msg); + if (msg1 == null) { + return Result.error("验证码不正确！"); } userInfo = new UserEntity(); UserEntity userEntity = null; @@ -921,6 +922,11 @@ public class UserServiceImpl extends ServiceImpl implements } if (StringUtils.isEmpty(qdCode)) { qdCode = userEntity.getQdCode(); + } else { + SysUserEntity sysUserEntity = sysUserService.selectSysUserByQdCode(qdCode); + if (sysUserEntity == null) { + return Result.error("请使用正确的渠道码！"); + } } userInfo.setQdCode(qdCode); userInfo.setPhone(phone); From c8cf607a72ddbb9eb53db4163af86cd3768d7421 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 26 Dec 2024 15:42:53 +0800 Subject: [PATCH 2/9] =?UTF-8?q?swagger=20=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sqx/config/SwaggerConfig.java | 5 +++++ src/main/resources/application-dev.yml | 3 ++- src/main/resources/application-prod.yml | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sqx/config/SwaggerConfig.java b/src/main/java/com/sqx/config/SwaggerConfig.java index a9043dce..8cf4bfee 100644 --- a/src/main/java/com/sqx/config/SwaggerConfig.java +++ b/src/main/java/com/sqx/config/SwaggerConfig.java @@ -1,6 +1,7 @@ package com.sqx.config; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @@ -21,9 +22,13 @@ import static com.google.common.collect.Lists.newArrayList; @EnableSwagger2 public class SwaggerConfig implements WebMvcConfigurer { + @Value("${swagger.enabled}") + private boolean enabled; + @Bean public Docket createRestApi() { return new Docket(DocumentationType.SWAGGER_2) + .enable(enabled) .apiInfo(apiInfo()) .select() //加了ApiOperation注解的类，才生成接口文档 diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 7338d3e6..1cc256d7 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -33,7 +33,8 @@ spring: config: multi-statement-allow: true - +swagger: + enabled: true pay: h5BaseUrl: https://video-h5.hnsiyao.cn/me/detail/detail?allId= orderNotifyUrl: https://video.hnsiyao.cn/sqx_fast/app/wuyou/notify diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 56c0e79a..2d219bc9 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -32,7 +32,8 @@ spring: wall: config: multi-statement-allow: true - +swagger: + enabled: false pay: h5BaseUrl: https://dj-h5.hnsiyao.cn/me/detail/detail?allId= orderNotifyUrl: https://dj-api.hnsiyao.cn/sqx_fast/app/wuyou/notify From 82b152607125d4f1b30191f76b79f09496bbd01b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Thu, 26 Dec 2024 15:56:49 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=8F=90=E7=8E=B0=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CashOutController.java | 51 +++++++++++++++++++ .../com/sqx/modules/pay/entity/CashOut.java | 7 ++- .../modules/pay/service/CashOutService.java | 10 ++++ 3 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/sqx/modules/discSpinning/controller/CashOutController.java diff --git a/src/main/java/com/sqx/modules/discSpinning/controller/CashOutController.java b/src/main/java/com/sqx/modules/discSpinning/controller/CashOutController.java new file mode 100644 index 00000000..179eeb96 --- /dev/null +++ b/src/main/java/com/sqx/modules/discSpinning/controller/CashOutController.java @@ -0,0 +1,51 @@ +package com.sqx.modules.discSpinning.controller; + +import com.sqx.common.utils.Constant; +import com.sqx.common.utils.PageUtils; +import com.sqx.common.utils.Result; +import com.sqx.modules.pay.entity.CashOut; +import com.sqx.modules.pay.service.CashOutService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import javax.annotation.Resource; +import java.util.Map; + +/** + * 提现审核 + * + * @author tankaikai + * @since 2024-12-26 14:39 + */ +@RestController +@RequestMapping("/cashOutAudit") +@AllArgsConstructor +@Api(value = "提现审核", tags = {"提现审核"}) +public class CashOutController { + + @Resource + private CashOutService cashOutService; + + @GetMapping("/page") + @ApiOperation("分页") + @ApiImplicitParams({ + @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"), + @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"), + }) + public Result page(@ApiIgnore @RequestParam Map params) { + PageUtils page = cashOutService.auditPage(params); + return Result.success().put("page", page); + } + + @PostMapping("/audit") + @ApiOperation("审核") + public Result audit(@RequestBody CashOut cashOut) { + cashOutService.audit(cashOut); + return Result.success(); + } +} diff --git a/src/main/java/com/sqx/modules/pay/entity/CashOut.java b/src/main/java/com/sqx/modules/pay/entity/CashOut.java index 47e81002..3c45ed65 100644 --- a/src/main/java/com/sqx/modules/pay/entity/CashOut.java +++ b/src/main/java/com/sqx/modules/pay/entity/CashOut.java @@ -74,7 +74,7 @@ public class CashOut implements Serializable { private String orderNumber; /** - * 状态 0待转账 1成功 -1退款 2失败 + * 状态 0待转账 1成功 -1退款 2失败 3-待人工审核 */ private Integer state; @@ -107,4 +107,9 @@ public class CashOut implements Serializable { @TableField(exist = false) private String sysUserName; + /** + * 是否同意提现 0不同意 1同意 + */ + @TableField(exist = false) + private Integer isAgree; } diff --git a/src/main/java/com/sqx/modules/pay/service/CashOutService.java b/src/main/java/com/sqx/modules/pay/service/CashOutService.java index 03898cd0..ef2ad8bb 100644 --- a/src/main/java/com/sqx/modules/pay/service/CashOutService.java +++ b/src/main/java/com/sqx/modules/pay/service/CashOutService.java @@ -9,6 +9,7 @@ import com.sqx.modules.utils.excel.ExcelData; import java.util.Date; import java.util.List; +import java.util.Map; public interface CashOutService { @@ -49,4 +50,13 @@ public interface CashOutService { */ Result withdraw(Long userId, Double money, String msg, boolean isSys); + /** + * 提现审核分页查询 + * + * @param params + * @return + */ + PageUtils auditPage(Map params); + + void audit(CashOut cashOut); } From 17b125d14d5de3c60cf46486351dbb37c4cda38a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Thu, 26 Dec 2024 16:02:04 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=8F=90=E7=8E=B0=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pay/service/impl/CashOutServiceImpl.java | 84 +++++++++++++++++-- 1 file changed, 78 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java index e65d3980..92111d31 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java @@ -1,10 +1,15 @@ package com.sqx.modules.pay.service.impl; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.map.MapProxy; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.sqx.common.exception.SqxException; +import com.sqx.common.utils.Constant; import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.Result; import com.sqx.modules.app.dao.MsgDao; @@ -17,7 +22,6 @@ import com.sqx.modules.app.service.UserMoneyService; import com.sqx.modules.app.service.UserService; import com.sqx.modules.common.entity.CommonInfo; import com.sqx.modules.common.service.CommonInfoService; -import com.sqx.modules.course.entity.CourseCollect; import com.sqx.modules.invite.entity.InviteMoney; import com.sqx.modules.invite.service.InviteMoneyService; import com.sqx.modules.message.dao.MessageInfoDao; @@ -45,10 +49,7 @@ import weixin.popular.support.TokenManager; import javax.websocket.SendResult; import java.math.BigDecimal; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.List; +import java.util.*; /** * 提现申请记录 @@ -511,4 +512,75 @@ public class CashOutServiceImpl extends ServiceImpl impleme return Result.success("提现成功，将在三个工作日内到账，请耐心等待！"); } + @Override + public PageUtils auditPage(Map params) { + MapProxy proxy = MapProxy.create(params); + CashOut cashOut = BeanUtil.toBean(params, CashOut.class); + //cashOut.setState(3); + long pageNum = proxy.getLong(Constant.PAGE, 1L); + long pageSize = proxy.getLong(Constant.LIMIT, 10L); + IPage page = baseMapper.selectCashOutPage(new Page<>(pageNum, pageSize), cashOut); + return new PageUtils(page); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void audit(CashOut cashOut) { + long id = cashOut.getId(); + Integer isAgree = cashOut.getIsAgree(); + if (isAgree == null) { + throw new SqxException("请选择同意或者拒绝！"); + } + if (isAgree == 0 && StrUtil.isBlank(cashOut.getRefund())) { + throw new SqxException("请输入拒绝原因！"); + } + CashOut entity = baseMapper.selectById(id); + if (entity == null) { + throw new SqxException("提现申请不存在！"); + } + if(entity.getState() != 3){ + throw new SqxException("提现申请状态无效，请刷新后重试！"); + } + if (isAgree == 1) { + entity.setState(0); + } else { + entity.setState(2); + entity.setRefund(cashOut.getRefund()); + } + UserEntity userEntity = userService.selectUserById(entity.getUserId()); + if(userEntity == null){ + throw new SqxException("提现用户信息不存在！"); + } + if (isAgree == 0) { + baseMapper.updateById(entity); + UserMoneyDetails userMoneyDetails = new UserMoneyDetails( + entity.getUserId(), null, null, "[提现退款]", 4, 1, 2, + new BigDecimal(entity.getMoney()), "提现失败，自动退款" + entity.getMoney() + "元", 1); + userMoneyDetailsService.save(userMoneyDetails); + //归还余额 钱 + userMoneyService.updateAmount(1, entity.getUserId(), Convert.toDouble(entity.getMoney())); + return; + } + if (StrUtil.isBlank(entity.getOrderNumber())) { + String outOrderNo = AliPayOrderUtil.createOrderId(); + entity.setOrderNumber(outOrderNo); + } + // 执行提现操作 + BaseResp baseResp = WuyouPay.extractOrder(entity.getOrderNumber(), entity.getMoney(), entity.getZhifubao(), entity.getZhifubaoName()); + if (baseResp.getStatus() != null && (baseResp.getStatus().equals(2) || baseResp.getStatus().equals(10000))) { + entity.setState(1); + } else if (StringUtils.isNotBlank(baseResp.getErrorMsg())) { + entity.setState(2); + if (baseResp.getErrorMsg().contains("收款人账户号出款属性不匹配")) { + entity.setRefund("提现失败,请检查支付宝账号与收款人姓名后,重试。"); + } else { + entity.setRefund(baseResp.getErrorMsg()); + } + } else if (StringUtils.isNotBlank(baseResp.getMsg())) { + entity.setState(2); + entity.setRefund("提现失败,请检查支付宝账号与收款人姓名后,重试。"); + } + baseMapper.updateById(entity); + } + } From b9564d6e747c6c192176506768a774cc99b0d5af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Thu, 26 Dec 2024 16:52:18 +0800 Subject: [PATCH 5/9] =?UTF-8?q?fix:=20=E6=9B=B4=E6=94=B9=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sqx/modules/pay/wuyou/WuyouPay.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/sqx/modules/pay/wuyou/WuyouPay.java b/src/main/java/com/sqx/modules/pay/wuyou/WuyouPay.java index efd60c3b..00116996 100644 --- a/src/main/java/com/sqx/modules/pay/wuyou/WuyouPay.java +++ b/src/main/java/com/sqx/modules/pay/wuyou/WuyouPay.java @@ -92,7 +92,7 @@ public class WuyouPay { } if (successCashCount >= Integer.parseInt(cashLimit.getValue())) { - logger.warn("提现必要参数未配置，请联系管理员"); + logger.warn("体现次数超限，当前限制{}次, 已经体现{}次", cashLimit.getValue(), successCashCount); return false; } From 93b591fac1b1c7523747126efc188ee22929dc1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Thu, 26 Dec 2024 17:00:07 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E9=A2=86=E5=8F=96=E6=BB=A1=E7=AD=BE?= =?UTF-8?q?=E5=A5=96=E5=8A=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppUserPrizeExchangeController.java | 8 +++ .../app/service/UserPrizeExchangeService.java | 6 ++ .../impl/UserPrizeExchangeServiceImpl.java | 67 +++++++++++++++++++ .../sqx/modules/userSign/dto/UserSignDTO.java | 3 + 4 files changed, 84 insertions(+) diff --git a/src/main/java/com/sqx/modules/app/controller/AppUserPrizeExchangeController.java b/src/main/java/com/sqx/modules/app/controller/AppUserPrizeExchangeController.java index 4e5a57ae..06ed48e3 100644 --- a/src/main/java/com/sqx/modules/app/controller/AppUserPrizeExchangeController.java +++ b/src/main/java/com/sqx/modules/app/controller/AppUserPrizeExchangeController.java @@ -43,4 +43,12 @@ public class AppUserPrizeExchangeController { userPrizeExchangeService.exchange(userId, entity); return Result.success(); } + + @Login + @PostMapping("/receive") + @ApiOperation("领取满签奖励") + public Result receive(@RequestAttribute("userId") Long userId) { + userPrizeExchangeService.receive(userId); + return Result.success(); + } } diff --git a/src/main/java/com/sqx/modules/app/service/UserPrizeExchangeService.java b/src/main/java/com/sqx/modules/app/service/UserPrizeExchangeService.java index 6adc1191..92b629e4 100644 --- a/src/main/java/com/sqx/modules/app/service/UserPrizeExchangeService.java +++ b/src/main/java/com/sqx/modules/app/service/UserPrizeExchangeService.java @@ -35,4 +35,10 @@ public interface UserPrizeExchangeService extends IService { */ void deliver(UserPrizeExchange dto); + + /** + * 领取满签奖励现金红包 + * @param currentUserId + */ + void receive(Long currentUserId); } diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserPrizeExchangeServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserPrizeExchangeServiceImpl.java index 88e06587..b07235c6 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserPrizeExchangeServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserPrizeExchangeServiceImpl.java @@ -1,5 +1,7 @@ package com.sqx.modules.app.service.impl; +import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Dict; import cn.hutool.core.lang.Validator; import cn.hutool.core.map.MapProxy; @@ -17,19 +19,27 @@ import com.sqx.common.utils.PageUtils; import com.sqx.modules.app.dao.UserDao; import com.sqx.modules.app.dao.UserPrizeExchangeDao; import com.sqx.modules.app.entity.UserEntity; +import com.sqx.modules.app.entity.UserMoneyDetails; import com.sqx.modules.app.entity.UserPrizeExchange; +import com.sqx.modules.app.service.UserMoneyDetailsService; +import com.sqx.modules.app.service.UserMoneyService; import com.sqx.modules.app.service.UserPrizeExchangeService; +import com.sqx.modules.common.entity.CommonInfo; +import com.sqx.modules.common.service.CommonInfoService; import com.sqx.modules.discSpinning.dao.DiscSpinningRecordDao; import com.sqx.modules.discSpinning.entity.DiscSpinningRecord; import com.sqx.modules.taskCenter.dao.TaskCenterRecordDao; import com.sqx.modules.taskCenter.dao.TaskCenterRewardDao; import com.sqx.modules.taskCenter.entity.TaskCenterRecord; import com.sqx.modules.taskCenter.entity.TaskCenterReward; +import com.sqx.modules.userSign.dto.UserSignDTO; +import com.sqx.modules.userSign.service.UserSignRecordService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.Date; import java.util.Map; @@ -47,6 +57,14 @@ public class UserPrizeExchangeServiceImpl extends ServiceImpllambdaQuery() + .eq(UserMoneyDetails::getUserId, currentUserId) + .eq(UserMoneyDetails::getType, 1) + .eq(UserMoneyDetails::getClassify, 7) + .eq(UserMoneyDetails::getMoneyType, 1) + .likeLeft(UserMoneyDetails::getTitle, "[连续签到") + .likeRight(UserMoneyDetails::getTitle, "天]") + ); + if(count > 0){ + throw new SqxException("已经领取过连续签到奖励，无需重复操作"); + } + BigDecimal money = new BigDecimal(moneyStr); + userMoneyService.updateAmount(1, currentUserId, money.doubleValue()); + UserMoneyDetails userMoneyDetails = new UserMoneyDetails(); + userMoneyDetails.setUserId(currentUserId); + userMoneyDetails.setTitle(StrUtil.format("[连续签到{}天]", signDays)); + userMoneyDetails.setContent("现金红包奖励：" + moneyStr + "元"); + // 充值 + userMoneyDetails.setType(1); + // 任务领取 + userMoneyDetails.setClassify(7); + userMoneyDetails.setMoney(money); + userMoneyDetails.setCreateTime(DateUtil.now()); + userMoneyDetails.setMoneyType(1); + userMoneyDetailsService.save(userMoneyDetails); + } } diff --git a/src/main/java/com/sqx/modules/userSign/dto/UserSignDTO.java b/src/main/java/com/sqx/modules/userSign/dto/UserSignDTO.java index 969b4b74..a464720a 100644 --- a/src/main/java/com/sqx/modules/userSign/dto/UserSignDTO.java +++ b/src/main/java/com/sqx/modules/userSign/dto/UserSignDTO.java @@ -33,6 +33,9 @@ public class UserSignDTO implements Serializable { @ApiModelProperty(value = "该用户能否参加签到活动", example = "1-允许,0-不允许") private Integer enable; + @ApiModelProperty(value = "该用户是否已领取满签奖励", example = "1-已领取,0-未领取") + private Integer isReceived; + @ApiModelProperty(value = "连续签到记录") private List recordList; } From 3f8ca43b7173564085d47b9bd003d98964ae54f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Thu, 26 Dec 2024 17:12:40 +0800 Subject: [PATCH 7/9] =?UTF-8?q?fix:=20=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=A2=9E=E5=8A=A0=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sqx/modules/job/task/TempOrdersTask.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java b/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java index b15876d4..8d81f255 100644 --- a/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java +++ b/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java @@ -78,6 +78,7 @@ public class TempOrdersTask implements ITask { for (Orders order : orders) { PayDetails payDetails = payDetailsDao.selectByOrderId(order.getOrdersNo()); if (payDetails == null) { + order.setStatus(3); continue; } if (payDetails.getState() == 1) { @@ -94,6 +95,9 @@ public class TempOrdersTask implements ITask { logger.info("payDetails：{} ", JSONUtil.toJsonStr(payDetails)); logger.info("order：{} ", JSONUtil.toJsonStr(order)); updateOrderStatus(payDetails, order); + }else { + order.setStatus(3); + updateOrderStatus(payDetails, order); } } logger.info("订单表数据处理完毕"); From b875469beb54bf7b5e720728e2fea318db770242 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Thu, 26 Dec 2024 17:38:13 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=B7=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqx/modules/job/task/TempOrdersTask.java | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java b/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java index b15876d4..01fa4597 100644 --- a/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java +++ b/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java @@ -71,7 +71,10 @@ public class TempOrdersTask implements ITask { @Override public void run(String params) { logger.info("订单表数据处理开始"); - List orders = ordersDao.selectList(Wrappers.lambdaQuery().eq(Orders::getStatus, 0)); + List orders = ordersDao.selectList(Wrappers.lambdaQuery() + .eq(Orders::getStatus, 1) + .eq(Orders::getOrdersNo, "1000001111854076") + ); if (CollUtil.isEmpty(orders)) { return; } @@ -83,17 +86,22 @@ public class TempOrdersTask implements ITask { if (payDetails.getState() == 1) { continue; } - BaseResp baseResp = WuyouPay.queryOrder(payDetails.getTradeNo(), order.getPayMoney().toString(), "Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1 Edg/131.0.0.0"); - if (baseResp.getCode() == null || baseResp.getCode() != 200) { - continue; - } - if ("SUCCESS".equals(baseResp.getPayStatus())) { - if (payDetails.getState() == 1) { + try { + BaseResp baseResp = WuyouPay.queryOrder(payDetails.getTradeNo(), order.getPayMoney().toString(), "Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1 Edg/131.0.0.0"); + logger.info("baseResp：{} ", JSONUtil.toJsonStr(baseResp)); + if (baseResp.getCode() == null || baseResp.getCode() != 200) { continue; } - logger.info("payDetails：{} ", JSONUtil.toJsonStr(payDetails)); - logger.info("order：{} ", JSONUtil.toJsonStr(order)); - updateOrderStatus(payDetails, order); + if ("SUCCESS".equals(baseResp.getPayStatus())) { + if (payDetails.getState() == 1) { + continue; + } + logger.info("payDetails：{} ", JSONUtil.toJsonStr(payDetails)); + logger.info("order：{} ", JSONUtil.toJsonStr(order)); + updateOrderStatus(payDetails, order); + } + } catch (Exception e) { + logger.error("查询订单异常：{}", e); } } logger.info("订单表数据处理完毕"); From e97df47287d31b5fd49ea65effa2ca5180b87c26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Thu, 26 Dec 2024 17:52:08 +0800 Subject: [PATCH 9/9] =?UTF-8?q?fix:=20=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=A2=9E=E5=8A=A0=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sqx/modules/job/task/TempOrdersTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java b/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java index 26895c6c..550c44bc 100644 --- a/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java +++ b/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java @@ -103,7 +103,7 @@ public class TempOrdersTask implements ITask { updateOrderStatus(payDetails, order); }else { order.setStatus(3); - payDetails.setState(3); + payDetails.setState(2); ordersDao.updateById(order); payDetailsDao.updateById(payDetails); }