add deliver

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/OrderController.java

@@ -53,7 +53,6 @@ public class OrderController {
     private final OrderItemService orderItemService;
     private final UserAddrOrderService userAddrOrderService;
 
-
     /**
      * 分页获取
      */
@@ -70,26 +69,23 @@ public class OrderController {
     @GetMapping("/orderPayByShopId")
     @ApiOperation(value = "根据商家id获取支付信息")
     public R<OrderPayParam> orderPayByShopId(@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")@RequestParam("startTime") Date startTime,
-                                                          @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")@RequestParam("endTime") Date endTime) {
+                                             @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")@RequestParam("endTime") Date endTime) {
         OrderPayParam actualTotal = orderService.getPayUserCountByshopId(null,startTime,endTime);
         return R.SUCCESS(actualTotal);
     }
 
-
     /**
      * 获取信息
      */
     @GetMapping("/orderInfo/{orderNumber}")
     @PreAuthorize("@pms.hasPermission('platform:order:info')")
     public R<Order> info(@PathVariable("orderNumber") String orderNumber) {
-
         Order order = orderService.getOne(new LambdaUpdateWrapper<Order>().eq(Order::getOrderNumber, orderNumber));
         if (order == null) {
             throw new GlobalException("未找到所在的订单");
         }
         UserAddrOrder userAddrOrder = userAddrOrderService.getById(order.getAddrOrderId());
         order.setUserAddrOrder(userAddrOrder);
-
         List<OrderItem> orderItems = orderItemService.getOrderItemsByOrderNumber(orderNumber);
         order.setOrderItems(orderItems);
         return R.SUCCESS(order);

yami-shop-wx/src/main/java/com/yami/shop/wx/service/impl/WxProviderServiceImpl.java

@@ -436,7 +436,7 @@ public class WxProviderServiceImpl implements WxProviderService {
      *
      * @param trackingNo     物流单号
      * @param transactionId  原支付交易对应的微信订单号
-     * @param expressCompany 物流公司编码
+     * @param expressCompany 物流公司编码 例如：SF
      * @param itemDesc      例如：微信红包抱枕*1个，限120个字以内
      * @param phone          当发货的物流公司为顺丰时，联系方式为必填，收件人或寄件人联系方式二选一
      * @param openid         微信open_id-小程序