海博退款单模块

yami-shop-api/src/main/java/com/yami/shop/api/controller/OrderRiderLocationController.java

@@ -0,0 +1,61 @@
+package com.yami.shop.api.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yami.shop.bean.app.param.OrderPayInfoParam;
+import com.yami.shop.bean.model.OrderRiderLocation;
+import com.yami.shop.common.util.R;
+import com.yami.shop.service.OrderRiderLocationService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+
+/**
+ * 订单配送骑手位置实现
+ *
+ * @author fbj
+ * @version 1.0.0
+ * @since 2025-10-15
+ */
+@RestController
+@RequestMapping("/p/location")
+public class OrderRiderLocationController {
+
+    @Resource
+    private OrderRiderLocationService orderRiderLocationService;
+
+
+//    /**
+//     * 分页获取
+//     *
+//     * @param pageParam          分页参数
+//     * @param orderRiderLocation 订单配送骑手位置
+//     */
+//    @GetMapping("/page")
+//    public Page<OrderRiderLocation> page(Page<OrderRiderLocation> pageParam, OrderRiderLocation orderRiderLocation) {
+//        return orderRiderLocationService.page(pageParam, orderRiderLocation);
+//    }
+
+    /**
+     * 通过订单号获取骑手位置信息
+     * @param orderNumber 订单号
+     *
+     */
+    @GetMapping("/info")
+    @ApiOperation(value = "通过订单号获取", notes = "通过订单号获取")
+    @ApiImplicitParam(name = "orderNumber", value = "订单流水号", required = true, dataType = "String")
+    public R<OrderRiderLocation> getOrderPayInfoByOrderNumber(@RequestParam("orderNumber") String orderNumber) {
+
+        return R.SUCCESS(orderRiderLocationService.getOne(new LambdaQueryWrapper<OrderRiderLocation>()
+                .eq(OrderRiderLocation::getOrderNumber, orderNumber)));
+    }
+
+
+}

yami-shop-bean/src/main/java/com/yami/shop/bean/model/OrderRiderLocation.java

@@ -18,6 +18,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
+ * 骑手位置
  * @author Hasee
  */
 @Data
@@ -66,6 +67,11 @@ public class OrderRiderLocation implements Serializable {
      * 创建时间
      */
     private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
 }
 
 

yami-shop-security/yami-shop-security-api/src/main/java/com/yami/shop/security/api/config/ResourceServerConfiguration.java

@@ -37,15 +37,21 @@ public class ResourceServerConfiguration extends ResourceServerConfigurerAdapter
                 -> http.addFilterBefore(yamiAuthenticationProcessingFilter, UsernamePasswordAuthenticationFilter.class));
 
         http
-            .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.IF_REQUIRED)
-            .and()
-            .requestMatchers().anyRequest()
-            .and()
-            .anonymous()
-            .and()
-            .authorizeRequests()
-            //配置/p访问控制，必须认证过后才可以访问
-            .antMatchers("/p/**").authenticated();
+                .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.IF_REQUIRED)
+                .and()
+                .requestMatchers().anyRequest()
+                .and()
+                .anonymous()
+                .and()
+
+//                .authorizeRequests()
+//                .antMatchers(
+//                        "/p/**").permitAll()
+//                .and()
+
+                .authorizeRequests()
+                //配置/p访问控制，必须认证过后才可以访问
+                .antMatchers("/p/**").authenticated();
     }
 
 

yami-shop-service/src/main/java/com/yami/shop/service/OrderRiderLocationService.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved.
+ *
+ * https://www.gz-yami.com/
+ *
+ * 未经允许，不可做商业用途！
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.yami.shop.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yami.shop.bean.model.Delivery;
+import com.yami.shop.bean.model.OrderRiderLocation;
+
+import java.io.UnsupportedEncodingException;
+
+/**
+ *
+ * @author fbj
+ */
+public interface OrderRiderLocationService extends IService<OrderRiderLocation> {
+
+
+}

yami-shop-service/src/main/java/com/yami/shop/service/hb/impl/HBOrderService.java

@@ -53,15 +53,11 @@ public class HBOrderService implements IHBOrderService {
     private final ShopDetailMapper shopDetailMapper;
     private final UserService userService;
     private final UserAddrOrderService userAddrOrderService;
-    private final UserAddrService userAddrService;
     private final ProductMapper productMapper;
     private final SkuMapper skuMapper;
     private final OrderRiderLocationMapper orderRiderLocationMapper;
     private final OrderRefundService orderRefundService;
-    private final OrderItemService orderItemService;
     private final OrderService orderService;
-    private final OrderRefundSkuMapper orderRefundSkuMapper;
-    private final Snowflake snowflake;
 
 
     public HBR addHBGoods(JSONObject hbRequest) {
@@ -265,27 +261,22 @@ public class HBOrderService implements IHBOrderService {
         String bodyStr = hBRequest.getString("body");
         log.info("订单信息，body：{}", bodyStr);
         JSONObject bodyJson = JSON.parseObject(bodyStr);
-//        Order order = orderMapper.getOrderAndOrderItemByOrderNumber(bodyJson.getString("channelOrderId"));
         String channelOrderId = bodyJson.getString("channelOrderId");
-        String courierName = bodyJson.getString("courierName");
-        String courierPhone = bodyJson.getString("courierPhone");
-        Double latitude = bodyJson.getDouble("latitude");
-        Double longitude = bodyJson.getDouble("longitude");
-        Long pushTime = bodyJson.getLong("pushTime");
         OrderRiderLocation orderRiderLocation = new OrderRiderLocation();
         orderRiderLocation.setOrderNumber(channelOrderId);
-        orderRiderLocation.setCourierName(courierName);
-        orderRiderLocation.setCourierPhone(courierPhone);
-        orderRiderLocation.setLatitude(latitude);
-        orderRiderLocation.setLongitude(longitude);
-        orderRiderLocation.setPushTime(pushTime);
-        orderRiderLocation.setCreateTime(new Date());
+        orderRiderLocation.setCourierName(bodyJson.getString("courierName"));
+        orderRiderLocation.setCourierPhone(bodyJson.getString("courierPhone"));
+        orderRiderLocation.setLatitude(bodyJson.getDouble("latitude"));
+        orderRiderLocation.setLongitude(bodyJson.getDouble("longitude"));
+        orderRiderLocation.setPushTime(bodyJson.getLong("pushTime"));
+        orderRiderLocation.setUpdateTime(new Date());
 
         OrderRiderLocation orderRiderLocation1 = orderRiderLocationMapper.selectOne(new LambdaQueryWrapper<OrderRiderLocation>().eq(OrderRiderLocation::getOrderNumber, channelOrderId));
         if (orderRiderLocation1 != null) {
             orderRiderLocation.setId(orderRiderLocation1.getId());
             orderRiderLocationMapper.updateById(orderRiderLocation);
         } else {
+            orderRiderLocation.setCreateTime(new Date());
             orderRiderLocationMapper.insert(orderRiderLocation);
         }
     }

yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderRiderLocationServiceImpl.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved.
+ *
+ * https://www.gz-yami.com/
+ *
+ * 未经允许，不可做商业用途！
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.yami.shop.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yami.shop.bean.model.OrderRiderLocation;
+import com.yami.shop.dao.OrderRiderLocationMapper;
+import com.yami.shop.service.OrderRiderLocationService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * @author fbj
+ * @date 2025/10/15
+ */
+@Service
+@AllArgsConstructor
+public class OrderRiderLocationServiceImpl extends ServiceImpl<OrderRiderLocationMapper, OrderRiderLocation> implements OrderRiderLocationService {
+
+
+}