提交

qmjszx-admin/src/main/java/beilv/web/controller/carinformation/CardAppController.java

@@ -119,7 +119,7 @@ public class CardAppController extends BaseController {
         createOrderTaskQueue(uuid, "chongzhi", "");
 
         //判断订单是否使用代金券
-        if(StringUtils.isNotEmpty(vipCardLog.getVoucherId())){
+        if (StringUtils.isNotEmpty(vipCardLog.getVoucherId())) {
             //修改代金券状态为已使用
             voucherMemberService.updateBeilvVoucherMember(new BeilvVoucherMember(Long.parseLong(vipCardLog.getVoucherId()), "2"));
             //当使用了代金券, 原价为, 实际支付金额+代金券金额
@@ -145,13 +145,13 @@ public class CardAppController extends BaseController {
         if (!validateOrder(vipCardLog)) {
             return AjaxResult.error("订单验证失败");
         }
-        if("weChart".equals(vipCardLog.getPaymentType())){
+        if ("weChart".equals(vipCardLog.getPaymentType())) {
             //开启订单的定时任务, 超过设定的时间则设置为取消订单.
             createOrderTaskQueue(uuid, vipCardLog.getOrderType(), vipCardLog.getBusId());
         }
 
         //判断订单是否使用代金券
-        if(StringUtils.isNotEmpty(vipCardLog.getVoucherId())){
+        if (StringUtils.isNotEmpty(vipCardLog.getVoucherId())) {
             //修改代金券状态为已使用
             voucherMemberService.updateBeilvVoucherMember(new BeilvVoucherMember(Long.parseLong(vipCardLog.getVoucherId()), "2"));
         }
@@ -167,12 +167,12 @@ public class CardAppController extends BaseController {
     @ResponseBody
     public AjaxResult addVipCardLogCallBack(@RequestBody VipCardLog vipCardLog) {
         int i = vipCardLogService.updateVipCardLogByOrderId(vipCardLog);
-        if(i>0){
-            if("payment_status_cancelled".equals(vipCardLog.getPaymentStatus())){
+        if (i > 0) {
+            if ("payment_status_cancelled".equals(vipCardLog.getPaymentStatus())) {
                 return payController.cancelOrder(vipCardLog.getId());
             }
             return toAjax(i);
-        }else{
+        } else {
             return AjaxResult.error("取消订单失败!");
         }
 
@@ -185,12 +185,12 @@ public class CardAppController extends BaseController {
     @ResponseBody
     public AjaxResult addOrderLogCallBack(@RequestBody VipCardLog vipCardLog) {
         int i = vipCardLogService.updateVipCardLogByOrderId(vipCardLog);
-        if(i>0){
-            if("payment_status_cancelled".equals(vipCardLog.getPaymentStatus())){
+        if (i > 0) {
+            if ("payment_status_cancelled".equals(vipCardLog.getPaymentStatus())) {
                 return payController.cancelOrder(vipCardLog.getId());
             }
             return toAjax(i);
-        }else{
+        } else {
             return AjaxResult.error("取消订单失败!");
         }
     }
@@ -212,7 +212,7 @@ public class CardAppController extends BaseController {
     @ResponseBody
     public AjaxResult refund(@RequestBody VipCardLog vipCardLog) {
         AjaxResult ajaxResult = vipCardLogService.refundById(vipCardLog, true);
-        if(ajaxResult.get("data")!= null){
+        if (ajaxResult.get("data") != null) {
             VipCardLog data = (VipCardLog) ajaxResult.get("data");
             AppRefundParam appRefundParam = new AppRefundParam();
             appRefundParam.setOrderId(data.getId());
@@ -220,9 +220,9 @@ public class CardAppController extends BaseController {
             appRefundParam.setRefundAmount(data.getRefundPrice());
             appRefundParam.setUserId(Long.valueOf(data.getUserId()));
             appRefundParam.setDescription(vipCardLog.getDescription());
-            try{
+            try {
                 payController.refund(appRefundParam);
-            }catch (Exception e){
+            } catch (Exception e) {
                 return AjaxResult.error("退款失败!");
             }
         }
@@ -239,7 +239,7 @@ public class CardAppController extends BaseController {
         //查询会员等级
         String vipLevel = vipCardService.selectVipCardByUserId(carInformation.getUserId()).getVipLevel();
         //查询会员折扣
-        BigDecimal coefficient = BigDecimal.valueOf(Double.parseDouble(StringUtils.isEmpty(configService.selectConfigByKey(vipLevel))? "1" : configService.selectConfigByKey(vipLevel)));
+        BigDecimal coefficient = BigDecimal.valueOf(Double.parseDouble(StringUtils.isEmpty(configService.selectConfigByKey(vipLevel)) ? "1" : configService.selectConfigByKey(vipLevel)));
         list.forEach(carInformation1 -> carInformation1.setMemberPrice(carInformation1.getOriginalPrice().multiply(coefficient).setScale(2, RoundingMode.HALF_UP)));
         return AjaxResult.success(getDataTable(list).getRows());
     }
@@ -302,7 +302,7 @@ public class CardAppController extends BaseController {
         String orderType = vipCardLog.getOrderType();
         String paymentType = vipCardLog.getPaymentType();
 
-        boolean flag  = true;
+        boolean flag = true;
 
         //约球和参赛订单需要验证, 购卡和门票订单无需验证
         if ("yueqiu".equals(orderType)) {
@@ -313,7 +313,7 @@ public class CardAppController extends BaseController {
             flag = validateCanSaiOrder(vipCardLog);
         }
 
-        if(!flag){
+        if (!flag) {
             return flag;
         }
 
@@ -379,7 +379,7 @@ public class CardAppController extends BaseController {
         //写入会员卡流水
         vipCardLogService.insertAmountLog(vipCardAmountLog);
 
-        if("yueqiu".equals(vipCardLog.getOrderType())){
+        if ("yueqiu".equals(vipCardLog.getOrderType())) {
             //如果是约球订单
             AdmissionTicket admissionTicket = new AdmissionTicket();
             admissionTicket.setId(vipCardLog.getBusId());
@@ -402,7 +402,7 @@ public class CardAppController extends BaseController {
         userMembershipCard.setRemainingNumber(userMembershipCard.getRemainingNumber() - 1);
         userMembershipCardService.updateUserMembershipCard(userMembershipCard);
 
-        if("yueqiu".equals(vipCardLog.getOrderType())){
+        if ("yueqiu".equals(vipCardLog.getOrderType())) {
             //如果是约球订单
             AdmissionTicket admissionTicket = new AdmissionTicket();
             admissionTicket.setId(vipCardLog.getBusId());
@@ -412,9 +412,9 @@ public class CardAppController extends BaseController {
         return true;
     }
 
-    private AjaxResult insertVipCardLog(VipCardLog vipCardLog, String uuid){
+    private AjaxResult insertVipCardLog(VipCardLog vipCardLog, String uuid) {
         if (vipCardLogService.insertVipCardLog(vipCardLog) > 0) {
-            if("gouka".equals(vipCardLog.getOrderType())){
+            if ("gouka".equals(vipCardLog.getOrderType())) {
                 //如果是购买次卡订单, 拉去卡种信息
                 CarInformation carInformation = carInformationService.selectCarInformationById(Long.valueOf(vipCardLog.getBusId()));
                 //购卡订单, 支付成功, 生成卡片写入到次卡表
@@ -432,18 +432,18 @@ public class CardAppController extends BaseController {
      * amount_type
      */
     @GetMapping("/selectPointsTransactionHistory")
-    public AjaxResult selectPointsTransactionHistory(VipCardAmountLog amountLog){
+    public AjaxResult selectPointsTransactionHistory(VipCardAmountLog amountLog) {
         startPage();
         HashMap<String, Object> result = new HashMap<>();
         List<Map<String, Object>> maps = amountLogService.selectVipCardAmountLogListAndOrderInfo(amountLog);
-        maps.forEach(map->{
-            map.put("createTime", MapUtils.getString(map,"createTime").replace("T", " "));
+        maps.forEach(map -> {
+            map.put("createTime", MapUtils.getString(map, "createTime").replace("T", " "));
         });
 
-        result.put("historyList",maps);
-        if("1".equals(amountLog.getAmountType())){
+        result.put("historyList", maps);
+        if ("1".equals(amountLog.getAmountType())) {
             result.put("balance", vipCardService.selectVipCardByUserId(amountLog.getUserId()).getBalance());
-        }else if("2".equals(amountLog.getAmountType())){
+        } else if ("2".equals(amountLog.getAmountType())) {
             result.put("score", vipCardService.selectVipCardByUserId(amountLog.getUserId()).getScore());
         }
         return AjaxResult.success(result);

qmjszx-business/src/main/java/beilv/admissionticket/service/impl/AdmissionTicketServiceImpl.java

@@ -156,7 +156,9 @@ public class AdmissionTicketServiceImpl implements IAdmissionTicketService {
         AdmissionTicket admissionTicket = beilvAdmissionTicketMapper.selectBeilvAdmissionTicketById(AdmissionTicket.getId());
         Date ticketDate = admissionTicket.getTicketDate(); //2025-11-14
         String session = admissionTicket.getSession().split("-")[0] + ":00"; //10:00:00
-
+        if (session.length() == 7) {
+            session = "0" + session; // 将 8:00 补充成 08:00
+        }
         // 将日期和时间拼接成一个字符串
         String dateTimeStr = ticketDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate() + " " + session;
 

qmjszx-business/src/main/java/beilv/vipCardLog/service/impl/VipCardLogServiceImpl.java

@@ -304,6 +304,10 @@ public class VipCardLogServiceImpl implements IVipCardLogService {
                 // 定义日期时间格式器
                 DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
 
+                if (startTime.length() == 4) {
+                    startTime = "0" + startTime; // 将 8:00 补充成 08:00
+                }
+
                 // 将 startTime 转换为 LocalDateTime
                 LocalDateTime startDateTime = LocalDateTime.parse(format + " " + startTime, formatter);
 

qmjszx-business/src/main/resources/mapper/voucher/BeilvVoucherMemberMapper.xml

@@ -32,8 +32,8 @@
                vm.is_validity,
                v.instant_discount
         FROM beilv_voucher v
-                 left join beilv_voucher_member vm on v.id = vm.voucher_id
-                 left join sys_member m on vm.member_id = m.id
+                 inner join beilv_voucher_member vm on v.id = vm.voucher_id
+                 inner join sys_member m on vm.member_id = m.id
         where v.id = #{voucherId}
     </select>
 
@@ -83,7 +83,7 @@
     </delete>
 
     <select id="selectAppVoucherList" parameterType="BeilvVoucherMember" resultMap="BeilvVoucherMemberResult">
-        SELECT v.id,
+        SELECT vm.id,
         v.voucher_name,
         v.voucher_price,
         v.voucher_type,

qmjszx-pay/src/main/java/beilv/wx/pay/service/IWxPayService.java

@@ -312,8 +312,8 @@ public class IWxPayService {
         //退款原因说明
         request.setReason(param.getReason());
         WxPayRefundV3Request.Amount amount = new WxPayRefundV3Request.Amount();
-        //原订单总金额（单位：分）
-        amount.setTotal(yuanToFen(param.getTotalPrice()));
+        //原订单实际支付金额（单位：分）
+        amount.setTotal(yuanToFen(param.getRefundAmount()));
         //退款金额（单位：分）
         amount.setRefund(yuanToFen(param.getRefundAmount()));
         //货币类型，默认 "CNY"