架构升级2.0

api/gateway/pom.xml

@@ -11,7 +11,7 @@
     <artifactId>gateway</artifactId>
     <packaging>jar</packaging>
     <version>2.0.0</version>
-    <name>api</name>
+    <name>gateway</name>
     <url>http://maven.apache.org</url>
 
     <properties>

api/gateway/src/main/java/cn/qihangerp/gateway/TokenFilter.java

@@ -26,7 +26,11 @@ public class TokenFilter implements GlobalFilter, Ordered {
         System.out.println("Token:"+token);
         String url = exchange.getRequest().getURI().getPath();
         System.out.println("intercept " + url);
-        if(url.equals("/api/sys-api/login") || url.equals("/api/sys-api/getInfo") || url.equals("/api/sys-api/logout")){
+        if(url.equals("/api/sys-api/login") || url.equals("/api/sys-api/getInfo") || url.equals("/api/sys-api/logout")
+                || url.contains("/system/config")
+                || url.contains("/captchaImage")
+        )
+        {
             // 登录页面 放行
             return chain.filter(exchange);
         }

api/oms-api/pom.xml

@@ -59,14 +59,19 @@
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
         <dependency>
-            <groupId>cn.qihangerp</groupId>
+            <groupId>cn.qihangerp.core</groupId>
             <artifactId>security</artifactId>
-            <version>2.0.6</version>
+            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>cn.qihangerp.module</groupId>
             <artifactId>goods</artifactId>
-            <version>2.0.6</version>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.qihangerp.module</groupId>
+            <artifactId>order</artifactId>
+            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>

api/oms-api/src/main/java/cn/qihangerp/oms/config/MybatisPlusConfig.java

@@ -8,7 +8,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@MapperScan({"cn.qihangerp.oms.mapper","cn.qihangerp.module.*.mapper"})
+@MapperScan({"cn.qihangerp.oms.mapper","cn.qihangerp.module.*.mapper","cn.qihangerp.module.mapper"})
 public class MybatisPlusConfig {
     @Bean
     public MybatisPlusInterceptor mybatisPlusInterceptor() {

api/oms-api/src/main/java/cn/qihangerp/oms/controller/AfterSaleController.java

@@ -0,0 +1,26 @@
+//package cn.qihangerp.oms.controller;
+//
+//import cn.qihangerp.common.PageQuery;
+//
+//import cn.qihangerp.common.TableDataInfo;
+//import cn.qihangerp.oms.service.ErpSaleAfterInfoService;
+//
+//import cn.qihangerp.security.common.BaseController;
+//import lombok.AllArgsConstructor;
+//import org.springframework.web.bind.annotation.GetMapping;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//@AllArgsConstructor
+//@RestController
+//@RequestMapping("/afterSale")
+//public class AfterSaleController extends BaseController {
+//    private final ErpSaleAfterInfoService afterInfoService;
+//
+//    @GetMapping("/list")
+//    public TableDataInfo list(ErpSaleAfterInfo bo, PageQuery pageQuery)
+//    {
+//        var pageList = afterInfoService.queryPageList(bo,pageQuery);
+//        return getDataTable(pageList);
+//    }
+//}

api/oms-api/src/main/java/cn/qihangerp/oms/controller/GoodsBrandController.java

@@ -2,12 +2,14 @@ package cn.qihangerp.oms.controller;
 
 
 
+import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.PageQuery;
 
-import cn.qihangerp.common.common.AjaxResult;
-import cn.qihangerp.common.common.TableDataInfo;
+
+import cn.qihangerp.common.TableDataInfo;
 import cn.qihangerp.module.goods.domain.OGoodsBrand;
 import cn.qihangerp.module.goods.service.OGoodsBrandService;
+
 import cn.qihangerp.security.common.BaseController;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;

api/oms-api/src/main/java/cn/qihangerp/oms/controller/GoodsCategoryController.java

@@ -1,8 +1,9 @@
 package cn.qihangerp.oms.controller;
 
 
-import cn.qihangerp.common.common.AjaxResult;
-import cn.qihangerp.common.common.TableDataInfo;
+
+import cn.qihangerp.common.AjaxResult;
+import cn.qihangerp.common.TableDataInfo;
 import cn.qihangerp.module.goods.domain.OGoodsCategory;
 import cn.qihangerp.module.goods.domain.OGoodsCategoryAttribute;
 import cn.qihangerp.module.goods.domain.OGoodsCategoryAttributeValue;

api/oms-api/src/main/java/cn/qihangerp/oms/controller/GoodsController.java

@@ -5,8 +5,8 @@ package cn.qihangerp.oms.controller;
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;
 import cn.qihangerp.common.ResultVo;
-import cn.qihangerp.common.common.AjaxResult;
-import cn.qihangerp.common.common.TableDataInfo;
+import cn.qihangerp.common.AjaxResult;
+import cn.qihangerp.common.TableDataInfo;
 
 
 import cn.qihangerp.module.goods.domain.OGoods;

api/oms-api/src/main/java/cn/qihangerp/oms/controller/GoodsInventoryController.java

@@ -4,8 +4,8 @@ package cn.qihangerp.oms.controller;
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;
 
-import cn.qihangerp.common.common.AjaxResult;
-import cn.qihangerp.common.common.TableDataInfo;
+import cn.qihangerp.common.AjaxResult;
+import cn.qihangerp.common.TableDataInfo;
 import cn.qihangerp.module.goods.domain.OGoodsInventory;
 import cn.qihangerp.module.goods.domain.OGoodsInventoryBatch;
 import cn.qihangerp.module.goods.service.OGoodsInventoryBatchService;

api/oms-api/src/main/java/cn/qihangerp/oms/controller/GoodsSupplierController.java

@@ -3,8 +3,8 @@ package cn.qihangerp.oms.controller;
 
 import cn.qihangerp.common.PageQuery;
 
-import cn.qihangerp.common.common.AjaxResult;
-import cn.qihangerp.common.common.TableDataInfo;
+import cn.qihangerp.common.AjaxResult;
+import cn.qihangerp.common.TableDataInfo;
 import cn.qihangerp.module.goods.domain.OGoodsSupplier;
 import cn.qihangerp.module.goods.service.OGoodsSupplierService;
 import cn.qihangerp.security.common.BaseController;

api/oms-api/src/main/java/cn/qihangerp/oms/controller/OrderController.java

@@ -0,0 +1,113 @@
+package cn.qihangerp.oms.controller;
+
+
+
+import cn.qihangerp.common.AjaxResult;
+import cn.qihangerp.common.PageQuery;
+import cn.qihangerp.common.TableDataInfo;
+
+import cn.qihangerp.module.order.service.OOrderItemService;
+import cn.qihangerp.module.order.service.OOrderService;
+import cn.qihangerp.request.OrderSearchRequest;
+import cn.qihangerp.security.common.BaseController;
+import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 店铺订单Controller
+ *
+ * @author qihang
+ * @date 2023-12-31
+ */
+@AllArgsConstructor
+@RestController
+@RequestMapping("/order")
+public class OrderController extends BaseController
+{
+
+    private final OOrderService orderService;
+    private final OOrderItemService orderItemService;
+
+    /**
+     * 查询店铺订单列表
+     */
+    @PreAuthorize("@ss.hasPermi('shop:order:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(OrderSearchRequest bo, PageQuery pageQuery)
+    {
+        var pageList = orderService.queryPageList(bo,pageQuery);
+        return getDataTable(pageList);
+    }
+
+
+    /**
+     * 获取店铺订单详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('shop:order:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(orderService.queryDetailById(id));
+    }
+
+    /**
+     * 推送订单到ERP
+     * @param ids
+     * @return
+     */
+    @PostMapping("/pushErp/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+//        for (Long id : ids) {
+//            OOrder oOrder = orderService.getById(id);
+//            if (oOrder != null) {
+//                oOrder.setItemList(orderItemService.getOrderItemListByOrderId(id));
+//                ResultVo resultVo = erpPushHelper.pushOrderSingle(oOrder);
+//                OOrder pushUpdate = new OOrder();
+//                if (oOrder.getOrderStatus() == 1 || oOrder.getOrderStatus() == 2 || oOrder.getOrderStatus() == 3) {
+//                    // 待发货、已发货、已完成 订单推送
+//                    pushUpdate.setErpPushStatus(resultVo.getCode() == 0 ? 200 : resultVo.getCode());
+//
+//                } else if (oOrder.getOrderStatus() == 11) {
+//                    pushUpdate.setErpPushStatus(resultVo.getCode() == 0 ? 100 : resultVo.getCode());//推送状态200 订单推送成功 100 取消订单推送成功
+//                }
+//                pushUpdate.setErpPushResult(resultVo.getMsg());
+//                pushUpdate.setErpPushTime(new Date());
+//                pushUpdate.setUpdateBy("手动推送到ERP");
+//                pushUpdate.setUpdateTime(new Date());
+//                pushUpdate.setId(id.toString());
+//                orderService.updateById(pushUpdate);
+//            }
+//        }
+
+        return success();
+    }
+//    @PostMapping
+//    public AjaxResult add(@RequestBody OrderCreateBo order)
+//    {
+//        if(order.getGoodsAmount()==null)return new AjaxResult(1503,"请填写商品价格！");
+//
+//        int result = orderService.insertErpOrder(order,getUsername());
+//        if(result == -1) return new AjaxResult(501,"订单号已存在！");
+//        if(result == -2) return new AjaxResult(502,"请添加订单商品！");
+//        if(result == -3) return new AjaxResult(503,"请完善订单商品明细！");
+//        if(result == -4) return new AjaxResult(504,"请选择店铺！");
+//        return toAjax(result);
+//    }
+//    /**
+//     * 订单发货
+//     * @param order
+//     * @return
+//     */
+//    @Log(title = "店铺订单", businessType = BusinessType.UPDATE)
+//    @PostMapping("/ship")
+//    public AjaxResult ship(@RequestBody ErpOrder order)
+//    {
+//        order.setUpdateBy(getUsername());
+//        int result = orderService.shipErpOrder(order);
+//        if(result == -1) return new AjaxResult(501,"订单不存在！");
+//        else if(result == -2) return new AjaxResult(502,"订单号已存在！");
+//        return toAjax(result);
+//    }
+
+}

api/oms-api/src/main/java/cn/qihangerp/oms/controller/OrderItemController.java

@@ -1,13 +1,17 @@
 package cn.qihangerp.oms.controller;
 
 
+
 import cn.qihangerp.common.PageQuery;
-import cn.qihangerp.common.common.TableDataInfo;
-import cn.qihangerp.oms.service.ErpSaleOrderItemService;
-import cn.qihangerp.oms.domain.bo.OrderItemListBo;
+import cn.qihangerp.common.TableDataInfo;
+import cn.qihangerp.module.order.domain.bo.OrderItemListBo;
+import cn.qihangerp.module.order.service.OOrderItemService;
+import cn.qihangerp.module.order.service.OOrderService;
 import cn.qihangerp.security.common.BaseController;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 店铺订单Controller
@@ -20,7 +24,8 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/order")
 public class OrderItemController extends BaseController
 {
-    private final ErpSaleOrderItemService itemService;
+    private final OOrderItemService itemService;
+    private final OOrderService orderService;
 
     /**
      * 查询店铺订单列表
@@ -38,7 +43,7 @@ public class OrderItemController extends BaseController
 //     * @return
 //     */
 //    @PostMapping("/updateErpSkuId")
-//    public AjaxResult ship(@RequestBody ErpSaleOrderItem orderItem)
+//    public AjaxResult ship(@RequestBody OOrderItem orderItem)
 //    {
 //        if(StringUtils.isEmpty(orderItem.getId()) || orderItem.getGoodsSkuId()==null){
 //            return AjaxResult.error("确少必要参数");

api/oms-api/src/main/java/cn/qihangerp/oms/controller/RefundController.java

@@ -0,0 +1,90 @@
+package cn.qihangerp.oms.controller;
+
+
+
+import cn.qihangerp.common.AjaxResult;
+import cn.qihangerp.common.PageQuery;
+import cn.qihangerp.common.ResultVo;
+import cn.qihangerp.common.TableDataInfo;
+import cn.qihangerp.module.order.domain.bo.RefundProcessingBo;
+import cn.qihangerp.module.order.domain.bo.RefundSearchBo;
+import cn.qihangerp.module.order.service.ORefundService;
+import cn.qihangerp.security.common.BaseController;
+import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 退换货Controller
+ * 
+ * @author qihang
+ * @date 2024-01-13
+ */
+@AllArgsConstructor
+@RestController
+@RequestMapping("/api/oms-api/refund")
+public class RefundController extends BaseController
+{
+
+    private final ORefundService refundService;
+
+
+    /**
+     * 查询退换货列表
+     */
+    @PreAuthorize("@ss.hasPermi('api:returned:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(RefundSearchBo bo, PageQuery pageQuery)
+    {
+        var pageList = refundService.queryPageList(bo,pageQuery);
+        return getDataTable(pageList);
+    }
+
+
+    /**
+     * 获取退换货详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('api:returned:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(refundService.selectById(id));
+    }
+
+
+    /**
+     * 推送退款到ERP
+     * @param ids
+     * @return
+     */
+    @PostMapping("/pushErp/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+//        for (Long id:ids) {
+//            ORefund ORefund = refundService.selectById(id);
+//            if(ORefund!=null) {
+//
+//                ResultVo resultVo = erpPushHelper.pushRefundSingle(ORefund);
+//                ORefund pushUpdate = new ORefund();
+//                pushUpdate.setErpPushStatus(resultVo.getCode()== 0 ? 200:resultVo.getCode());
+//                pushUpdate.setErpPushResult(resultVo.getMsg());
+//                pushUpdate.setErpPushTime(new Date());
+//                pushUpdate.setUpdateBy("手动推送到ERP");
+//                pushUpdate.setUpdateTime(new Date());
+//                pushUpdate.setId(id.toString());
+//                refundService.updateById(pushUpdate);
+//            }
+//        }
+
+        return success();
+    }
+
+
+    @PostMapping("/processing")
+    public AjaxResult refundProcessing(@RequestBody RefundProcessingBo bo ) {
+        if (bo.getRefundId() == null) return AjaxResult.error(500, "缺少参数refundId");
+        ResultVo<Long> resultVo = refundService.refundProcessing(bo,getUsername());
+        if(resultVo.getCode() == 0) return success();
+        else return AjaxResult.error(resultVo.getMsg());
+    }
+}

api/oms-api/src/main/java/cn/qihangerp/oms/controller/ReportController.java

@@ -0,0 +1,62 @@
+package cn.qihangerp.oms.controller;
+
+
+import cn.qihangerp.common.AjaxResult;
+import cn.qihangerp.module.goods.service.OGoodsInventoryService;
+import cn.qihangerp.module.order.domain.vo.SalesDailyVo;
+import cn.qihangerp.module.order.domain.vo.SalesTopSkuVo;
+import cn.qihangerp.module.order.service.OOrderItemService;
+import cn.qihangerp.module.order.service.OOrderService;
+import cn.qihangerp.module.service.OShopService;
+import cn.qihangerp.security.common.BaseController;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@AllArgsConstructor
+@RestController
+@RequestMapping("/api/oms-api/report")
+public class ReportController extends BaseController {
+    private final OOrderService orderService;
+    private final OOrderItemService orderItemService;
+    private final OShopService shopService;
+    private final OGoodsInventoryService inventoryService;
+    @GetMapping("/todayDaily")
+    public AjaxResult todayDaily()
+    {
+        Long shopCount = shopService.list().stream().count();
+        Map<String,Double> result = new HashMap<>();
+        // 今日销售
+        SalesDailyVo todaySalesDaily = orderService.getTodaySalesDaily();
+        // 查询库存
+        Long allInventoryQuantity = inventoryService.getAllInventoryQuantity();
+        result.put("inventory",allInventoryQuantity.doubleValue());
+        result.put("salesVolume",todaySalesDaily.getAmount());
+        result.put("orderCount",todaySalesDaily.getCount().doubleValue());
+        result.put("shopCount",shopCount.doubleValue());
+
+        return AjaxResult.success(result);
+    }
+
+
+    @GetMapping("/salesDaily")
+    public AjaxResult salesDaily()
+    {
+        List<SalesDailyVo> salesDailyVos = orderService.salesDaily();
+
+        return AjaxResult.success(salesDailyVos);
+    }
+
+    @GetMapping("/salesTopSku")
+    public AjaxResult salesTopSku()
+    {
+        List<SalesTopSkuVo> salesTopSkuVos = orderItemService.selectTopSku("2024-01-01", "2024-12-31");
+
+        return AjaxResult.success(salesTopSkuVos);
+    }
+}

api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShipController.java

@@ -0,0 +1,53 @@
+//package cn.qihangerp.oms.controller;
+//
+//import cn.qihangerp.common.PageQuery;
+//import cn.qihangerp.common.TableDataInfo;
+//import cn.qihangerp.oms.domain.bo.ShipStockUpBo;
+//import cn.qihangerp.oms.domain.bo.ShipWaybillBo;
+//import cn.qihangerp.oms.service.ErpShipStockUpService;
+//import cn.qihangerp.oms.service.ErpShipWaybillService;
+//import cn.qihangerp.security.common.BaseController;
+//import lombok.AllArgsConstructor;
+//import org.springframework.web.bind.annotation.*;
+//
+///**
+// * 店铺Controller
+// *
+// * @author qihang
+// * @date 2023-12-31
+// */
+//@AllArgsConstructor
+//@RestController
+//@RequestMapping("/ship")
+//public class ShipController extends BaseController {
+//    private final ErpShipStockUpService shipStockUpService;
+//    private final ErpShipWaybillService shipWaybillService;
+//
+//    /**
+//     * 备货列表
+//     * @param bo
+//     * @param pageQuery
+//     * @return
+//     */
+//    @GetMapping("/stock_up_list")
+//    public TableDataInfo stock_up_list(ShipStockUpBo bo, PageQuery pageQuery)
+//    {
+//        var pageList = shipStockUpService.queryPageList(bo,pageQuery);
+//        return getDataTable(pageList);
+//    }
+//
+//    /**
+//     * 订单物流信息list
+//     * @param bo
+//     * @param pageQuery
+//     * @return
+//     */
+//    @GetMapping("/order_waybill_list")
+//    public TableDataInfo order_waybill_list(ShipWaybillBo bo, PageQuery pageQuery)
+//    {
+//        var pageList = shipWaybillService.queryPageList(bo,pageQuery);
+//        return getDataTable(pageList);
+//    }
+//
+//
+//}

api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShipStockupController.java

@@ -0,0 +1,58 @@
+package cn.qihangerp.oms.controller;
+
+
+import cn.qihangerp.common.AjaxResult;
+import cn.qihangerp.common.PageQuery;
+import cn.qihangerp.common.TableDataInfo;
+import cn.qihangerp.module.order.domain.bo.ShipStockUpBo;
+import cn.qihangerp.module.order.domain.bo.ShipStockUpCompleteBo;
+import cn.qihangerp.module.order.service.OShipStockUpService;
+import cn.qihangerp.module.order.service.OShipWaybillService;
+import cn.qihangerp.security.common.BaseController;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+@AllArgsConstructor
+@RestController
+@RequestMapping("/ship")
+public class ShipStockupController  extends BaseController {
+    private final OShipStockUpService shipStockUpService;
+    private final OShipWaybillService shipWaybillService;
+
+    /**
+     * 备货列表
+     * @param bo
+     * @param pageQuery
+     * @return
+     */
+    @GetMapping("/stock_up_list")
+    public TableDataInfo stock_up_list(ShipStockUpBo bo, PageQuery pageQuery)
+    {
+        var pageList = shipStockUpService.queryPageList(bo,pageQuery);
+        return getDataTable(pageList);
+    }
+
+    @PostMapping("/stock_up_complete")
+    public AjaxResult stock_up_complete(@RequestBody ShipStockUpCompleteBo bo)
+    {
+        int result = shipStockUpService.stockUpComplete(bo);
+        if(result == -1) return AjaxResult.error("参数错误：orderItemIds为空");
+        if(result == -2) return AjaxResult.error("参数错误：没有要添加的");
+        else if(result == -1001) return AjaxResult.error("存在错误的orderItemId：状态不对不能生成出库单");
+        else if(result == -1002) return AjaxResult.error("存在错误的订单数据：名单明细中没有skuId请修改！");
+        //wmsStockOutEntryService.insertWmsStockOutEntry(wmsStockOutEntry)
+        return toAjax(1);
+    }
+
+    @PostMapping("/stock_up_complete_by_order")
+    public AjaxResult stock_up_completeByOrder(@RequestBody ShipStockUpCompleteBo bo)
+    {
+        int result = shipStockUpService.stockUpCompleteByOrder(bo);
+        if(result == -1) return AjaxResult.error("参数错误：orderItemIds为空");
+        if(result == -2) return AjaxResult.error("参数错误：没有要添加的");
+        else if(result == -1001) return AjaxResult.error("存在错误的orderItemId：状态不对不能生成出库单");
+        else if(result == -1002) return AjaxResult.error("存在错误的订单数据：名单明细中没有skuId请修改！");
+        //wmsStockOutEntryService.insertWmsStockOutEntry(wmsStockOutEntry)
+        return toAjax(1);
+    }
+}

api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShipmentController.java

@@ -0,0 +1,67 @@
+package cn.qihangerp.oms.controller;
+
+
+import cn.qihangerp.common.AjaxResult;
+import cn.qihangerp.common.PageQuery;
+import cn.qihangerp.common.TableDataInfo;
+import cn.qihangerp.module.order.domain.OShipment;
+import cn.qihangerp.module.order.domain.bo.OrderShipBo;
+import cn.qihangerp.module.order.service.OOrderService;
+import cn.qihangerp.module.order.service.OShipmentService;
+import cn.qihangerp.security.common.BaseController;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+@AllArgsConstructor
+@RestController
+@RequestMapping("/shipping")
+public class ShipmentController extends BaseController {
+    private final OShipmentService shippingService;
+
+    private final OOrderService orderService;
+    @GetMapping("/list")
+    public TableDataInfo list(OShipment shipping, PageQuery pageQuery)
+    {
+        return getDataTable(shippingService.queryPageList(shipping,pageQuery));
+    }
+
+
+    @GetMapping("/searchOrderConsignee")
+    public TableDataInfo searchOrderConsignee(String consignee)
+    {
+        return getDataTable(orderService.searchOrderConsignee(consignee));
+    }
+
+    @GetMapping("/searchOrderItemByReceiverMobile")
+    public TableDataInfo searchOrderItemByReceiverMobile(String receiverMobile)
+    {
+        return getDataTable(orderService.searchOrderItemByReceiverMobile(receiverMobile));
+    }
+
+    /**
+     * 订单发货
+     * @param shipping
+     * @return
+     */
+    @PostMapping("/handShip")
+    public AjaxResult orderHandShip(@RequestHeader("Authorization") String authorization,@RequestBody OrderShipBo shipping)
+    {
+
+        var result = shippingService.handOrderShip(shipping);
+//        if(result.getCode() == ResultVoEnum.SUCCESS.getIndex()) {
+//            // 发货
+//            TaoOrderShipBo bo = new TaoOrderShipBo();
+//            bo.setShopId(shipping.getShopId());
+////            bo.setTid(shipping.getOrderId());
+//            bo.setWaybillCode(shipping.getShipCode());
+//            bo.setWaybillCompany(shipping.getShipCompany());
+//
+//            JSONObject jsonObject = taoApiService.orderShip(authorization, bo);
+//            return AjaxResult.success();
+//        }else{
+//            return AjaxResult.error(result.getCode(),result.getMsg());
+//        }
+
+        return AjaxResult.success();
+    }
+}

api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java

@@ -1,16 +1,19 @@
 package cn.qihangerp.oms.controller;
 
-import cn.qihangerp.oms.domain.OShop;
-import cn.qihangerp.oms.domain.OShopPlatform;
+import cn.qihangerp.domain.OShopPlatform;
+import cn.qihangerp.module.service.OShopPlatformService;
+import cn.qihangerp.domain.OShop;
 
+
+import cn.qihangerp.module.service.OShopService;
 import cn.qihangerp.oms.domain.ShopBo;
-import cn.qihangerp.oms.service.OShopPlatformService;
-import cn.qihangerp.oms.service.OShopService;
+
+
 
 import cn.qihangerp.oms.service.SysLogisticsCompanyService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import cn.qihangerp.common.common.AjaxResult;
-import cn.qihangerp.common.common.TableDataInfo;
+import cn.qihangerp.common.AjaxResult;
+import cn.qihangerp.common.TableDataInfo;
 import cn.qihangerp.security.common.BaseController;
 import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;

api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopPullLogsController.java

@@ -1,11 +1,12 @@
 package cn.qihangerp.oms.controller;
 
 import cn.qihangerp.common.PageQuery;
-import cn.qihangerp.common.common.TableDataInfo;
+import cn.qihangerp.common.TableDataInfo;
 
-import cn.qihangerp.oms.domain.OShopPullLogs;
+import cn.qihangerp.domain.OShopPullLogs;
 
-import cn.qihangerp.oms.service.OShopPullLogsService;
+
+import cn.qihangerp.module.service.OShopPullLogsService;
 import cn.qihangerp.security.common.BaseController;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;

api/oms-api/src/main/java/cn/qihangerp/oms/domain/OShop.java

@@ -0,0 +1,109 @@
+//package cn.qihangerp.oms.domain;
+//
+//import com.baomidou.mybatisplus.annotation.IdType;
+//import com.baomidou.mybatisplus.annotation.TableField;
+//import com.baomidou.mybatisplus.annotation.TableId;
+//import lombok.Data;
+//
+//import java.io.Serializable;
+//
+///**
+// * 数据中心-店铺
+// * @TableName sys_shop
+// */
+//@Data
+//public class OShop implements Serializable {
+//    /**
+//     * 主键
+//     */
+//    @TableId(value = "id", type = IdType.AUTO)
+//    private Long id;
+//
+//    /**
+//     * 店铺名
+//     */
+//    private String name;
+//
+//    /**
+//     * 对应第三方平台Id
+//     */
+//    private Integer type;
+//
+//    /**
+//     * 店铺url
+//     */
+//    private String url;
+//
+//    /**
+//     * 排序
+//     */
+//    private Integer sort;
+//
+//    /**
+//     * 状态（1正常2已删除）
+//     */
+//    private Integer status;
+//
+//    /**
+//     * 更新时间
+//     */
+//    private Long modifyOn;
+//
+//    /**
+//     * 描述
+//     */
+//    private String remark;
+//
+//    /**
+//     * 第三方平台店铺id，淘宝天猫开放平台使用
+//     */
+//    private Long sellerId;
+//
+//    /**
+//     * Appkey
+//     */
+//    private String appKey;
+//
+//    /**
+//     * Appsercet
+//     */
+//    private String appSercet;
+//
+//    /**
+//     * 第三方平台sessionKey（access_token）
+//     */
+//    private String accessToken;
+//
+//    /**
+//     * 到期
+//     */
+//    private Long expiresIn;
+//
+//    /**
+//     * access_token开始时间
+//     */
+//    private Long accessTokenBegin;
+//
+//    /**
+//     * 刷新token
+//     */
+//    private String refreshToken;
+//
+//    /**
+//     * 刷新token过期时间
+//     */
+//    private Long refreshTokenTimeout;
+//
+//    /**
+//     * 请求url
+//     */
+//    private String apiRequestUrl;
+//
+//
+//    @TableField(exist = false)
+//    private Integer verifyUser;
+//
+//    private static final long serialVersionUID = 1L;
+//
+//
+//}

api/oms-api/src/main/java/cn/qihangerp/oms/domain/OShopPlatform.java

@@ -0,0 +1,59 @@
+//package cn.qihangerp.oms.domain;
+//
+//import com.baomidou.mybatisplus.annotation.IdType;
+//import com.baomidou.mybatisplus.annotation.TableId;
+//import lombok.Data;
+//
+//import java.io.Serializable;
+//
+///**
+// * 店铺平台配置表
+// * @TableName o_shop_platform
+// */
+//@Data
+//public class OShopPlatform implements Serializable {
+//    /**
+//     *
+//     */
+//    @TableId(type = IdType.AUTO)
+//    private Integer id;
+//
+//    /**
+//     * 平台名
+//     */
+//    private String name;
+//
+//    /**
+//     * 平台编码
+//     */
+//    private String code;
+//
+//    /**
+//     *
+//     */
+//    private String appKey;
+//
+//    /**
+//     *
+//     */
+//    private String appSecret;
+//
+//    /**
+//     * 平台回调uri
+//     */
+//    private String redirectUri;
+//
+//    /**
+//     * 接口访问地址
+//     */
+//    private String serverUrl;
+//
+//    private Integer sort;
+//    private Long regionId;
+//    /**
+//     * 状态（0启用1关闭）
+//     */
+//    private String status;
+//
+//    private static final long serialVersionUID = 1L;
+//}

api/oms-api/src/main/java/cn/qihangerp/oms/domain/OShopPullLasttime.java

@@ -0,0 +1,60 @@
+//package cn.qihangerp.oms.domain;
+//
+//import com.baomidou.mybatisplus.annotation.IdType;
+//import com.baomidou.mybatisplus.annotation.TableId;
+//import lombok.Data;
+//
+//import java.io.Serializable;
+//import java.time.LocalDateTime;
+//import java.util.Date;
+//
+///**
+// * 店铺更新最后时间记录
+// * @TableName sys_shop_pull_lasttime
+// */
+//@Data
+//public class OShopPullLasttime implements Serializable {
+//    /**
+//     *
+//     */
+//    @TableId(type = IdType.AUTO)
+//    private String id;
+//
+//    /**
+//     * 店铺id
+//     */
+//    private Long shopId;
+//
+//    /**
+//     * 类型（ORDER:订单，REFUND:退款）
+//     */
+//    private Object pullType;
+//
+//    /**
+//     * 最后更新时间
+//     */
+//    private LocalDateTime lasttime;
+//
+//    /**
+//     * 创建时间
+//     */
+//    private Date createTime;
+//
+//    /**
+//     * 更新时间
+//     */
+//    private Date updateTime;
+//
+//    private static final long serialVersionUID = 1L;
+//    public OShopPullLasttime(){
+//
+//    }
+//
+//    public OShopPullLasttime(Long shopId, Object pullType, LocalDateTime lasttime, Date createTime, Date updateTime) {
+//        this.shopId = shopId;
+//        this.pullType = pullType;
+//        this.lasttime = lasttime;
+//        this.createTime = createTime;
+//        this.updateTime = updateTime;
+//    }
+//}

api/oms-api/src/main/java/cn/qihangerp/oms/domain/OShopPullLogs.java

@@ -0,0 +1,75 @@
+//package cn.qihangerp.oms.domain;
+//
+//import com.baomidou.mybatisplus.annotation.IdType;
+//import com.baomidou.mybatisplus.annotation.TableId;
+//import lombok.Data;
+//
+//import java.io.Serializable;
+//import java.util.Date;
+//
+///**
+// * 店铺更新日志表
+// * @TableName sys_shop_pull_logs
+// */
+//@Data
+//public class OShopPullLogs implements Serializable {
+//    /**
+//     * 主键Id
+//     */
+//    @TableId(type = IdType.AUTO)
+//    private Long id;
+//
+//    /**
+//     * 店铺id
+//     */
+//    private Long shopId;
+//
+//    /**
+//     * 平台id
+//     */
+//    private Integer shopType;
+//
+//    /**
+//     * 类型（ORDER订单，GOODS商品，REFUND退款）
+//     */
+//    private String pullType;
+//
+//    /**
+//     * 拉取方式（主动拉取、定时任务）
+//     */
+//    private String pullWay;
+//
+//    /**
+//     * 拉取参数
+//     */
+//    private String pullParams;
+//
+//    /**
+//     * 拉取结果
+//     */
+//    private String pullResult;
+//
+//    /**
+//     * 拉取时间
+//     */
+//    private Date pullTime;
+//
+//    /**
+//     * 耗时（毫秒）
+//     */
+//    private Long duration;
+//
+//    public OShopPullLogs(Long shopId, Integer shopType, String pullType, String pullWay, String pullParams, String pullResult, Date pullTime, Long duration) {
+//        this.shopId = shopId;
+//        this.shopType = shopType;
+//        this.pullType = pullType;
+//        this.pullWay = pullWay;
+//        this.pullParams = pullParams;
+//        this.pullResult = pullResult;
+//        this.pullTime = pullTime;
+//        this.duration = duration;
+//    }
+//
+//    public OShopPullLogs(){}
+//    private static final long serialVersionUID = 1L;
+//}

api/oms-api/src/main/java/cn/qihangerp/oms/mapper/OShopMapper.java

@@ -0,0 +1,20 @@
+//package cn.qihangerp.oms.mapper;
+//
+//
+//
+//import cn.qihangerp.domain.OShop;
+//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+//
+///**
+//* @author qilip
+//* @description 针对表【sys_shop(数据中心-店铺)】的数据库操作Mapper
+//* @createDate 2024-03-17 15:17:34
+//* @Entity cn.qihangerp.oms.domain.SysShop
+//*/
+//public interface OShopMapper extends BaseMapper<OShop> {
+//
+//}
+//
+//
+//
+//

api/oms-api/src/main/java/cn/qihangerp/oms/mapper/OShopPullLasttimeMapper.java

@@ -0,0 +1,19 @@
+//package cn.qihangerp.oms.mapper;
+//
+//
+//import cn.qihangerp.domain.OShopPullLasttime;
+//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+//
+///**
+//* @author TW
+//* @description 针对表【sys_shop_pull_lasttime(店铺更新最后时间记录)】的数据库操作Mapper
+//* @createDate 2024-06-04 16:13:03
+//* @Entity cn.qihangerp.domain.SysShopPullLasttime
+//*/
+//public interface OShopPullLasttimeMapper extends BaseMapper<OShopPullLasttime> {
+//
+//}
+//
+//
+//
+//

api/oms-api/src/main/java/cn/qihangerp/oms/mapper/OShopPullLogsMapper.java

@@ -0,0 +1,19 @@
+//package cn.qihangerp.oms.mapper;
+//
+//
+//import cn.qihangerp.domain.OShopPullLogs;
+//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+//
+///**
+//* @author TW
+//* @description 针对表【sys_shop_pull_logs(更新日志表)】的数据库操作Mapper
+//* @createDate 2024-03-22 17:43:38
+//* @Entity cn.qihangerp.oms.domain.SysShopPullLogs
+//*/
+//public interface OShopPullLogsMapper extends BaseMapper<OShopPullLogs> {
+//
+//}
+//
+//
+//
+//

api/oms-api/src/main/java/cn/qihangerp/oms/mapper/SysUserMapper.java

@@ -0,0 +1,131 @@
+//package cn.qihangerp.oms.mapper;
+//
+//
+//import cn.qihangerp.domain.SysUser;
+//import org.apache.ibatis.annotations.Mapper;
+//import org.apache.ibatis.annotations.Param;
+//
+//import java.util.List;
+//
+///**
+// * 用户表 数据层
+// *
+// * @author qihang
+// */
+//@Mapper
+//public interface SysUserMapper
+//{
+//    /**
+//     * 根据条件分页查询用户列表
+//     *
+//     * @param sysUser 用户信息
+//     * @return 用户信息集合信息
+//     */
+//    public List<SysUser> selectUserList(SysUser sysUser);
+//
+//    /**
+//     * 根据条件分页查询已配用户角色列表
+//     *
+//     * @param user 用户信息
+//     * @return 用户信息集合信息
+//     */
+//    public List<SysUser> selectAllocatedList(SysUser user);
+//
+//    /**
+//     * 根据条件分页查询未分配用户角色列表
+//     *
+//     * @param user 用户信息
+//     * @return 用户信息集合信息
+//     */
+//    public List<SysUser> selectUnallocatedList(SysUser user);
+//
+//    /**
+//     * 通过用户名查询用户
+//     *
+//     * @param userName 用户名
+//     * @return 用户对象信息
+//     */
+//    public SysUser selectUserByUserName(String userName);
+//
+//    /**
+//     * 通过用户ID查询用户
+//     *
+//     * @param userId 用户ID
+//     * @return 用户对象信息
+//     */
+//    public SysUser selectUserById(Long userId);
+//
+//    /**
+//     * 新增用户信息
+//     *
+//     * @param user 用户信息
+//     * @return 结果
+//     */
+//    public int insertUser(SysUser user);
+//
+//    /**
+//     * 修改用户信息
+//     *
+//     * @param user 用户信息
+//     * @return 结果
+//     */
+//    public int updateUser(SysUser user);
+//
+//    /**
+//     * 修改用户头像
+//     *
+//     * @param userName 用户名
+//     * @param avatar 头像地址
+//     * @return 结果
+//     */
+//    public int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar);
+//
+//    /**
+//     * 重置用户密码
+//     *
+//     * @param userName 用户名
+//     * @param password 密码
+//     * @return 结果
+//     */
+//    public int resetUserPwd(@Param("userName") String userName, @Param("password") String password);
+//
+//    /**
+//     * 通过用户ID删除用户
+//     *
+//     * @param userId 用户ID
+//     * @return 结果
+//     */
+//    public int deleteUserById(Long userId);
+//
+//    /**
+//     * 批量删除用户信息
+//     *
+//     * @param userIds 需要删除的用户ID
+//     * @return 结果
+//     */
+//    public int deleteUserByIds(Long[] userIds);
+//
+//    /**
+//     * 校验用户名称是否唯一
+//     *
+//     * @param userName 用户名称
+//     * @return 结果
+//     */
+//    public SysUser checkUserNameUnique(String userName);
+//
+//    /**
+//     * 校验手机号码是否唯一
+//     *
+//     * @param phonenumber 手机号码
+//     * @return 结果
+//     */
+//    public SysUser checkPhoneUnique(String phonenumber);
+//
+//    /**
+//     * 校验email是否唯一
+//     *
+//     * @param email 用户邮箱
+//     * @return 结果
+//     */
+//    public SysUser checkEmailUnique(String email);
+//}

api/oms-api/src/main/java/cn/qihangerp/oms/mq/ApiMessageReceiver.java

@@ -1,7 +1,5 @@
 package cn.qihangerp.oms.mq;
 
-
-import cn.qihangerp.oms.service.ErpSaleOrderService;
 import com.alibaba.fastjson2.JSON;
 import cn.qihangerp.common.enums.EnumShopType;
 import cn.qihangerp.common.mq.MqMessage;
@@ -44,14 +42,14 @@ public class ApiMessageReceiver implements MessageListener {
         if(vo.getMqType() == MqType.ORDER_MESSAGE){
             // 有新订单，插入新订单到shop_order
 
-            ErpSaleOrderService orderService = SpringUtils.getBean(ErpSaleOrderService.class);
-            if(vo.getShopType().getIndex() == EnumShopType.JD.getIndex()) {
-                logger.info("订单消息JD"+messageContent);
-                orderService.jdOrderMessage(vo.getKeyId());
-            }else if(vo.getShopType().getIndex() == EnumShopType.TAO.getIndex()) {
-                logger.info("订单消息TAO"+messageContent);
-                orderService.taoOrderMessage(vo.getKeyId());
-            }
+//            ErpSaleOrderService orderService = SpringUtils.getBean(ErpSaleOrderService.class);
+//            if(vo.getShopType().getIndex() == EnumShopType.JD.getIndex()) {
+//                logger.info("订单消息JD"+messageContent);
+//                orderService.jdOrderMessage(vo.getKeyId());
+//            }else if(vo.getShopType().getIndex() == EnumShopType.TAO.getIndex()) {
+//                logger.info("订单消息TAO"+messageContent);
+//                orderService.taoOrderMessage(vo.getKeyId());
+//            }
         }
 //        else if(vo.getMqType() == MqType.REFUND_MESSAGE){
 //            ORefundService refundService = SpringUtils.getBean(ORefundService.class);

api/oms-api/src/main/java/cn/qihangerp/oms/mq/KafkaMQConsumer.java

@@ -1,11 +1,11 @@
 package cn.qihangerp.oms.mq;
 
-import cn.qihangerp.oms.service.ErpSaleOrderService;
+
 import com.alibaba.fastjson2.JSON;
 import cn.qihangerp.common.enums.EnumShopType;
 import cn.qihangerp.common.mq.MqMessage;
 import cn.qihangerp.common.mq.MqType;
-import cn.qihangerp.oms.service.ErpSaleAfterRefundService;
+
 import lombok.AllArgsConstructor;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.slf4j.Logger;
@@ -20,8 +20,8 @@ import org.springframework.stereotype.Component;
 @Component
 public class KafkaMQConsumer {
     private static final Logger logger = LoggerFactory.getLogger(KafkaMQConsumer.class);
-    private final ErpSaleOrderService orderService;
-    private final ErpSaleAfterRefundService refundService;
+//    private final ErpSaleOrderService orderService;
+//    private final ErpSaleAfterRefundService refundService;
 
     /**
      * 订单消息处理
@@ -34,19 +34,19 @@ public class KafkaMQConsumer {
         MqMessage vo = JSON.parseObject(message.value().toString(), MqMessage.class);
         if(vo.getShopType().getIndex() == EnumShopType.JD.getIndex()) {
             logger.info("Kafka订单消息JD"+vo.getKeyId());
-            orderService.jdOrderMessage(vo.getKeyId());
+//            orderService.jdOrderMessage(vo.getKeyId());
         }else if(vo.getShopType().getIndex() == EnumShopType.TAO.getIndex()) {
             logger.info("Kafka订单消息TAO"+vo.getKeyId());
-            orderService.taoOrderMessage(vo.getKeyId());
+//            orderService.taoOrderMessage(vo.getKeyId());
         }else if(vo.getShopType().getIndex() == EnumShopType.PDD.getIndex()) {
             logger.info("Kafka订单消息PDD"+vo.getKeyId());
-            orderService.pddOrderMessage(vo.getKeyId());
+//            orderService.pddOrderMessage(vo.getKeyId());
         } else if(vo.getShopType().getIndex() == EnumShopType.DOU.getIndex()) {
             logger.info("Kafka订单消息DOU"+vo.getKeyId());
-            orderService.douOrderMessage(vo.getKeyId());
+//            orderService.douOrderMessage(vo.getKeyId());
         } else if(vo.getShopType().getIndex() == EnumShopType.WEI.getIndex()) {
             logger.info("Kafka订单消息WEI"+vo.getKeyId());
-            orderService.weiOrderMessage(vo.getKeyId());
+//            orderService.weiOrderMessage(vo.getKeyId());
         }
     }
 
@@ -60,19 +60,19 @@ public class KafkaMQConsumer {
         MqMessage vo = JSON.parseObject(message.value().toString(), MqMessage.class);
         if(vo.getShopType().getIndex() == EnumShopType.JD.getIndex()) {
             logger.info("Kafka售后消息JD"+vo.getKeyId());
-            refundService.jdRefundMessage(vo.getKeyId());
+//            refundService.jdRefundMessage(vo.getKeyId());
         }else if(vo.getShopType().getIndex() == EnumShopType.TAO.getIndex()) {
             logger.info("Kafka售后消息TAO"+vo.getKeyId());
-            refundService.taoRefundMessage(vo.getKeyId());
+//            refundService.taoRefundMessage(vo.getKeyId());
         }else if(vo.getShopType().getIndex() == EnumShopType.PDD.getIndex()) {
             logger.info("Kafka售后消息PDD"+vo.getKeyId());
-            refundService.pddRefundMessage(vo.getKeyId());
+//            refundService.pddRefundMessage(vo.getKeyId());
         } else if(vo.getShopType().getIndex() == EnumShopType.DOU.getIndex()) {
             logger.info("Kafka售后消息DOU"+vo.getKeyId());
-            refundService.douRefundMessage(vo.getKeyId());
+//            refundService.douRefundMessage(vo.getKeyId());
         } else if(vo.getShopType().getIndex() == EnumShopType.WEI.getIndex()) {
             logger.info("Kafka售后消息WEI"+vo.getKeyId());
-            refundService.weiRefundMessage(vo.getKeyId());
+//            refundService.weiRefundMessage(vo.getKeyId());
         }
     }
 
@@ -84,7 +84,7 @@ public class KafkaMQConsumer {
     public void onSHIP_STOCK_UP_MQ(ConsumerRecord<String,Object> message) {
         logger.info("收到kafka消息 SHIP_STOCK_UP_MQ ============"+message.topic()+"====="+message.partition()+"======"+message.value());
         MqMessage vo = JSON.parseObject(message.value().toString(), MqMessage.class);
-        orderService.orderShipStockUp(vo.getShopId(),vo.getKeyId());
+//        orderService.orderShipStockUp(vo.getShopId(),vo.getKeyId());
     }
 
     /**
@@ -95,6 +95,6 @@ public class KafkaMQConsumer {
     public void onSHIP_SEND_MQ(ConsumerRecord<String,Object> message) {
         logger.info("收到kafka消息 SHIP_SEND_MQ ============"+message.topic()+"====="+message.partition()+"======"+message.value());
         MqMessage vo = JSON.parseObject(message.value().toString(), MqMessage.class);
-        orderService.orderSendConfirm(vo.getShopId(),vo.getKeyId(),vo.getLogisticsCompanyCode(),vo.getWaybillCode());
+//        orderService.orderSendConfirm(vo.getShopId(),vo.getKeyId(),vo.getLogisticsCompanyCode(),vo.getWaybillCode());
     }
 }

api/oms-api/src/main/java/cn/qihangerp/oms/service/OShopPullLasttimeService.java

@@ -0,0 +1,18 @@
+//package cn.qihangerp.oms.service;
+//
+//
+//import cn.qihangerp.oms.domain.OShopPullLasttime;
+//import com.baomidou.mybatisplus.extension.service.IService;
+//
+//import java.util.List;
+//
+///**
+//* @author TW
+//* @description 针对表【sys_shop_pull_lasttime(店铺更新最后时间记录)】的数据库操作Service
+//* @createDate 2024-06-04 16:13:03
+//*/
+//public interface OShopPullLasttimeService extends IService<OShopPullLasttime> {
+//    OShopPullLasttime getLasttimeByShop(Long shopId, String pullType);
+//
+//    List<OShopPullLasttime> getLasttimeByShop(Long shopId);
+//}

api/oms-api/src/main/java/cn/qihangerp/oms/service/OShopPullLogsService.java

@@ -0,0 +1,17 @@
+//package cn.qihangerp.oms.service;
+//
+//import cn.qihangerp.common.PageQuery;
+//import cn.qihangerp.common.PageResult;
+//
+//import cn.qihangerp.oms.domain.OShopPullLogs;
+//import com.baomidou.mybatisplus.extension.service.IService;
+//
+///**
+//* @author TW
+//* @description 针对表【sys_shop_pull_logs(更新日志表)】的数据库操作Service
+//* @createDate 2024-03-22 17:43:38
+//*/
+//public interface OShopPullLogsService extends IService<OShopPullLogs> {
+//
+//    PageResult<OShopPullLogs> queryPageList(OShopPullLogs bo, PageQuery pageQuery);
+//}

api/oms-api/src/main/java/cn/qihangerp/oms/service/OShopService.java

@@ -0,0 +1,32 @@
+//package cn.qihangerp.oms.service;
+//
+//import cn.qihangerp.common.PageQuery;
+//import cn.qihangerp.common.PageResult;
+//import cn.qihangerp.common.enums.EnumShopType;
+//
+//import cn.qihangerp.oms.domain.OShop;
+//import com.baomidou.mybatisplus.extension.service.IService;
+//
+//import java.util.List;
+//
+///**
+//* @author qilip
+//* @description 针对表【sys_shop(数据中心-店铺)】的数据库操作Service
+//* @createDate 2024-03-17 15:17:34
+//*/
+//public interface OShopService extends IService<OShop> {
+//    PageResult<OShop> queryPageList(OShop bo, PageQuery pageQuery);
+//    List<OShop> selectShopList(OShop shop);
+//    OShop selectShopById(Long id);
+//    int updateShopById(OShop shop);
+//    int insertShop(OShop shop);
+//
+//    int deleteShopByIds(Long[] ids);
+////    List<SysPlatform> selectShopPlatformList();
+////    SysPlatform selectShopPlatformById(Long id);
+////    int updateShopPlatformById(SysPlatform platform);
+//    List<OShop> selectShopByShopType(EnumShopType shopType);
+//    void updateSessionKey(Long shopId,String sessionKey);
+//
+////    void updateShopManage(Long shopId,Long userId,Long groupId);
+//}