diff --git a/CatmDogd-Mall-Front-test/src/views/marketing/wechatStock/index.vue b/CatmDogd-Mall-Front-test/src/views/marketing/wechatStock/index.vue index 4dead73..9731fe1 100644 --- a/CatmDogd-Mall-Front-test/src/views/marketing/wechatStock/index.vue +++ b/CatmDogd-Mall-Front-test/src/views/marketing/wechatStock/index.vue @@ -30,33 +30,34 @@ - - - + + + - - - - - - + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - - - - - - + + + + + +
diff --git a/ruoyi-admin/src/main/resources/application-druid-root.yml b/ruoyi-admin/src/main/resources/application-druid-root.yml index 1be2f95..9620f57 100644 --- a/ruoyi-admin/src/main/resources/application-druid-root.yml +++ b/ruoyi-admin/src/main/resources/application-druid-root.yml @@ -57,8 +57,8 @@ wechat: secret: 你的微信服务号密钥 merchantId: 1665639691 # privateKeyPath: /data/software/app/key/apiclient_key.pem - privateKeyPath: E:\\file\\2025\\1\pet-admin\\ruoyi-admin\\src\\main\\resources\\apiclient_key.pem -# privateKeyPath: E:\\file\\2025\\project\\1\pet-admin\\ruoyi-admin\\src\\main\\resources\\apiclient_key.pem +# privateKeyPath: E:\\file\\2025\\1\pet-admin\\ruoyi-admin\\src\\main\\resources\\apiclient_key.pem + privateKeyPath: E:\\file\\2025\\project\\1\pet-admin\\ruoyi-admin\\src\\main\\resources\\apiclient_key.pem # privateKeyPath: /root/pem/apiclient_key.pem # privateKeyPath: F:\\java_work\\team_work_java\\pet-admin-25-01-25\\pet-admin\\ruoyi-admin\\src\\main\\resources\\apiclient_key.pem #privateKeyPath: /Users/daixiande/Work/杂七杂八/1665639691_20240111_cert/apiclient_key.pem @@ -134,8 +134,8 @@ wechat-admin: staffAppId: wx01f0f43759922fda staffSecret: b0a5617e6e4c387262a32af2b355c8b6 # publicKeyPath: /root/pem/pub_key.pem - publicKeyPath: E:\\file\\2025\\1\pet-admin\\ruoyi-admin\\src\\main\\resources\\pub_key.pem -# publicKeyPath: E:\\file\\2025\\project\\1\pet-admin\\ruoyi-admin\\src\\main\\resources\\pub_key.pem +# publicKeyPath: E:\\file\\2025\\1\pet-admin\\ruoyi-admin\\src\\main\\resources\\pub_key.pem + publicKeyPath: E:\\file\\2025\\project\\1\pet-admin\\ruoyi-admin\\src\\main\\resources\\pub_key.pem # publicKeyPath: /data/software/app/key/pub_key.pem publicKeyId: PUB_KEY_ID_0116656396912025062400291558001601 pay: diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletExaminationController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletExaminationController.java index cb2a300..3a34c09 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletExaminationController.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletExaminationController.java @@ -405,23 +405,42 @@ public class ApiAppletExaminationController { @GetMapping("/retakeExam") public AjaxResult retakeExam(Long userId, Integer type){ - if (type == 0){//清除基本考核 + List qid = appletQuestionService.lambdaQuery() + .eq(AppletQuestion::getType, "培训") + .select(AppletQuestion::getId) + .list().stream().map(n -> n.getId()) + .collect(Collectors.toList()); + + if (type == 0){//清除所有 LambdaQueryWrapper qw1 = Wrappers.lambdaQuery() .eq(AppletAnswerBase::getUserId, userId); appletAnswerBaseMapper.delete(qw1); - } - LambdaQueryWrapper qw2 = Wrappers.lambdaQuery() - .eq(AppletAnswerTrain::getUserId, userId); + LambdaQueryWrapper qw2 = Wrappers.lambdaQuery() + .eq(AppletAnswerTrain::getUserId, userId); + + appletAnswerTrainMapper.delete(qw2); - appletAnswerTrainMapper.delete(qw2); + }else if (qid.size() > 0){//清除培训 + + LambdaQueryWrapper qw1 = Wrappers.lambdaQuery() + .in(AppletAnswerBase::getQuestionId, qid) + .eq(AppletAnswerBase::getUserId, userId); + + appletAnswerBaseMapper.delete(qw1); + + LambdaQueryWrapper qw2 = Wrappers.lambdaQuery() + .in(AppletAnswerTrain::getQuestionId, qid) + .eq(AppletAnswerTrain::getUserId, userId); + + appletAnswerTrainMapper.delete(qw2); + } AppletUsersTeacher one = appletUsersTeacherService.lambdaQuery() .eq(AppletUsersTeacher::getUserId, userId) .one(); - if (ObjectUtils.isNotEmpty(one)){ one.setStatus(0L); one.setReason(""); diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/service/impl/IApiMallOrderServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/service/impl/IApiMallOrderServiceImpl.java index 2203398..a14ffab 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/service/impl/IApiMallOrderServiceImpl.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/service/impl/IApiMallOrderServiceImpl.java @@ -510,7 +510,7 @@ public class IApiMallOrderServiceImpl implements IApiMallOrderService { Long payId = IDGenerator.generateId(); WechatPaymentHistory wechatPaymentHistory = new WechatPaymentHistory(); - wechatPaymentHistory.setId(payId); + wechatPaymentHistory.setPayId(payId); wechatPaymentHistory.setOrderId(order.getId()); wechatPaymentHistory.setMemberId(req.getMemberId()); wechatPaymentHistory.setOpenid(memberWechat.getRoutineOpenid()); diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java b/ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java index 8e2b9e3..75793d6 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -1166,6 +1167,14 @@ public class H5OrderService { paymentWrapper.eq("order_id", messageDTO.getOutTradeNo()); paymentWrapper.eq("op_type", Constants.PaymentOpType.PAY); WechatPaymentHistory paymentHistory = wechatPaymentHistoryMapper.selectOne(paymentWrapper); + + if(paymentHistory == null){ + LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); + paymentHistory = wechatPaymentHistoryMapper.selectOne(qw + .eq(WechatPaymentHistory::getPayId, messageDTO.getOutTradeNo()) + .eq(WechatPaymentHistory::getOpType, Constants.PaymentOpType.PAY)); + } + if (paymentHistory.getPaymentStatus() != Constants.PaymentStatus.INCOMPLETE) { log.info("【订单支付回调】支付订单不是未支付状态，不再处理" + "orderId" + paymentHistory.getOrderId() + "status" + paymentHistory.getPaymentStatus()); throw new RuntimeException(); @@ -1200,6 +1209,11 @@ public class H5OrderService { .set("payment_status", Constants.PaymentStatus.COMPLETE).set("update_time", optDate); wechatPaymentHistoryMapper.update(null, paymentHistoryUpdateWrapper); + LambdaUpdateWrapper qw = new LambdaUpdateWrapper<>(); + wechatPaymentHistoryMapper.update(null, qw + .eq(WechatPaymentHistory::getPayId, messageDTO.getOutTradeNo()) + .set(WechatPaymentHistory::getPaymentStatus, Constants.PaymentStatus.COMPLETE) + .set(WechatPaymentHistory::getUpdateTime, optDate)); }catch (Exception e){ log.error("订单支付回调异常",e); diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/WechatPaymentHistory.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/WechatPaymentHistory.java index 2327111..5267cc7 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/WechatPaymentHistory.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/WechatPaymentHistory.java @@ -45,6 +45,10 @@ public class WechatPaymentHistory extends BaseAudit { @Excel(name = "订单号 支付时是payId 其他为orderId") private Long orderId; + @ApiModelProperty("订单号 支付时是payId") + @Excel(name = "订单号 支付时是payId") + private Long payId; + @ApiModelProperty("金额，单位分") @Excel(name = "金额，单位分") private BigDecimal money;