将订单导出接口新增额外跑腿费字段，定时统计商户销量的接口不判断是否上下架

src/main/java/com/sqx/modules/callBack/controller/CallBackController.java

@@ -147,6 +147,29 @@ public class CallBackController {
         return "success";
     }
 
+
+    /**
+     * 将骑手不存在的订单恢复
+     * @return
+     */
+    @GetMapping("/open/test2")
+    public Result test2(String state){
+
+        String orderNumberStr=
+                "202604302138001825," +
+                        "202604302142186196," +
+                        "202603291655313185," +
+                        "202605011142212463," +
+                        "202605011306508938";
+        for (String orderNumber : orderNumberStr.split(",")) {
+            if (ObjectUtils.isNotEmpty(orderNumber)) {
+                back(null, null, null, orderNumber, state, null, null, null, null, "18008437629", null);
+            }
+        }
+        return Result.success();
+
+    }
+
     @GetMapping("/open/test")
     public Result test(String orderNumber){
         TbOrder order = appOrderService.getOne(new QueryWrapper<TbOrder>().eq("order_number", orderNumber));

src/main/java/com/sqx/modules/goods/service/impl/GoodsShopServiceImpl.java

@@ -631,7 +631,7 @@ public class GoodsShopServiceImpl extends ServiceImpl<GoodsShopDao, GoodsShop> i
         // 通过审核
         queryWrapper.eq(GoodsShop::getStatus, 1);
         // 已上架
-        queryWrapper.eq(GoodsShop::getPutawayFlag, 0);
+//        queryWrapper.eq(GoodsShop::getPutawayFlag, 0);
         // 未被封禁
         queryWrapper.eq(GoodsShop::getBannedFlag, 0);
         List<GoodsShop> goodsShops = list(queryWrapper);

src/main/java/com/sqx/modules/order/service/impl/AppAppOrderServiceImpl.java

@@ -1557,6 +1557,7 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
         titles.add("活动优惠金额（元）");
         titles.add("打包费（元/个 具体按照数量计算）");
         titles.add("跑腿费（元）");
+        titles.add("特殊地址跑腿费（元）");
         titles.add("支付金额（元）");
         titles.add("跑腿费说明");
         titles.add("订单备注");
@@ -1615,6 +1616,7 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
             row.add(order.getActivityDiscountAmount());
             row.add(order.getPackMoney());
             row.add(order.getErrandMoney());
+            row.add(order.getInsideDeliveryFee());
             row.add(order.getPayMoney());
 
             row.add(order.getErrandMoneyIsShop());

src/main/java/com/sqx/scheduler/order/OrderScheduler.java

@@ -328,6 +328,7 @@ public class OrderScheduler {
             }
             log.info("更新店铺销量任务开始运行");
             Map<Long, Integer> shopSalesMap = orderService.countFinishGroupByShopId();
+            log.info("本次统计到店铺的数据：{}", shopSalesMap.size());
             goodsShopService.updateShopSales(shopSalesMap);
             log.info("更新店铺销量任务运行成功");
         } catch (Exception e) {

src/test/java/OrderTest.java

@@ -325,7 +325,7 @@ public class OrderTest {
         RhtQrcodePayApi qrcodePay = new RhtQrcodePayApi(wechatMchConfig.getMchId(), wechatMchConfig.getMchKey(), "https://api.ekbuyclub.com");
 
         String orderNumberStr =
-                "118702260324005741285823"
+                "118702260506006090507449"
                 ;
         for (String orderNumber : orderNumberStr.split(",")) {
             QrcodeQueryRequestBean qqrb = new QrcodeQueryRequestBean();