Przeglądaj źródła

fix(order): 注释小程序订单相关接口并修正退款循环逻辑

- 注释 AppletOrderController 中所有订单创建、支付、回调、取消和退款接口映射
- 将计费服务中服务费四舍五入方式由向下取整改为四舍五入
- UserOrderInfoServiceImpl 中用户订单查询条件添加按用户ID过滤
- 修改 WFTOrderService 中退款逻辑,使用 continue 替代 break 避免循环提前终止
wzq 1 dzień temu
rodzic
commit
d03d472c31

+ 7 - 7
src/main/java/com/zsElectric/boot/business/controller/applet/AppletOrderController.java

@@ -67,7 +67,7 @@ public class AppletOrderController {
      * @return
      */
     @Operation(summary = "创建订单")
-    @PostMapping("/createOrder")
+   // @PostMapping("/createOrder")
     public Result<AppUserPayForm> createOrder(@RequestBody AppLevelOrderForm appLevelOrderForm, HttpServletRequest request) {
         AppUserPayForm payForm = userOrderInfoService.createOrder(appLevelOrderForm);
         return Result.success(payForm);
@@ -80,7 +80,7 @@ public class AppletOrderController {
      * @return
      */
     @Operation(summary = "订单-支付")
-    @PutMapping("/payOrder/{orderId}")
+    //@PutMapping("/payOrder/{orderId}")
     @Log(value = "订单-支付", module = LogModuleEnum.APP_ORDER)
     public Result<AppUserPayForm> payOrder(@PathVariable("orderId") String orderId) {
         return Result.success(userOrderInfoService.payOrder(orderId));
@@ -93,7 +93,7 @@ public class AppletOrderController {
      * @return
      */
     @Operation(summary = "支付回调")
-    @RequestMapping("/wechatPayNotify")
+    //@RequestMapping("/wechatPayNotify")
     public Map<String, String> wechatPayNotify(HttpServletRequest request, HttpServletResponse response) throws InterruptedException {
         log.info("--------------------------------------------支付回调");
         return userOrderInfoService.wechatPayNotify(request, response);
@@ -106,7 +106,7 @@ public class AppletOrderController {
      * @return
      */
     @Operation(summary = "订单支付是否成功查询")
-    @GetMapping("/orderQuery/{orderNo}")
+    //@GetMapping("/orderQuery/{orderNo}")
     public Result<String> orderQuery(@PathVariable("orderNo") String orderNo) throws Exception {
         return Result.success(userOrderInfoService.orderQuery(orderNo));
     }
@@ -118,7 +118,7 @@ public class AppletOrderController {
      * @return
      */
     @Operation(summary = "订单主动取消")
-    @PutMapping("/cancelOrder/{orderId}")
+    //@PutMapping("/cancelOrder/{orderId}")
     @Log(value = "订单主动取消", module = LogModuleEnum.APP_ORDER)
     public Result<String> cancelOrder(@PathVariable(name = "orderId") String orderId) {
         return Result.success(userOrderInfoService.cancelOrder(orderId));
@@ -129,7 +129,7 @@ public class AppletOrderController {
      * @return
      */
     @Operation(summary = "账户退款")
-    @PutMapping("/refundOrder")
+   // @PutMapping("/refundOrder")
     @Log(value = "账户退款", module = LogModuleEnum.APP_ORDER)
     public Result<String> refundOrder() throws Exception {
         return Result.success(userOrderInfoService.refundOrder());
@@ -142,7 +142,7 @@ public class AppletOrderController {
      * @return
      */
     @Operation(summary = "订单退款回调")
-    @PostMapping("/callback/refundOrderNotify")
+    //@PostMapping("/callback/refundOrderNotify")
     public Map<String, Object> refundOrderNotify(HttpServletRequest request, HttpServletResponse response) {
         return userOrderInfoService.refundCallback(request, response);
     }

+ 1 - 1
src/main/java/com/zsElectric/boot/business/service/WFTOrderService.java

@@ -810,7 +810,7 @@ public class WFTOrderService {
                 userOrderInfo.setOrderStatus(SystemConstants.STATUS_FOUR);
                 userOrderInfoMapper.updateById(userOrderInfo);
                 refundMoney = BigDecimal.ZERO;
-                break;
+                continue;
             }
             if (canRefundMoney.compareTo(refundMoney) < 0) {
                 //退款金额小于订单金额,则先退订单金额

+ 1 - 0
src/main/java/com/zsElectric/boot/business/service/impl/UserOrderInfoServiceImpl.java

@@ -445,6 +445,7 @@ public class UserOrderInfoServiceImpl extends ServiceImpl<UserOrderInfoMapper, U
 
         //查询一年内已支付的所有券订单
         List<UserOrderInfo> userOrderInfoList = baseMapper.selectList(Wrappers.<UserOrderInfo>lambdaQuery()
+                        .eq(UserOrderInfo::getUserId, userAccount.getId())
                 .eq(UserOrderInfo::getOrderStatus, SystemConstants.STATUS_TWO)
                 .between(UserOrderInfo::getCreateTime, LocalDateTime.now().minusYears(1), LocalDateTime.now())
         );

+ 1 - 1
src/main/java/com/zsElectric/boot/charging/service/impl/ChargingReceptionServiceImpl.java

@@ -228,7 +228,7 @@ public class ChargingReceptionServiceImpl implements ChargingReceptionService {
             }
 
             log.info("计算后的平台服务费:{}", serviceFee);
-            chargeOrderInfo.setRealServiceCost(serviceFee.setScale(2, RoundingMode.DOWN));
+            chargeOrderInfo.setRealServiceCost(serviceFee.setScale(2, RoundingMode.HALF_UP));
             //订单结算:平台实际收取金额 = 互联互通金额 + 中数电动金额(平台总服务费)
             chargeOrderInfo.setRealCost(chargeOrderInfo.getRealServiceCost().add(chargeOrderInfo.getThirdPartyTotalCost()));