From 099334425471e7837b3561c8f5f48046826fec64 Mon Sep 17 00:00:00 2001
From: attiya <2413103649@qq.com>
Date: Wed, 30 Apr 2025 16:14:08 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/cdzy/orders/model/dto/res/RspBikeDto.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ebike-orders/src/main/java/com/cdzy/orders/model/dto/res/RspBikeDto.java b/ebike-orders/src/main/java/com/cdzy/orders/model/dto/res/RspBikeDto.java
index 44c6deb8..a7c2feb5 100644
--- a/ebike-orders/src/main/java/com/cdzy/orders/model/dto/res/RspBikeDto.java
+++ b/ebike-orders/src/main/java/com/cdzy/orders/model/dto/res/RspBikeDto.java
@@ -16,9 +16,10 @@ public class RspBikeDto {
     private Integer soc;
     private Double longitude;
     private Double latitude;
-    // TODO:判断车辆状态
+    // TODO:判断车辆状态、车辆编号
     private String status = "正常";
     private Float mileage = 35.5F;
+    private String bikeCode = "1111111111111111111";
 
     public RspBikeDto(String ecuSn, Integer soc, Double longitude, Double latitude) {
         this.ecuSn = ecuSn;

From ad34ae1f10c509866ff45e9b19a522996fcaaa9d Mon Sep 17 00:00:00 2001
From: jkcdev <dingchao@jkcchina.com>
Date: Wed, 30 Apr 2025 16:28:43 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E3=80=81=E9=80=80=E6=AC=BE=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=88=E5=90=8E=E9=9D=A2=E8=80=83=E8=99=91?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E4=BF=9D=E7=95=99=E6=9F=A5=E8=AF=A2=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=94=AF=E4=BB=98=E8=8E=B7=E5=8F=96=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E3=80=81=E9=80=80=E6=AC=BE=E8=AF=A6=E6=83=85=E7=9A=84=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=89=E8=BF=94=E5=9B=9E=E6=98=AF=E5=90=A6=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EbikeWxPaymentController.java  |  16 +-
 .../payment/service/EbikePaymentService.java  |   7 +
 .../cdzy/payment/service/WxPayService.java    |  18 ++
 .../service/impl/EbikePaymentServiceImpl.java |   9 +-
 .../service/impl/WxPayServiceImpl.java        | 160 +++++++++++-------
 5 files changed, 144 insertions(+), 66 deletions(-)

diff --git a/ebike-payment/src/main/java/com/cdzy/payment/controller/EbikeWxPaymentController.java b/ebike-payment/src/main/java/com/cdzy/payment/controller/EbikeWxPaymentController.java
index 50d79def..cd9dd9ed 100644
--- a/ebike-payment/src/main/java/com/cdzy/payment/controller/EbikeWxPaymentController.java
+++ b/ebike-payment/src/main/java/com/cdzy/payment/controller/EbikeWxPaymentController.java
@@ -70,6 +70,18 @@ public class EbikeWxPaymentController {
         return r == null?JsonResult.failed(String.format("骑行订单号{%s}查询支付订单失败", outTradeNo)):JsonResult.success(r);
     }
 
+    /**
+     * 通过交易订单号查询支付订单状态
+     *
+     * @param transactionId 微信支付订单号
+     * @return 支付订单信息
+     */
+    @GetMapping("/queryOrderStatusById/{transactionId}")
+    public JsonResult<?> queryOrderStatusById(@PathVariable String transactionId) {
+        HandleNotifyResult r = wxPayService.queryOrderStatusById(transactionId);
+        return JsonResult.success(r);
+    }
+
     /**
      * 退款申请
      *
@@ -88,12 +100,14 @@ public class EbikeWxPaymentController {
      * @param outRefundNo 商户(骑行)退款单号
      * @return 退款信息
      */
-    @GetMapping("/refundQuery/{outRefundNo}")
+    @GetMapping("/queryRefund/{outRefundNo}")
     public JsonResult<?> refundQuery(@PathVariable String outRefundNo) {
         Refund r = wxPayService.queryRefundByOutNo(outRefundNo);
         return r == null?JsonResult.failed(String.format("退款单号{%s}查询退款失败", outRefundNo)):JsonResult.success(r);
     }
 
+
+
     // ================通知回调接口===============
     // TODO 通知接口不能鉴权
     /**
diff --git a/ebike-payment/src/main/java/com/cdzy/payment/service/EbikePaymentService.java b/ebike-payment/src/main/java/com/cdzy/payment/service/EbikePaymentService.java
index 1067bb83..287cf606 100644
--- a/ebike-payment/src/main/java/com/cdzy/payment/service/EbikePaymentService.java
+++ b/ebike-payment/src/main/java/com/cdzy/payment/service/EbikePaymentService.java
@@ -37,4 +37,11 @@ public interface EbikePaymentService extends IService<EbikePayment> {
      */
     Boolean updatePaymentStatus(Transaction transaction);
 
+    /**
+     * 根据支付订单id查询支付记录
+     *
+     * @param paymentId 支付订单id
+     * @return
+     */
+    EbikePayment getByPaymentId(String paymentId);
 }
diff --git a/ebike-payment/src/main/java/com/cdzy/payment/service/WxPayService.java b/ebike-payment/src/main/java/com/cdzy/payment/service/WxPayService.java
index bcba35cf..a68cf42a 100644
--- a/ebike-payment/src/main/java/com/cdzy/payment/service/WxPayService.java
+++ b/ebike-payment/src/main/java/com/cdzy/payment/service/WxPayService.java
@@ -26,6 +26,7 @@ public interface WxPayService {
      * @return
      */
     boolean closeOrder(String outTradeNo);
+
     /**
      * JSAPI支付下单
      *
@@ -46,6 +47,7 @@ public interface WxPayService {
      * @return 支付订单信息
      */
     Transaction queryOrderById(String transactionId);
+
     /**
      * 通过商户(骑行)订单号查询支付订单
      *
@@ -54,6 +56,14 @@ public interface WxPayService {
      */
     Transaction queryOrderByOutTradeNo(String outTradeNo);
 
+    /**
+     * 通过交易订单号查询支付订单状态
+     *
+     * @param transactionId 微信支付订单号
+     * @return 支付订单信息
+     */
+    HandleNotifyResult queryOrderStatusById(String transactionId);
+
     /**
      * 处理支付回调
      *
@@ -82,6 +92,14 @@ public interface WxPayService {
      */
     Refund queryRefundByOutNo(String outRefundNo);
 
+    /**
+     * 通过商户退款单号查询退款信息状态
+     *
+     * @param outRefundNo 商户退款订单号
+     * @return 退款信息
+     */
+    HandleNotifyResult queryRefundStatusByOutNo(String outRefundNo);
+
     /**
      * 处理支退款回调
      *
diff --git a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikePaymentServiceImpl.java b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikePaymentServiceImpl.java
index a55879ca..3f171cdb 100644
--- a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikePaymentServiceImpl.java
+++ b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikePaymentServiceImpl.java
@@ -58,7 +58,7 @@ public class EbikePaymentServiceImpl extends ServiceImpl<EbikePaymentMapper, Ebi
         ebikePayment.setTradeState(String.valueOf(transaction.getTradeState().ordinal()));
         if (Transaction.TradeStateEnum.SUCCESS.equals(transaction.getTradeState())) {
             // 支付成功， 更新订单状态
-            double v = transaction.getAmount().getTotal().doubleValue() / 100.0;
+            double v = transaction.getAmount().getPayerTotal().doubleValue() / 100.0;
             ebikePayment.setTotal(v);
             String paymentTime = transaction.getSuccessTime();
             ebikePayment.setPaymentTime(StringUtils.toLocalDatetime(paymentTime));
@@ -73,4 +73,11 @@ public class EbikePaymentServiceImpl extends ServiceImpl<EbikePaymentMapper, Ebi
                .where(EBIKE_PAYMENT.PAYMENT_ID.eq(transaction.getTransactionId()));
         return update(ebikePayment, query);
     }
+
+    @Override
+    public EbikePayment getByPaymentId(String paymentId) {
+        QueryWrapper query = QueryWrapper.create()
+              .where(EBIKE_PAYMENT.PAYMENT_ID.eq(paymentId));
+        return this.getOne(query);
+    }
 }
diff --git a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/WxPayServiceImpl.java b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/WxPayServiceImpl.java
index 9e6c8b0d..501fd507 100644
--- a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/WxPayServiceImpl.java
+++ b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/WxPayServiceImpl.java
@@ -147,26 +147,44 @@ public class WxPayServiceImpl implements WxPayService {
 
     @Override
     public Transaction queryOrderById(String transactionId) {
-        try {
-            QueryOrderByIdRequest request = new QueryOrderByIdRequest();
-            request.setTransactionId(transactionId);
-            return wxJsapiService.queryOrderById(request);
-        }catch (Exception e) {
-            logError("通过交易订单号查询支付订单queryOrderById", e);
-        }
-        return null;
+        QueryOrderByIdRequest request = new QueryOrderByIdRequest();
+        request.setTransactionId(transactionId);
+        return wxJsapiService.queryOrderById(request);
     }
 
     @Override
     public Transaction queryOrderByOutTradeNo(String outTradeNo) {
-        try {
-            QueryOrderByOutTradeNoRequest request = new QueryOrderByOutTradeNoRequest();
-            request.setOutTradeNo(outTradeNo);
-            return wxJsapiService.queryOrderByOutTradeNo(request);
-        }catch (Exception e) {
-            logError("通过商户(骑行)订单号查询支付订单queryOrderByOutTradeNo", e);
-            return null;
+        QueryOrderByOutTradeNoRequest request = new QueryOrderByOutTradeNoRequest();
+        request.setOutTradeNo(outTradeNo);
+        return wxJsapiService.queryOrderByOutTradeNo(request);
+    }
+
+    @Override
+    public HandleNotifyResult queryOrderStatusById(String transactionId) {
+        // 先查本地数据库，如果退款状态不为SUCCESS，需要查询微信支付
+        HandleNotifyResult result = new HandleNotifyResult();
+        EbikePayment ebikePayment = ebikePaymentService.getByPaymentId(transactionId);
+        if (ebikePayment==null){
+            log.error("{}支付订单不存在", transactionId);
+            result.setMessage(String.format("{%s}支付订单不存在", transactionId));
+            return result;
         }
+        result.setSuccess(String.valueOf(Transaction.TradeStateEnum.SUCCESS.ordinal()).equals(ebikePayment.getTradeState()));
+        if (result.isSuccess()){
+            result.setMessage(String.format("订单%s支付成功", ebikePayment.getOrderId()));
+            return result;
+        }
+        QueryOrderByIdRequest request = new QueryOrderByIdRequest();
+        request.setTransactionId(transactionId);
+        Transaction r = wxJsapiService.queryOrderById(request);
+        if(r!=null&& r.getTradeState().equals(Transaction.TradeStateEnum.SUCCESS)) {
+            result.setMessage(String.format("订单%s支付成功", ebikePayment.getOrderId()));
+            result.setSuccess(true);
+            // 更新支付状态
+            ebikePaymentService.updatePaymentStatus(r);
+            return result;
+        }
+        return result;
     }
 
     @Override
@@ -177,14 +195,12 @@ public class WxPayServiceImpl implements WxPayService {
         String nonce = request.getHeader(WECHAT_PAY_NONCE);
         String serialNo = request.getHeader(WECHAT_PAY_SERIAL);
         String signature = request.getHeader(WECHAT_PAY_SIGNATURE);
-        String signatureType = request.getHeader(WECHAT_PAY_SIGNATURE+"-Type");
         String timestamp = request.getHeader(WECHAT_PAY_TIMESTAMP);
 
         try {
             RequestParam requestParam = new RequestParam.Builder()
                     .serialNumber(serialNo)
                     .signature(signature)
-                    .signType(signatureType)
                     .timestamp(timestamp)
                     .body(HttpServletUtils.getRequestBody(request))
                     .nonce(nonce)
@@ -208,58 +224,76 @@ public class WxPayServiceImpl implements WxPayService {
 
     @Override
     public String refund(String transactionId, String outTradeNo, String reason, AmountRefundDto amount) {
-        try {
-            // 雪花算法生成退款单号
-            String outRefundNo = StringUtils.generateSnowflakeId("refundId");
-            EbikeRefund ebikeRefund = new EbikeRefund();
-            ebikeRefund.setCreateTime(LocalDateTime.now());
-            // 发起退款
-            CreateRequest request = new CreateRequest();
-            request.setTransactionId(transactionId);
-            request.setOutTradeNo(outTradeNo);
-            request.setOutRefundNo(outRefundNo);
-            request.setReason(reason);
-            request.setNotifyUrl(wxPayConfig.getRefundNotifyUrl());
-            AmountReq amountReq = new AmountReq();
-            amountReq.setRefund(BigDecimal.valueOf(amount.getRefund() * 100.0).longValue());
-            amountReq.setTotal(BigDecimal.valueOf(amount.getTotal() * 100.0).longValue());
-            amountReq.setCurrency(amount.getCurrency());
-            request.setAmount(amountReq);
-            Refund result = wxRefundService.create(request);
-            // 入库
-            if (result != null) {
-                ebikeRefund.setRefundId(outRefundNo);
-                ebikeRefund.setOrderId(outTradeNo);
-                ebikeRefund.setPaymentId(transactionId);
-                ebikeRefund.setTotal(amount.getTotal());
-                ebikeRefund.setReason(reason);
-                ebikeRefund.setStatus(String.valueOf(result.getStatus().ordinal()));
-                ebikeRefund.setCurrency(amount.getCurrency());
-                if(Status.SUCCESS.equals(result.getStatus())){
-                    ebikeRefund.setRefund(result.getAmount().getRefund().doubleValue() / 100.0);
-                    ebikeRefund.setRefundTime(LocalDateTime.now());
-                }
-                ebikeRefundService.saveRefundResult(ebikeRefund);
-                return outRefundNo;
+        // 雪花算法生成退款单号
+        String outRefundNo = StringUtils.generateSnowflakeId("refundId");
+        EbikeRefund ebikeRefund = new EbikeRefund();
+        ebikeRefund.setCreateTime(LocalDateTime.now());
+        // 发起退款
+        CreateRequest request = new CreateRequest();
+        request.setTransactionId(transactionId);
+        request.setOutTradeNo(outTradeNo);
+        request.setOutRefundNo(outRefundNo);
+        request.setReason(reason);
+        request.setNotifyUrl(wxPayConfig.getRefundNotifyUrl());
+        AmountReq amountReq = new AmountReq();
+        amountReq.setRefund(BigDecimal.valueOf(amount.getRefund() * 100.0).longValue());
+        amountReq.setTotal(BigDecimal.valueOf(amount.getTotal() * 100.0).longValue());
+        amountReq.setCurrency(amount.getCurrency());
+        request.setAmount(amountReq);
+        Refund result = wxRefundService.create(request);
+        // 入库
+        if (result != null) {
+            ebikeRefund.setRefundId(outRefundNo);
+            ebikeRefund.setOrderId(outTradeNo);
+            ebikeRefund.setPaymentId(transactionId);
+            ebikeRefund.setTotal(amount.getTotal());
+            ebikeRefund.setReason(reason);
+            ebikeRefund.setStatus(String.valueOf(result.getStatus().ordinal()));
+            ebikeRefund.setCurrency(amount.getCurrency());
+            if(Status.SUCCESS.equals(result.getStatus())){
+                ebikeRefund.setRefund(result.getAmount().getRefund().doubleValue() / 100.0);
+                ebikeRefund.setRefundTime(LocalDateTime.now());
             }
-            log.error("退款申请refund失败，订单号：{}", outTradeNo);
-            return null;
-        }catch (Exception e) {
-            logError("退款申请refund", e);
-            return null;
+            ebikeRefundService.saveRefundResult(ebikeRefund);
+            return outRefundNo;
         }
+        log.error("退款申请refund失败，订单号：{}", outTradeNo);
+        return null;
     }
 
     @Override
     public Refund queryRefundByOutNo(String outRefundNo) {
-        try {
-            QueryByOutRefundNoRequest request = new QueryByOutRefundNoRequest();
-            request.setOutRefundNo(outRefundNo);
-            return wxRefundService.queryByOutRefundNo(request);
-        }catch (Exception e) {
-            logError("通过商户退款单号查询退款queryByOutRefundNo", e);
-            return null;
+        QueryByOutRefundNoRequest request = new QueryByOutRefundNoRequest();
+        request.setOutRefundNo(outRefundNo);
+        return wxRefundService.queryByOutRefundNo(request);
+    }
+
+    @Override
+    public HandleNotifyResult queryRefundStatusByOutNo(String outRefundNo) {
+        HandleNotifyResult result = new HandleNotifyResult();
+        // 先查本地数据库，如果退款状态不为SUCCESS，需要查询微信支付
+        EbikeRefund ebikeRefund = ebikeRefundService.getById(outRefundNo);
+        if (ebikeRefund==null){
+            log.error("{}退款订单不存在", outRefundNo);
+            result.setMessage(String.format("{%s}退款订单不存在", outRefundNo));
+            return result;
         }
+        result.setSuccess(String.valueOf(Status.SUCCESS.ordinal()).equals(ebikeRefund.getStatus()));
+        if (result.isSuccess()){
+            result.setMessage(String.format("退款%s成功", ebikeRefund.getRefundId()));
+            return result;
+        }
+        QueryByOutRefundNoRequest request = new QueryByOutRefundNoRequest();
+        request.setOutRefundNo(outRefundNo);
+        Refund r = wxRefundService.queryByOutRefundNo(request);
+        if(r!=null&& r.getStatus().equals(Status.SUCCESS)) {
+            result.setMessage(String.format("退款%s成功", ebikeRefund.getRefundId()));
+            result.setSuccess(true);
+            // 更新退款状态
+            ebikeRefundService.updateRefundStatus(r);
+            return result;
+        }
+        return result;
     }
 
     @Override
@@ -270,14 +304,12 @@ public class WxPayServiceImpl implements WxPayService {
         String nonce = request.getHeader(WECHAT_PAY_NONCE);
         String serialNo = request.getHeader(WECHAT_PAY_SERIAL);
         String signature = request.getHeader(WECHAT_PAY_SIGNATURE);
-        String signatureType = request.getHeader(WECHAT_PAY_SIGNATURE+"-Type");
         String timestamp = request.getHeader(WECHAT_PAY_TIMESTAMP);
 
         try {
             RequestParam requestParam = new RequestParam.Builder()
                     .serialNumber(serialNo)
                     .signature(signature)
-                    .signType(signatureType)
                     .timestamp(timestamp)
                     .body(HttpServletUtils.getRequestBody(request))
                     .nonce(nonce)

From 9d51479b97cb11880104b0db01d1ec96e2ae5424 Mon Sep 17 00:00:00 2001
From: jkcdev <dingchao@jkcchina.com>
Date: Wed, 30 Apr 2025 16:35:27 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E3=80=81=E9=80=80=E6=AC=BE=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=88=E5=90=8E=E9=9D=A2=E8=80=83=E8=99=91?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E4=BF=9D=E7=95=99=E6=9F=A5=E8=AF=A2=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=94=AF=E4=BB=98=E8=8E=B7=E5=8F=96=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E3=80=81=E9=80=80=E6=AC=BE=E8=AF=A6=E6=83=85=E7=9A=84=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=89=E8=BF=94=E5=9B=9E=E6=98=AF=E5=90=A6=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cdzy/payment/service/impl/EbikeRefundServiceImpl.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeRefundServiceImpl.java b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeRefundServiceImpl.java
index edbf5546..541ac01a 100644
--- a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeRefundServiceImpl.java
+++ b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeRefundServiceImpl.java
@@ -32,9 +32,11 @@ public class EbikeRefundServiceImpl extends ServiceImpl<EbikeRefundMapper, Ebike
 
     @Override
     public Boolean saveRefundResult(EbikeRefund ebikeRefund) {
+        boolean r = save(ebikeRefund);
         // 同步发起退款
-        ordersFeignClient.refund(Long.valueOf(ebikeRefund.getOrderId()));
-        return save(ebikeRefund);
+        if(r)
+            ordersFeignClient.refund(Long.valueOf(ebikeRefund.getOrderId()));
+        return r;
     }
 
     @Override

From 4e14306c1b532e1447cfbf2d73a4f56af14c6097 Mon Sep 17 00:00:00 2001
From: dzl <863620989@qq.com>
Date: Wed, 30 Apr 2025 17:32:58 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=BF=90=E8=90=A5=E5=8C=BA=E5=9F=9F?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF=E6=96=B0=E5=A2=9E=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E7=BC=96=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request/ReqEbikeSysOperateSetSaveDto.java |  3 +-
 .../dto/request/ReqEbikeSysRbacksetDto.java   |  5 +-
 .../request/ReqEbikeSysRoperatesetDto.java    |  3 +-
 .../response/ResEbikeSysOperateSetDto.java    |  3 +-
 .../dto/response/ResEbikeSysRbacksetDto.java  |  5 +-
 .../response/ResEbikeSysRoperatesetDto.java   |  3 +-
 .../model/pojo/EbikeSysLinktel.java           |  2 +-
 .../model/pojo/EbikeSysOperateSet.java        |  2 +-
 .../model/pojo/EbikeSysRbackset.java          |  2 +-
 .../model/pojo/EbikeSysRlockset.java          |  2 +-
 .../model/pojo/EbikeSysRoperateset.java       |  6 ++-
 .../model/pojo/EbikeSysRusecondset.java       |  2 +-
 .../impl/EbikeSysRoperatesetServiceImpl.java  | 51 ++++++++++++++++---
 13 files changed, 66 insertions(+), 23 deletions(-)

diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysOperateSetSaveDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysOperateSetSaveDto.java
index 8ec95900..11b1e7f9 100644
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysOperateSetSaveDto.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysOperateSetSaveDto.java
@@ -1,6 +1,7 @@
 package com.cdzy.ebikeoperate.model.dto.request;
 
 import cn.hutool.core.date.DateTime;
+import com.alibaba.fastjson2.JSONArray;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -24,7 +25,7 @@ public class ReqEbikeSysOperateSetSaveDto {
     /**
      * 星期几;,分隔；null为按时间段运营
      */
-    private String weekday;
+    private JSONArray weekday;
 
     /**
      * 工作开始时间;HH:mm:ss
diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRbacksetDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRbacksetDto.java
index 7af206aa..8968f7c7 100644
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRbacksetDto.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRbacksetDto.java
@@ -1,5 +1,6 @@
 package com.cdzy.ebikeoperate.model.dto.request;
 
+import com.alibaba.fastjson2.JSONArray;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.Table;
 import lombok.AllArgsConstructor;
@@ -84,12 +85,12 @@ public class ReqEbikeSysRbacksetDto implements Serializable {
     /**
      * 规范还车跳过类型
      */
-    private String ignoreRegularType;
+    private JSONArray ignoreRegularType;
 
     /**
      * 学习免调度费还车类型
      */
-    private String freeReturnType;
+    private JSONArray freeReturnType;
 
     /**
      * 学习免调度费次数
diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRoperatesetDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRoperatesetDto.java
index 301578b1..5d182c0f 100644
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRoperatesetDto.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRoperatesetDto.java
@@ -5,6 +5,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -177,7 +178,7 @@ public class ReqEbikeSysRoperatesetDto implements Serializable {
     /**
      * 开票开始时间
      */
-    private LocalDateTime issueAnInvoiceStartTime;
+    private LocalDate issueAnInvoiceStartTime;
 
     /**
      * 0公里申诉自动退款
diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysOperateSetDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysOperateSetDto.java
index 95febf7a..1895baed 100644
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysOperateSetDto.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysOperateSetDto.java
@@ -1,6 +1,7 @@
 package com.cdzy.ebikeoperate.model.dto.response;
 
 import cn.hutool.core.date.DateTime;
+import com.alibaba.fastjson2.JSONArray;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -27,7 +28,7 @@ public class ResEbikeSysOperateSetDto {
     /**
      * 星期几;,分隔；null为按时间段运营
      */
-    private String weekday;
+    private JSONArray weekday;
 
     /**
      * 工作开始时间;HH:mm:ss
diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRbacksetDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRbacksetDto.java
index 6b8b849c..5cedf37a 100644
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRbacksetDto.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRbacksetDto.java
@@ -1,5 +1,6 @@
 package com.cdzy.ebikeoperate.model.dto.response;
 
+import com.alibaba.fastjson2.JSONArray;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -78,12 +79,12 @@ public class ResEbikeSysRbacksetDto implements Serializable {
     /**
      * 规范还车跳过类型
      */
-    private String ignoreRegularType;
+    private JSONArray ignoreRegularType;
 
     /**
      * 学习免调度费还车类型
      */
-    private String freeReturnType;
+    private JSONArray freeReturnType;
 
     /**
      * 学习免调度费次数
diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRoperatesetDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRoperatesetDto.java
index 5bab0e73..47692af8 100644
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRoperatesetDto.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRoperatesetDto.java
@@ -6,6 +6,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -178,7 +179,7 @@ public class ResEbikeSysRoperatesetDto implements Serializable {
     /**
      * 开票开始时间
      */
-    private LocalDateTime issueAnInvoiceStartTime;
+    private LocalDate issueAnInvoiceStartTime;
 
     /**
      * 0公里申诉自动退款
diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysLinktel.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysLinktel.java
index f5cb6fec..98b392d1 100644
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysLinktel.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysLinktel.java
@@ -37,7 +37,7 @@ public class EbikeSysLinktel implements Serializable {
     /**
      * 区域ID
      */
-    private String reginId;
+    private String regionId;
 
     /**
      * 电话号码
diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysOperateSet.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysOperateSet.java
index 034612ac..0b689ac9 100644
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysOperateSet.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysOperateSet.java
@@ -37,7 +37,7 @@ public class EbikeSysOperateSet implements Serializable {
     /**
      * 区域ID
      */
-    private String reginId;
+    private String regionId;
 
     /**
      * 星期几;,分隔；null为按时间段运营
diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRbackset.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRbackset.java
index 7f912269..52cb9549 100644
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRbackset.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRbackset.java
@@ -37,7 +37,7 @@ public class EbikeSysRbackset implements Serializable {
     /**
      * 区域ID
      */
-    private String reginId;
+    private String regionId;
 
     /**
      * 是否站点还车
diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRlockset.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRlockset.java
index c967a4fc..6b5dab7d 100644
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRlockset.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRlockset.java
@@ -36,7 +36,7 @@ public class EbikeSysRlockset implements Serializable {
     /**
      * 区域ID
      */
-    private String reginId;
+    private String regionId;
 
     /**
      * 自动锁车（分钟）
diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRoperateset.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRoperateset.java
index 2d87b6c8..66c1bba4 100644
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRoperateset.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRoperateset.java
@@ -2,8 +2,10 @@ package com.cdzy.ebikeoperate.model.pojo;
 
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.Table;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 import java.io.Serial;
@@ -38,7 +40,7 @@ public class EbikeSysRoperateset implements Serializable {
     /**
      * 区域ID
      */
-    private String reginId;
+    private String regionId;
 
     /**
      * 是否运营;1运营中 0停止运营
@@ -193,7 +195,7 @@ public class EbikeSysRoperateset implements Serializable {
     /**
      * 开票开始时间
      */
-    private LocalDateTime issueAnInvoiceStartTime;
+    private LocalDate issueAnInvoiceStartTime;
 
     /**
      * 0公里申诉自动退款
diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRusecondset.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRusecondset.java
index ccde6385..29d728a3 100644
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRusecondset.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRusecondset.java
@@ -37,7 +37,7 @@ public class EbikeSysRusecondset implements Serializable {
     /**
      * 区域ID
      */
-    private String reginId;
+    private String regionId;
 
     /**
      * 禁止用户借车电量;百分比，默认30
diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSysRoperatesetServiceImpl.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSysRoperatesetServiceImpl.java
index 022efd15..f14c4ff1 100644
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSysRoperatesetServiceImpl.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSysRoperatesetServiceImpl.java
@@ -1,22 +1,28 @@
 package com.cdzy.ebikeoperate.service.impl;
 
-import com.cdzy.ebikeoperate.mapper.EbikeSysLinktelMapper;
-import com.cdzy.ebikeoperate.mapper.EbikeSysOperateSetMapper;
+import com.cdzy.ebikeoperate.mapper.*;
+import com.cdzy.ebikeoperate.model.dto.request.ReqEbikeSysOperateSetSaveDto;
 import com.cdzy.ebikeoperate.model.dto.request.ReqEbikeSysRoperatesetDto;
 import com.cdzy.ebikeoperate.model.dto.request.ReqEbikeSysRoperatesetsDto;
+import com.cdzy.ebikeoperate.model.pojo.EbikeSysOperateSet;
 import com.cdzy.ebikeoperate.model.pojo.EbikeSysRcostset;
+import com.cdzy.ebikeoperate.service.EbikeSysRcostsetService;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
 import com.cdzy.ebikeoperate.model.pojo.EbikeSysRoperateset;
-import com.cdzy.ebikeoperate.mapper.EbikeSysRoperatesetMapper;
 import com.cdzy.ebikeoperate.service.EbikeSysRoperatesetService;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static com.cdzy.ebikeoperate.model.pojo.table.EbikeSysLinktelTableDef.EBIKE_SYS_LINKTEL;
+import static com.cdzy.ebikeoperate.model.pojo.table.EbikeSysOperateSetTableDef.EBIKE_SYS_OPERATE_SET;
 import static com.cdzy.ebikeoperate.model.pojo.table.EbikeSysRoperatesetTableDef.EBIKE_SYS_ROPERATESET;
 
 /**
@@ -33,11 +39,19 @@ public class EbikeSysRoperatesetServiceImpl extends ServiceImpl<EbikeSysRoperate
     private EbikeSysOperateSetMapper ebikeSysOperateSetMapper;
     @Resource
     private EbikeSysLinktelMapper ebikeSysLinktelMapper;
+    @Autowired
+    private EbikeSysRlocksetMapper ebikeSysRlocksetMapper;
+    @Autowired
+    private EbikeSysRusecondsetMapper ebikeSysRusecondsetMapper;
+    @Autowired
+    private EbikeSysRbacksetMapper ebikeSysRbacksetMapper;
+    @Autowired
+    private EbikeSysRoperatesetMapper ebikeSysRoperatesetMapper;
 
     @Override
     public EbikeSysRoperateset getByRegionId(String regionId) {
         QueryWrapper query = QueryWrapper.create()
-                .where(EBIKE_SYS_ROPERATESET.REGIN_ID.eq(regionId));
+                .where(EBIKE_SYS_ROPERATESET.REGION_ID.eq(regionId));
         return getOne(query);
     }
 
@@ -45,9 +59,9 @@ public class EbikeSysRoperatesetServiceImpl extends ServiceImpl<EbikeSysRoperate
     @Override
     public Boolean deleteByRegionId(String regionId) {
         try {
-            ebikeSysOperateSetMapper.deleteByCondition(EBIKE_SYS_LINKTEL.REGIN_ID.eq(regionId));
-            ebikeSysLinktelMapper.deleteByCondition(EBIKE_SYS_LINKTEL.REGIN_ID.eq(regionId));
-            remove(EBIKE_SYS_ROPERATESET.REGIN_ID.eq(regionId));
+            ebikeSysOperateSetMapper.deleteByCondition(EBIKE_SYS_LINKTEL.REGION_ID.eq(regionId));
+            ebikeSysLinktelMapper.deleteByCondition(EBIKE_SYS_LINKTEL.REGION_ID.eq(regionId));
+            remove(EBIKE_SYS_ROPERATESET.REGION_ID.eq(regionId));
             return true;
         } catch (Exception e) {
             log.error("删除区域运营信息配置表失败, regionId:{}", regionId, e);
@@ -62,11 +76,32 @@ public class EbikeSysRoperatesetServiceImpl extends ServiceImpl<EbikeSysRoperate
      * @return
      */
     @Override
+    @Transactional
     public Boolean save(ReqEbikeSysRoperatesetsDto reqEbikeSysRoperatesetsDto) {
 
+
         ReqEbikeSysRoperatesetDto reqEbikeSysRoperatesetDto = reqEbikeSysRoperatesetsDto.getReqEbikeSysRoperatesetDto();
+        String regionId = reqEbikeSysRoperatesetDto.getRegionId();
         EbikeSysRoperateset ebikeSysRoperateset = new EbikeSysRoperateset();
-        BeanUtils.copyProperties(reqEbikeSysRoperatesetDto,ebikeSysRoperateset);
+        BeanUtils.copyProperties(reqEbikeSysRoperatesetDto, ebikeSysRoperateset);
+        ebikeSysRoperatesetMapper.insert(ebikeSysRoperateset);
+        QueryWrapper query = QueryWrapper.create();
+        query.eq(EBIKE_SYS_OPERATE_SET.REGION_ID.getName(), regionId);
+        ebikeSysOperateSetMapper.deleteByQuery(query);
+        List<ReqEbikeSysOperateSetSaveDto> operateTime = reqEbikeSysRoperatesetDto.getOperateTime();
+        List<EbikeSysOperateSet> ebikeSysOperateSets = new ArrayList<>();
+        for (ReqEbikeSysOperateSetSaveDto reqEbikeSysOperateSetSaveDto : operateTime) {
+            EbikeSysOperateSet ebikeSysOperateSet = new EbikeSysOperateSet();
+            BeanUtils.copyProperties(reqEbikeSysOperateSetSaveDto, ebikeSysOperateSet);
+            if (reqEbikeSysOperateSetSaveDto.getWeekday() != null) {
+                ebikeSysOperateSet.setWeekday(reqEbikeSysOperateSetSaveDto.getWeekday().toString());
+            }
+            ebikeSysOperateSets.add(ebikeSysOperateSet);
+        }
+        if (!ebikeSysOperateSets.isEmpty()) {
+            ebikeSysOperateSetMapper.insertBatch(ebikeSysOperateSets);
+        }
+
         return true;
     }
 }