Bladeren bron

Merge remote-tracking branch 'origin/cg_live_dev' into cg_live_dev

yuhongqi 1 week geleden
bovenliggende
commit
1dec68b1a8
54 gewijzigde bestanden met toevoegingen van 4317 en 181 verwijderingen
  1. 103 0
      fs-admin/src/main/java/com/fs/live/controller/LiveAfterSalesController.java
  2. 103 0
      fs-admin/src/main/java/com/fs/live/controller/LiveAfterSalesItemController.java
  3. 103 0
      fs-admin/src/main/java/com/fs/live/controller/LiveAfterSalesLogsController.java
  4. 103 0
      fs-admin/src/main/java/com/fs/live/controller/LiveCartController.java
  5. 1 1
      fs-admin/src/main/java/com/fs/live/controller/LiveGoodsController.java
  6. 0 0
      fs-admin/src/main/java/com/fs/live/controller/LiveOrderController.java
  7. 103 0
      fs-admin/src/main/java/com/fs/live/controller/LiveOrderItemController.java
  8. 103 0
      fs-admin/src/main/java/com/fs/live/controller/LiveOrderLogsController.java
  9. 103 0
      fs-admin/src/main/java/com/fs/live/controller/LiveOrderStatusController.java
  10. 112 0
      fs-service/src/main/java/com/fs/live/domain/LiveAfterSales.java
  11. 47 0
      fs-service/src/main/java/com/fs/live/domain/LiveAfterSalesItem.java
  12. 54 0
      fs-service/src/main/java/com/fs/live/domain/LiveAfterSalesLogs.java
  13. 59 0
      fs-service/src/main/java/com/fs/live/domain/LiveCart.java
  14. 15 35
      fs-service/src/main/java/com/fs/live/domain/LiveGoods.java
  15. 283 0
      fs-service/src/main/java/com/fs/live/domain/LiveOrder.java
  16. 71 0
      fs-service/src/main/java/com/fs/live/domain/LiveOrderItem.java
  17. 46 0
      fs-service/src/main/java/com/fs/live/domain/LiveOrderLogs.java
  18. 42 0
      fs-service/src/main/java/com/fs/live/domain/LiveOrderStatus.java
  19. 61 0
      fs-service/src/main/java/com/fs/live/mapper/LiveAfterSalesItemMapper.java
  20. 61 0
      fs-service/src/main/java/com/fs/live/mapper/LiveAfterSalesLogsMapper.java
  21. 61 0
      fs-service/src/main/java/com/fs/live/mapper/LiveAfterSalesMapper.java
  22. 61 0
      fs-service/src/main/java/com/fs/live/mapper/LiveCartMapper.java
  23. 16 28
      fs-service/src/main/java/com/fs/live/mapper/LiveGoodsMapper.java
  24. 61 0
      fs-service/src/main/java/com/fs/live/mapper/LiveOrderItemMapper.java
  25. 61 0
      fs-service/src/main/java/com/fs/live/mapper/LiveOrderLogsMapper.java
  26. 61 0
      fs-service/src/main/java/com/fs/live/mapper/LiveOrderMapper.java
  27. 61 0
      fs-service/src/main/java/com/fs/live/mapper/LiveOrderStatusMapper.java
  28. 61 0
      fs-service/src/main/java/com/fs/live/service/ILiveAfterSalesItemService.java
  29. 61 0
      fs-service/src/main/java/com/fs/live/service/ILiveAfterSalesLogsService.java
  30. 61 0
      fs-service/src/main/java/com/fs/live/service/ILiveAfterSalesService.java
  31. 61 0
      fs-service/src/main/java/com/fs/live/service/ILiveCartService.java
  32. 16 28
      fs-service/src/main/java/com/fs/live/service/ILiveGoodsService.java
  33. 61 0
      fs-service/src/main/java/com/fs/live/service/ILiveOrderItemService.java
  34. 61 0
      fs-service/src/main/java/com/fs/live/service/ILiveOrderLogsService.java
  35. 61 0
      fs-service/src/main/java/com/fs/live/service/ILiveOrderService.java
  36. 61 0
      fs-service/src/main/java/com/fs/live/service/ILiveOrderStatusService.java
  37. 91 0
      fs-service/src/main/java/com/fs/live/service/impl/LiveAfterSalesItemServiceImpl.java
  38. 91 0
      fs-service/src/main/java/com/fs/live/service/impl/LiveAfterSalesLogsServiceImpl.java
  39. 93 0
      fs-service/src/main/java/com/fs/live/service/impl/LiveAfterSalesServiceImpl.java
  40. 94 0
      fs-service/src/main/java/com/fs/live/service/impl/LiveCartServiceImpl.java
  41. 20 36
      fs-service/src/main/java/com/fs/live/service/impl/LiveGoodsServiceImpl.java
  42. 91 0
      fs-service/src/main/java/com/fs/live/service/impl/LiveOrderItemServiceImpl.java
  43. 91 0
      fs-service/src/main/java/com/fs/live/service/impl/LiveOrderLogsServiceImpl.java
  44. 94 0
      fs-service/src/main/java/com/fs/live/service/impl/LiveOrderServiceImpl.java
  45. 91 0
      fs-service/src/main/java/com/fs/live/service/impl/LiveOrderStatusServiceImpl.java
  46. 81 0
      fs-service/src/main/resources/mapper/live/LiveAfterSalesItemMapper.xml
  47. 86 0
      fs-service/src/main/resources/mapper/live/LiveAfterSalesLogsMapper.xml
  48. 165 0
      fs-service/src/main/resources/mapper/live/LiveAfterSalesMapper.xml
  49. 104 0
      fs-service/src/main/resources/mapper/live/LiveCartMapper.xml
  50. 30 53
      fs-service/src/main/resources/mapper/live/LiveGoodsMapper.xml
  51. 111 0
      fs-service/src/main/resources/mapper/live/LiveOrderItemMapper.xml
  52. 76 0
      fs-service/src/main/resources/mapper/live/LiveOrderLogsMapper.xml
  53. 378 0
      fs-service/src/main/resources/mapper/live/LiveOrderMapper.xml
  54. 71 0
      fs-service/src/main/resources/mapper/live/LiveOrderStatusMapper.xml

+ 103 - 0
fs-admin/src/main/java/com/fs/live/controller/LiveAfterSalesController.java

@@ -0,0 +1,103 @@
+package com.fs.live.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.enums.BusinessType;
+import com.fs.live.domain.LiveAfterSales;
+import com.fs.live.service.ILiveAfterSalesService;
+import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.common.core.page.TableDataInfo;
+
+/**
+ * 售后记录Controller
+ * 
+ * @author fs
+ * @date 2025-07-08
+ */
+@RestController
+@RequestMapping("/live/liveAfteraSales")
+public class LiveAfterSalesController extends BaseController
+{
+    @Autowired
+    private ILiveAfterSalesService liveAfterSalesService;
+
+    /**
+     * 查询售后记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveAfteraSales:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(LiveAfterSales liveAfterSales)
+    {
+        startPage();
+        List<LiveAfterSales> list = liveAfterSalesService.selectLiveAfterSalesList(liveAfterSales);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出售后记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveAfteraSales:export')")
+    @Log(title = "售后记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(LiveAfterSales liveAfterSales)
+    {
+        List<LiveAfterSales> list = liveAfterSalesService.selectLiveAfterSalesList(liveAfterSales);
+        ExcelUtil<LiveAfterSales> util = new ExcelUtil<LiveAfterSales>(LiveAfterSales.class);
+        return util.exportExcel(list, "售后记录数据");
+    }
+
+    /**
+     * 获取售后记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveAfteraSales:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(liveAfterSalesService.selectLiveAfterSalesById(id));
+    }
+
+    /**
+     * 新增售后记录
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveAfteraSales:add')")
+    @Log(title = "售后记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody LiveAfterSales liveAfterSales)
+    {
+        return toAjax(liveAfterSalesService.insertLiveAfterSales(liveAfterSales));
+    }
+
+    /**
+     * 修改售后记录
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveAfteraSales:edit')")
+    @Log(title = "售后记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody LiveAfterSales liveAfterSales)
+    {
+        return toAjax(liveAfterSalesService.updateLiveAfterSales(liveAfterSales));
+    }
+
+    /**
+     * 删除售后记录
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveAfteraSales:remove')")
+    @Log(title = "售后记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(liveAfterSalesService.deleteLiveAfterSalesByIds(ids));
+    }
+}

+ 103 - 0
fs-admin/src/main/java/com/fs/live/controller/LiveAfterSalesItemController.java

@@ -0,0 +1,103 @@
+package com.fs.live.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.enums.BusinessType;
+import com.fs.live.domain.LiveAfterSalesItem;
+import com.fs.live.service.ILiveAfterSalesItemService;
+import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.common.core.page.TableDataInfo;
+
+/**
+ * 售后子Controller
+ * 
+ * @author fs
+ * @date 2025-07-08
+ */
+@RestController
+@RequestMapping("/live/liveAfterSalesItem")
+public class LiveAfterSalesItemController extends BaseController
+{
+    @Autowired
+    private ILiveAfterSalesItemService liveAfterSalesItemService;
+
+    /**
+     * 查询售后子列表
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveAfterSalesItem:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(LiveAfterSalesItem liveAfterSalesItem)
+    {
+        startPage();
+        List<LiveAfterSalesItem> list = liveAfterSalesItemService.selectLiveAfterSalesItemList(liveAfterSalesItem);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出售后子列表
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveAfterSalesItem:export')")
+    @Log(title = "售后子", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(LiveAfterSalesItem liveAfterSalesItem)
+    {
+        List<LiveAfterSalesItem> list = liveAfterSalesItemService.selectLiveAfterSalesItemList(liveAfterSalesItem);
+        ExcelUtil<LiveAfterSalesItem> util = new ExcelUtil<LiveAfterSalesItem>(LiveAfterSalesItem.class);
+        return util.exportExcel(list, "售后子数据");
+    }
+
+    /**
+     * 获取售后子详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveAfterSalesItem:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(liveAfterSalesItemService.selectLiveAfterSalesItemById(id));
+    }
+
+    /**
+     * 新增售后子
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveAfterSalesItem:add')")
+    @Log(title = "售后子", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody LiveAfterSalesItem liveAfterSalesItem)
+    {
+        return toAjax(liveAfterSalesItemService.insertLiveAfterSalesItem(liveAfterSalesItem));
+    }
+
+    /**
+     * 修改售后子
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveAfterSalesItem:edit')")
+    @Log(title = "售后子", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody LiveAfterSalesItem liveAfterSalesItem)
+    {
+        return toAjax(liveAfterSalesItemService.updateLiveAfterSalesItem(liveAfterSalesItem));
+    }
+
+    /**
+     * 删除售后子
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveAfterSalesItem:remove')")
+    @Log(title = "售后子", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(liveAfterSalesItemService.deleteLiveAfterSalesItemByIds(ids));
+    }
+}

+ 103 - 0
fs-admin/src/main/java/com/fs/live/controller/LiveAfterSalesLogsController.java

@@ -0,0 +1,103 @@
+package com.fs.live.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.enums.BusinessType;
+import com.fs.live.domain.LiveAfterSalesLogs;
+import com.fs.live.service.ILiveAfterSalesLogsService;
+import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.common.core.page.TableDataInfo;
+
+/**
+ * 售后订单操作Controller
+ * 
+ * @author fs
+ * @date 2025-07-08
+ */
+@RestController
+@RequestMapping("/live/liveAfterSalesLogs")
+public class LiveAfterSalesLogsController extends BaseController
+{
+    @Autowired
+    private ILiveAfterSalesLogsService liveAfterSalesLogsService;
+
+    /**
+     * 查询售后订单操作列表
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveAfterSalesLogs:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(LiveAfterSalesLogs liveAfterSalesLogs)
+    {
+        startPage();
+        List<LiveAfterSalesLogs> list = liveAfterSalesLogsService.selectLiveAfterSalesLogsList(liveAfterSalesLogs);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出售后订单操作列表
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveAfterSalesLogs:export')")
+    @Log(title = "售后订单操作", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(LiveAfterSalesLogs liveAfterSalesLogs)
+    {
+        List<LiveAfterSalesLogs> list = liveAfterSalesLogsService.selectLiveAfterSalesLogsList(liveAfterSalesLogs);
+        ExcelUtil<LiveAfterSalesLogs> util = new ExcelUtil<LiveAfterSalesLogs>(LiveAfterSalesLogs.class);
+        return util.exportExcel(list, "售后订单操作数据");
+    }
+
+    /**
+     * 获取售后订单操作详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveAfterSalesLogs:query')")
+    @GetMapping(value = "/{logsId}")
+    public AjaxResult getInfo(@PathVariable("logsId") Long logsId)
+    {
+        return AjaxResult.success(liveAfterSalesLogsService.selectLiveAfterSalesLogsByLogsId(logsId));
+    }
+
+    /**
+     * 新增售后订单操作
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveAfterSalesLogs:add')")
+    @Log(title = "售后订单操作", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody LiveAfterSalesLogs liveAfterSalesLogs)
+    {
+        return toAjax(liveAfterSalesLogsService.insertLiveAfterSalesLogs(liveAfterSalesLogs));
+    }
+
+    /**
+     * 修改售后订单操作
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveAfterSalesLogs:edit')")
+    @Log(title = "售后订单操作", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody LiveAfterSalesLogs liveAfterSalesLogs)
+    {
+        return toAjax(liveAfterSalesLogsService.updateLiveAfterSalesLogs(liveAfterSalesLogs));
+    }
+
+    /**
+     * 删除售后订单操作
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveAfterSalesLogs:remove')")
+    @Log(title = "售后订单操作", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{logsIds}")
+    public AjaxResult remove(@PathVariable Long[] logsIds)
+    {
+        return toAjax(liveAfterSalesLogsService.deleteLiveAfterSalesLogsByLogsIds(logsIds));
+    }
+}

+ 103 - 0
fs-admin/src/main/java/com/fs/live/controller/LiveCartController.java

@@ -0,0 +1,103 @@
+package com.fs.live.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.enums.BusinessType;
+import com.fs.live.domain.LiveCart;
+import com.fs.live.service.ILiveCartService;
+import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.common.core.page.TableDataInfo;
+
+/**
+ * 购物车Controller
+ * 
+ * @author fs
+ * @date 2025-07-08
+ */
+@RestController
+@RequestMapping("/live/liveCart")
+public class LiveCartController extends BaseController
+{
+    @Autowired
+    private ILiveCartService liveCartService;
+
+    /**
+     * 查询购物车列表
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveCart:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(LiveCart liveCart)
+    {
+        startPage();
+        List<LiveCart> list = liveCartService.selectLiveCartList(liveCart);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出购物车列表
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveCart:export')")
+    @Log(title = "购物车", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(LiveCart liveCart)
+    {
+        List<LiveCart> list = liveCartService.selectLiveCartList(liveCart);
+        ExcelUtil<LiveCart> util = new ExcelUtil<LiveCart>(LiveCart.class);
+        return util.exportExcel(list, "购物车数据");
+    }
+
+    /**
+     * 获取购物车详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveCart:query')")
+    @GetMapping(value = "/{cardId}")
+    public AjaxResult getInfo(@PathVariable("cardId") Long cardId)
+    {
+        return AjaxResult.success(liveCartService.selectLiveCartByCardId(cardId));
+    }
+
+    /**
+     * 新增购物车
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveCart:add')")
+    @Log(title = "购物车", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody LiveCart liveCart)
+    {
+        return toAjax(liveCartService.insertLiveCart(liveCart));
+    }
+
+    /**
+     * 修改购物车
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveCart:edit')")
+    @Log(title = "购物车", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody LiveCart liveCart)
+    {
+        return toAjax(liveCartService.updateLiveCart(liveCart));
+    }
+
+    /**
+     * 删除购物车
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveCart:remove')")
+    @Log(title = "购物车", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{cardIds}")
+    public AjaxResult remove(@PathVariable Long[] cardIds)
+    {
+        return toAjax(liveCartService.deleteLiveCartByCardIds(cardIds));
+    }
+}

+ 1 - 1
fs-admin/src/main/java/com/fs/live/controller/LiveGoodsController.java

@@ -18,7 +18,7 @@ import java.util.List;
  * 直播商品Controller
  *
  * @author fs
- * @date 2025-01-17
+ * @date 2025-07-08
  */
 @RestController
 @RequestMapping("/live/liveGoods")

+ 0 - 0
fs-admin/src/main/java/com/fs/live/controller/LiveGoodsOrderController.java → fs-admin/src/main/java/com/fs/live/controller/LiveOrderController.java


+ 103 - 0
fs-admin/src/main/java/com/fs/live/controller/LiveOrderItemController.java

@@ -0,0 +1,103 @@
+package com.fs.live.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.enums.BusinessType;
+import com.fs.live.domain.LiveOrderItem;
+import com.fs.live.service.ILiveOrderItemService;
+import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.common.core.page.TableDataInfo;
+
+/**
+ * 订单详情Controller
+ * 
+ * @author fs
+ * @date 2025-07-08
+ */
+@RestController
+@RequestMapping("/live/liveOrderItem")
+public class LiveOrderItemController extends BaseController
+{
+    @Autowired
+    private ILiveOrderItemService liveOrderItemService;
+
+    /**
+     * 查询订单详情列表
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveOrderItem:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(LiveOrderItem liveOrderItem)
+    {
+        startPage();
+        List<LiveOrderItem> list = liveOrderItemService.selectLiveOrderItemList(liveOrderItem);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出订单详情列表
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveOrderItem:export')")
+    @Log(title = "订单详情", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(LiveOrderItem liveOrderItem)
+    {
+        List<LiveOrderItem> list = liveOrderItemService.selectLiveOrderItemList(liveOrderItem);
+        ExcelUtil<LiveOrderItem> util = new ExcelUtil<LiveOrderItem>(LiveOrderItem.class);
+        return util.exportExcel(list, "订单详情数据");
+    }
+
+    /**
+     * 获取订单详情详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveOrderItem:query')")
+    @GetMapping(value = "/{itemId}")
+    public AjaxResult getInfo(@PathVariable("itemId") String itemId)
+    {
+        return AjaxResult.success(liveOrderItemService.selectLiveOrderItemByItemId(itemId));
+    }
+
+    /**
+     * 新增订单详情
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveOrderItem:add')")
+    @Log(title = "订单详情", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody LiveOrderItem liveOrderItem)
+    {
+        return toAjax(liveOrderItemService.insertLiveOrderItem(liveOrderItem));
+    }
+
+    /**
+     * 修改订单详情
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveOrderItem:edit')")
+    @Log(title = "订单详情", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody LiveOrderItem liveOrderItem)
+    {
+        return toAjax(liveOrderItemService.updateLiveOrderItem(liveOrderItem));
+    }
+
+    /**
+     * 删除订单详情
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveOrderItem:remove')")
+    @Log(title = "订单详情", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{itemIds}")
+    public AjaxResult remove(@PathVariable String[] itemIds)
+    {
+        return toAjax(liveOrderItemService.deleteLiveOrderItemByItemIds(itemIds));
+    }
+}

+ 103 - 0
fs-admin/src/main/java/com/fs/live/controller/LiveOrderLogsController.java

@@ -0,0 +1,103 @@
+package com.fs.live.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.enums.BusinessType;
+import com.fs.live.domain.LiveOrderLogs;
+import com.fs.live.service.ILiveOrderLogsService;
+import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.common.core.page.TableDataInfo;
+
+/**
+ * 订单操作记录Controller
+ * 
+ * @author fs
+ * @date 2025-07-08
+ */
+@RestController
+@RequestMapping("/live/liveOrderLogs")
+public class LiveOrderLogsController extends BaseController
+{
+    @Autowired
+    private ILiveOrderLogsService liveOrderLogsService;
+
+    /**
+     * 查询订单操作记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveOrderLogs:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(LiveOrderLogs liveOrderLogs)
+    {
+        startPage();
+        List<LiveOrderLogs> list = liveOrderLogsService.selectLiveOrderLogsList(liveOrderLogs);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出订单操作记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveOrderLogs:export')")
+    @Log(title = "订单操作记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(LiveOrderLogs liveOrderLogs)
+    {
+        List<LiveOrderLogs> list = liveOrderLogsService.selectLiveOrderLogsList(liveOrderLogs);
+        ExcelUtil<LiveOrderLogs> util = new ExcelUtil<LiveOrderLogs>(LiveOrderLogs.class);
+        return util.exportExcel(list, "订单操作记录数据");
+    }
+
+    /**
+     * 获取订单操作记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveOrderLogs:query')")
+    @GetMapping(value = "/{logsId}")
+    public AjaxResult getInfo(@PathVariable("logsId") String logsId)
+    {
+        return AjaxResult.success(liveOrderLogsService.selectLiveOrderLogsByLogsId(logsId));
+    }
+
+    /**
+     * 新增订单操作记录
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveOrderLogs:add')")
+    @Log(title = "订单操作记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody LiveOrderLogs liveOrderLogs)
+    {
+        return toAjax(liveOrderLogsService.insertLiveOrderLogs(liveOrderLogs));
+    }
+
+    /**
+     * 修改订单操作记录
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveOrderLogs:edit')")
+    @Log(title = "订单操作记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody LiveOrderLogs liveOrderLogs)
+    {
+        return toAjax(liveOrderLogsService.updateLiveOrderLogs(liveOrderLogs));
+    }
+
+    /**
+     * 删除订单操作记录
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveOrderLogs:remove')")
+    @Log(title = "订单操作记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{logsIds}")
+    public AjaxResult remove(@PathVariable String[] logsIds)
+    {
+        return toAjax(liveOrderLogsService.deleteLiveOrderLogsByLogsIds(logsIds));
+    }
+}

+ 103 - 0
fs-admin/src/main/java/com/fs/live/controller/LiveOrderStatusController.java

@@ -0,0 +1,103 @@
+package com.fs.live.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.enums.BusinessType;
+import com.fs.live.domain.LiveOrderStatus;
+import com.fs.live.service.ILiveOrderStatusService;
+import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.common.core.page.TableDataInfo;
+
+/**
+ * 订单操作记录Controller
+ * 
+ * @author fs
+ * @date 2025-07-08
+ */
+@RestController
+@RequestMapping("/live/liveOrderStatus")
+public class LiveOrderStatusController extends BaseController
+{
+    @Autowired
+    private ILiveOrderStatusService liveOrderStatusService;
+
+    /**
+     * 查询订单操作记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveOrderStatus:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(LiveOrderStatus liveOrderStatus)
+    {
+        startPage();
+        List<LiveOrderStatus> list = liveOrderStatusService.selectLiveOrderStatusList(liveOrderStatus);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出订单操作记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveOrderStatus:export')")
+    @Log(title = "订单操作记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(LiveOrderStatus liveOrderStatus)
+    {
+        List<LiveOrderStatus> list = liveOrderStatusService.selectLiveOrderStatusList(liveOrderStatus);
+        ExcelUtil<LiveOrderStatus> util = new ExcelUtil<LiveOrderStatus>(LiveOrderStatus.class);
+        return util.exportExcel(list, "订单操作记录数据");
+    }
+
+    /**
+     * 获取订单操作记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveOrderStatus:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(liveOrderStatusService.selectLiveOrderStatusById(id));
+    }
+
+    /**
+     * 新增订单操作记录
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveOrderStatus:add')")
+    @Log(title = "订单操作记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody LiveOrderStatus liveOrderStatus)
+    {
+        return toAjax(liveOrderStatusService.insertLiveOrderStatus(liveOrderStatus));
+    }
+
+    /**
+     * 修改订单操作记录
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveOrderStatus:edit')")
+    @Log(title = "订单操作记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody LiveOrderStatus liveOrderStatus)
+    {
+        return toAjax(liveOrderStatusService.updateLiveOrderStatus(liveOrderStatus));
+    }
+
+    /**
+     * 删除订单操作记录
+     */
+    @PreAuthorize("@ss.hasPermi('live:liveOrderStatus:remove')")
+    @Log(title = "订单操作记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(liveOrderStatusService.deleteLiveOrderStatusByIds(ids));
+    }
+}

+ 112 - 0
fs-service/src/main/java/com/fs/live/domain/LiveAfterSales.java

@@ -0,0 +1,112 @@
+package com.fs.live.domain;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fs.common.annotation.Excel;
+import lombok.Data;
+import com.fs.common.core.domain.BaseEntity;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 售后记录对象 live_after_sales
+ *
+ * @author fs
+ * @date 2025-07-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class LiveAfterSales extends BaseEntity{
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 直播ID */
+    @Excel(name = "直播ID")
+    private Long liveId;
+
+    /** 店铺ID */
+    @Excel(name = "店铺ID")
+    private Long storeId;
+
+    /** 订单ID */
+    @Excel(name = "订单ID")
+    private Long orderId;
+
+    /** 退款金额 */
+    @Excel(name = "退款金额")
+    private BigDecimal refundAmount;
+
+    /** 服务类型0仅退款1退货退款 */
+    @Excel(name = "服务类型0仅退款1退货退款")
+    private Integer refundType;
+
+    /** 申请原因 */
+    @Excel(name = "申请原因")
+    private String reasons;
+
+    /** 说明 */
+    @Excel(name = "说明")
+    private String explains;
+
+    /** 说明图片-&gt;多个用逗号分割 */
+    @Excel(name = "说明图片-&gt;多个用逗号分割")
+    private String explainImg;
+
+    /** 物流公司编码 */
+    @Excel(name = "物流公司编码")
+    private String deliveryCode;
+
+    /** 物流单号 */
+    @Excel(name = "物流单号")
+    private String deliverySn;
+
+    /** 物流名称 */
+    @Excel(name = "物流名称")
+    private String deliveryName;
+
+    /** 状态 0已提交等待平台审核 1平台已审核 等待用户发货 2 用户已发货待仓库审核 3财务审核 4退款成功 */
+    @Excel(name = "状态 0已提交等待平台审核 1平台已审核 等待用户发货 2 用户已发货待仓库审核 3财务审核 4退款成功")
+    private Integer status;
+
+    /** 售后状态 0售后中 1用户取消2商家拒绝 3已完成 */
+    @Excel(name = "售后状态 0售后中 1用户取消2商家拒绝 3已完成")
+    private Integer salesStatus;
+
+    /** 订单状态 */
+    @Excel(name = "订单状态")
+    private Integer orderStatus;
+
+    /** 逻辑删除 */
+    @Excel(name = "逻辑删除")
+    private String isDel;
+
+    /** 用户id */
+    @Excel(name = "用户id")
+    private Long userId;
+
+    /** 商家收货人 */
+    @Excel(name = "商家收货人")
+    private String consignee;
+
+    /** 商家手机号 */
+    @Excel(name = "商家手机号")
+    private String phoneNumber;
+
+    /** 商家地址 */
+    @Excel(name = "商家地址")
+    private String address;
+
+    /** $column.columnComment */
+    @Excel(name = "商家地址")
+    private Long companyId;
+
+    /** $column.columnComment */
+    @Excel(name = "商家地址")
+    private Long companyUserId;
+
+    /** 部门id */
+    @Excel(name = "部门id")
+    private Long deptId;
+
+
+}

+ 47 - 0
fs-service/src/main/java/com/fs/live/domain/LiveAfterSalesItem.java

@@ -0,0 +1,47 @@
+package com.fs.live.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fs.common.annotation.Excel;
+import lombok.Data;
+import com.fs.common.core.domain.BaseEntity;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 售后子对象 live_after_sales_item
+ *
+ * @author fs
+ * @date 2025-07-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class LiveAfterSalesItem extends BaseEntity{
+
+    /** 主键id */
+    private Long id;
+
+    /** 售后id */
+    @Excel(name = "售后id")
+    private Long afterSalesId;
+
+    /** 直播商品ID */
+    @Excel(name = "直播商品ID")
+    private Long goodsId;
+
+    /** 商品id */
+    @Excel(name = "商品id")
+    private Long productId;
+
+    /** 退货东西的详情信息 */
+    @Excel(name = "退货东西的详情信息")
+    private String jsonInfo;
+
+    /** 逻辑删除 */
+    @Excel(name = "逻辑删除")
+    private Integer isDel;
+
+    /** $column.columnComment */
+    @Excel(name = "逻辑删除")
+    private Long productAttrValueId;
+
+
+}

+ 54 - 0
fs-service/src/main/java/com/fs/live/domain/LiveAfterSalesLogs.java

@@ -0,0 +1,54 @@
+package com.fs.live.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fs.common.annotation.Excel;
+import lombok.Data;
+import com.fs.common.core.domain.BaseEntity;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 售后订单操作对象 live_after_sales_logs
+ *
+ * @author fs
+ * @date 2025-07-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class LiveAfterSalesLogs extends BaseEntity{
+
+    /** $column.columnComment */
+    private Long logsId;
+
+    /** 售后id */
+    @Excel(name = "售后id")
+    private Long storeAfterSalesId;
+
+    /** 操作类型 */
+    @Excel(name = "操作类型")
+    private Integer changeType;
+
+    /** 操作备注 */
+    @Excel(name = "操作备注")
+    private String changeMessage;
+
+    /** 操作时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date changeTime;
+
+    /** 操作人 */
+    @Excel(name = "操作人")
+    private String operator;
+
+    /** 公司id */
+    @Excel(name = "公司id")
+    private Long companyId;
+
+    /** 店铺id */
+    @Excel(name = "店铺id")
+    private Long storeId;
+
+
+}

+ 59 - 0
fs-service/src/main/java/com/fs/live/domain/LiveCart.java

@@ -0,0 +1,59 @@
+package com.fs.live.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fs.common.annotation.Excel;
+import lombok.Data;
+import com.fs.common.core.domain.BaseEntity;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 购物车对象 live_cart
+ *
+ * @author fs
+ * @date 2025-07-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class LiveCart extends BaseEntity{
+
+    /** 购物车表ID */
+    private Long cardId;
+
+    /** 直播间ID */
+    @Excel(name = "直播间ID")
+    private Long liveId;
+
+    /** 用户ID */
+    @Excel(name = "用户ID")
+    private String userId;
+
+    /** 直播商品ID */
+    @Excel(name = "直播商品ID")
+    private Long goodsId;
+
+    /** 商品ID */
+    @Excel(name = "商品ID")
+    private String productId;
+
+    /** $column.columnComment */
+    @Excel(name = "商品ID")
+    private Long productAttrValueId;
+
+    /** 商品数量 */
+    @Excel(name = "商品数量")
+    private String cartNum;
+
+    /** 0 = 未购买 1 = 已购买 */
+    @Excel(name = "0 = 未购买 1 = 已购买")
+    private Integer isPay;
+
+    /** 是否删除 */
+    @Excel(name = "是否删除")
+    private Integer isDel;
+
+    /** 是否为立即购买 */
+    @Excel(name = "是否为立即购买")
+    private Integer isBuy;
+
+
+}

+ 15 - 35
fs-service/src/main/java/com/fs/live/domain/LiveGoods.java

@@ -1,65 +1,43 @@
 package com.fs.live.domain;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fs.common.annotation.Excel;
-import com.fs.common.core.domain.BaseEntity;
 import lombok.Data;
+import com.fs.common.core.domain.BaseEntity;
 import lombok.EqualsAndHashCode;
 
-import java.math.BigDecimal;
-
 /**
  * 直播商品对象 live_goods
  *
  * @author fs
- * @date 2025-01-17
+ * @date 2025-07-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class LiveGoods extends BaseEntity {
+public class LiveGoods extends BaseEntity{
 
     /** ID */
-    @TableId(type = IdType.AUTO)
     private Long goodsId;
 
     /** 直播ID */
     @Excel(name = "直播ID")
     private Long liveId;
 
-    /**
-     * 企业ID
-     */
+    /** 企业ID */
+    @Excel(name = "企业ID")
     private Long companyId;
 
-    /**
-     * 企业用户ID
-     */
+    /** 企业用户ID */
+    @Excel(name = "企业用户ID")
     private Long companyUserId;
 
-    /** 商品名称 */
-    @Excel(name = "商品名称")
-    private String goodsName;
-
-    /** 描述 */
-    @Excel(name = "描述")
-    private String goodsDesc;
-
-    /** 封图 */
-    @Excel(name = "封图")
-    private String imgUrl;
+    /** 店铺ID */
+    @Excel(name = "店铺ID")
+    private Long storeId;
 
-    /** 组图 */
-    @Excel(name = "组图")
-    private String images;
-
-    /** 单价 */
-    @Excel(name = "单价")
-    private BigDecimal price;
-
-    /** 原价 */
-    @Excel(name = "原价")
-    private BigDecimal opPrice;
+    /** 商品ID */
+    @Excel(name = "商品ID")
+    private Long productId;
 
     /** 状态 1上架 0下架 */
     @Excel(name = "状态 1上架 0下架")
@@ -72,4 +50,6 @@ public class LiveGoods extends BaseEntity {
     /** 排序号 */
     @Excel(name = "排序号")
     private Long sort;
+
+
 }

+ 283 - 0
fs-service/src/main/java/com/fs/live/domain/LiveOrder.java

@@ -0,0 +1,283 @@
+package com.fs.live.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fs.common.annotation.Excel;
+import lombok.Data;
+import com.fs.common.core.domain.BaseEntity;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 订单对象 live_order
+ *
+ * @author fs
+ * @date 2025-07-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class LiveOrder extends BaseEntity{
+
+    /** 订单ID */
+    private String orderId;
+
+    /** 直播ID */
+    @Excel(name = "直播ID")
+    private Long liveId;
+
+    /** $column.columnComment */
+    @Excel(name = "直播ID")
+    private Long storeId;
+
+    /** 订单号 */
+    @Excel(name = "订单号")
+    private String orderCode;
+
+    /** 用户id */
+    @Excel(name = "用户id")
+    private String userId;
+
+    /** 收货人 */
+    @Excel(name = "收货人")
+    private String userName;
+
+    /** 收货人电话 */
+    @Excel(name = "收货人电话")
+    private String userPhone;
+
+    /** 详细地址 */
+    @Excel(name = "详细地址")
+    private String userAddress;
+
+    /** 购物车id */
+    @Excel(name = "购物车id")
+    private String cartId;
+
+    /** 订单商品总数 */
+    @Excel(name = "订单商品总数")
+    private String totalNum;
+
+    /** 订单总价 */
+    @Excel(name = "订单总价")
+    private BigDecimal totalPrice;
+
+    /** 实际支付金额 */
+    @Excel(name = "实际支付金额")
+    private BigDecimal payPrice;
+
+    /** 支付金额 */
+    @Excel(name = "支付金额")
+    private BigDecimal payMoney;
+
+    /** 支付状态 待支付 1已支付 */
+    @Excel(name = "支付状态 待支付 1已支付")
+    private String isPay;
+
+    /** 支付时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date payTime;
+
+    /** 支付方式 1微信 */
+    @Excel(name = "支付方式 1微信")
+    private String payType;
+
+    /** 订单状态(-1 : 申请退款 -2 : 退货成功 1:待支付 2:待发货;3:待收货;4:待评价;5:已完成) */
+    @Excel(name = "订单状态", readConverterExp = "-=1,:=,申=请退款,-=2,:=,退=货成功,1=:待支付,2=:待发货;3:待收货;4:待评价;5:已完成")
+    private Integer status;
+
+    /** 0 未退款 1 申请中 2 已退款 */
+    @Excel(name = "0 未退款 1 申请中 2 已退款")
+    private String refundStatus;
+
+    /** 退款图片 */
+    @Excel(name = "退款图片")
+    private String refundImg;
+
+    /** 退款用户说明 */
+    @Excel(name = "退款用户说明")
+    private String refundExplain;
+
+    /** 退款时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "退款时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date refundTime;
+
+    /** 不退款的理由 */
+    @Excel(name = "不退款的理由")
+    private String refundReason;
+
+    /** 退款金额 */
+    @Excel(name = "退款金额")
+    private BigDecimal refundMoney;
+
+    /** 快递公司编号 */
+    @Excel(name = "快递公司编号")
+    private String deliveryCode;
+
+    /** 快递名称 */
+    @Excel(name = "快递名称")
+    private String deliveryName;
+
+    /** 快递单号 */
+    @Excel(name = "快递单号")
+    private String deliverySn;
+
+    /** 是否删除 */
+    @Excel(name = "是否删除")
+    private String isDel;
+
+    /** 成本价 */
+    @Excel(name = "成本价")
+    private BigDecimal costPrice;
+
+    /** 核销码 */
+    @Excel(name = "核销码")
+    private String verifyCode;
+
+    /** 配送方式 1=快递 ,2=门店自提 */
+    @Excel(name = "配送方式 1=快递 ,2=门店自提")
+    private Integer shippingType;
+
+    /** 支付渠道(1微信小程序) */
+    @Excel(name = "支付渠道(1微信小程序)")
+    private String isChannel;
+
+    /** $column.columnComment */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "支付渠道(1微信小程序)", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date finishTime;
+
+    /** 发货时间 */
+    @Excel(name = "发货时间")
+    private String deliveryTime;
+
+    /** 推广佣金 */
+    @Excel(name = "推广佣金")
+    private BigDecimal tuiMoney;
+
+    /** 推广佣金状态 1已发放 0待发放 */
+    @Excel(name = "推广佣金状态 1已发放 0待发放")
+    private Integer tuiMoneyStatus;
+
+    /** 上级推荐人ID */
+    @Excel(name = "上级推荐人ID")
+    private Long tuiUserId;
+
+    /** orderItem字符串 */
+    @Excel(name = "orderItem字符串")
+    private String itemJson;
+
+    /** 优惠金额 */
+    @Excel(name = "优惠金额")
+    private BigDecimal discountMoney;
+
+    /** $column.columnComment */
+    @Excel(name = "优惠金额")
+    private Long userCouponId;
+
+    /** 公司id */
+    @Excel(name = "公司id")
+    private Long companyId;
+
+    /** 公司员工id */
+    @Excel(name = "公司员工id")
+    private Long companyUserId;
+
+    /** 仓库代码 */
+    @Excel(name = "仓库代码")
+    private String storeHouseCode;
+
+    /** 扩展订单ID */
+    @Excel(name = "扩展订单ID")
+    private String extendOrderId;
+
+    /** 支付运费 */
+    @Excel(name = "支付运费")
+    private BigDecimal payDelivery;
+
+    /** 剩余金额 */
+    @Excel(name = "剩余金额")
+    private BigDecimal payRemain;
+
+    /** 物流状态 */
+    @Excel(name = "物流状态")
+    private Integer deliveryStatus;
+
+    /** 物流结算状态 */
+    @Excel(name = "物流结算状态")
+    private Integer deliveryPayStatus;
+
+    /** $column.columnComment */
+    @Excel(name = "物流结算状态")
+    private String deliveryPayTime;
+
+    /** 物流跟踪状态 */
+    @Excel(name = "物流跟踪状态")
+    private String deliveryType;
+
+    /** 物流结算金额 */
+    @Excel(name = "物流结算金额")
+    private BigDecimal deliveryPayMoney;
+
+    /** 回单导入时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "回单导入时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date deliveryImportTime;
+
+    /** 发货时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "发货时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date deliverySendTime;
+
+    /** 是否可售后 */
+    @Excel(name = "是否可售后")
+    private Integer isAfterSales;
+
+    /** 部门id */
+    @Excel(name = "部门id")
+    private Long deptId;
+
+    /** 渠道 */
+    @Excel(name = "渠道")
+    private String channel;
+
+    /** 订单来源 */
+    @Excel(name = "订单来源")
+    private Long source;
+
+    /** 开票金额 */
+    @Excel(name = "开票金额")
+    private BigDecimal billPrice;
+
+    /** 邮费 */
+    @Excel(name = "邮费")
+    private BigDecimal totalPostage;
+
+    /** 支付邮费 */
+    @Excel(name = "支付邮费")
+    private BigDecimal payPostage;
+
+    /** 消费赚取积分 */
+    @Excel(name = "消费赚取积分")
+    private BigDecimal gainIntegral;
+
+    /** 使用积分 */
+    @Excel(name = "使用积分")
+    private BigDecimal useIntegral;
+
+    /** 实际支付积分 */
+    @Excel(name = "实际支付积分")
+    private BigDecimal payIntegral;
+
+    /** 给用户退了多少积分 */
+    @Excel(name = "给用户退了多少积分")
+    private BigDecimal backIntegral;
+
+    /** 是否改价 */
+    @Excel(name = "是否改价")
+    private Integer isEditMoney;
+
+
+}

+ 71 - 0
fs-service/src/main/java/com/fs/live/domain/LiveOrderItem.java

@@ -0,0 +1,71 @@
+package com.fs.live.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fs.common.annotation.Excel;
+import lombok.Data;
+import com.fs.common.core.domain.BaseEntity;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 订单详情对象 live_order_item
+ *
+ * @author fs
+ * @date 2025-07-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class LiveOrderItem extends BaseEntity{
+
+    /** $column.columnComment */
+    private String itemId;
+
+    /** 订单id */
+    @Excel(name = "订单id")
+    private String orderId;
+
+    /** 订单号 */
+    @Excel(name = "订单号")
+    private String orderCode;
+
+    /** 购物车ID */
+    @Excel(name = "购物车ID")
+    private String cartId;
+
+    /** 直播商品ID */
+    @Excel(name = "直播商品ID")
+    private Long goodsId;
+
+    /** 商品ID */
+    @Excel(name = "商品ID")
+    private String productId;
+
+    /** 商品规格ID */
+    @Excel(name = "商品规格ID")
+    private Long productAttrValueId;
+
+    /** JSON */
+    @Excel(name = "JSON")
+    private String jsonInfo;
+
+    /** 数量 */
+    @Excel(name = "数量")
+    private Long num;
+
+    /** 是否申请售后 0否1是 */
+    @Excel(name = "是否申请售后 0否1是")
+    private Integer isAfterSales;
+
+    /** 是否为处方药 */
+    @Excel(name = "是否为处方药")
+    private Integer isPrescribe;
+
+    /** 店铺ID */
+    @Excel(name = "店铺ID")
+    private Long storeId;
+
+    /** 是否赠品 */
+    @Excel(name = "是否赠品")
+    private Integer isGift;
+
+
+}

+ 46 - 0
fs-service/src/main/java/com/fs/live/domain/LiveOrderLogs.java

@@ -0,0 +1,46 @@
+package com.fs.live.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fs.common.annotation.Excel;
+import lombok.Data;
+import com.fs.common.core.domain.BaseEntity;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 订单操作记录对象 live_order_logs
+ *
+ * @author fs
+ * @date 2025-07-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class LiveOrderLogs extends BaseEntity{
+
+    /** $column.columnComment */
+    private String logsId;
+
+    /** 订单id */
+    @Excel(name = "订单id")
+    private String orderId;
+
+    /** 操作类型 */
+    @Excel(name = "操作类型")
+    private String changeType;
+
+    /** 操作备注 */
+    @Excel(name = "操作备注")
+    private String changeMessage;
+
+    /** 操作时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date changeTime;
+
+    /** 操作员 */
+    @Excel(name = "操作员")
+    private String operator;
+
+
+}

+ 42 - 0
fs-service/src/main/java/com/fs/live/domain/LiveOrderStatus.java

@@ -0,0 +1,42 @@
+package com.fs.live.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fs.common.annotation.Excel;
+import lombok.Data;
+import com.fs.common.core.domain.BaseEntity;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 订单操作记录对象 live_order_status
+ *
+ * @author fs
+ * @date 2025-07-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class LiveOrderStatus extends BaseEntity{
+
+    /** $column.columnComment */
+    private String id;
+
+    /** 订单id */
+    @Excel(name = "订单id")
+    private String orderId;
+
+    /** 操作类型 */
+    @Excel(name = "操作类型")
+    private String changeType;
+
+    /** 操作备注 */
+    @Excel(name = "操作备注")
+    private String changeMessage;
+
+    /** 操作时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date changeTime;
+
+
+}

+ 61 - 0
fs-service/src/main/java/com/fs/live/mapper/LiveAfterSalesItemMapper.java

@@ -0,0 +1,61 @@
+package com.fs.live.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fs.live.domain.LiveAfterSalesItem;
+
+/**
+ * 售后子Mapper接口
+ * 
+ * @author fs
+ * @date 2025-07-08
+ */
+public interface LiveAfterSalesItemMapper extends BaseMapper<LiveAfterSalesItem>{
+    /**
+     * 查询售后子
+     * 
+     * @param id 售后子主键
+     * @return 售后子
+     */
+    LiveAfterSalesItem selectLiveAfterSalesItemById(Long id);
+
+    /**
+     * 查询售后子列表
+     * 
+     * @param liveAfterSalesItem 售后子
+     * @return 售后子集合
+     */
+    List<LiveAfterSalesItem> selectLiveAfterSalesItemList(LiveAfterSalesItem liveAfterSalesItem);
+
+    /**
+     * 新增售后子
+     * 
+     * @param liveAfterSalesItem 售后子
+     * @return 结果
+     */
+    int insertLiveAfterSalesItem(LiveAfterSalesItem liveAfterSalesItem);
+
+    /**
+     * 修改售后子
+     * 
+     * @param liveAfterSalesItem 售后子
+     * @return 结果
+     */
+    int updateLiveAfterSalesItem(LiveAfterSalesItem liveAfterSalesItem);
+
+    /**
+     * 删除售后子
+     * 
+     * @param id 售后子主键
+     * @return 结果
+     */
+    int deleteLiveAfterSalesItemById(Long id);
+
+    /**
+     * 批量删除售后子
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteLiveAfterSalesItemByIds(Long[] ids);
+}

+ 61 - 0
fs-service/src/main/java/com/fs/live/mapper/LiveAfterSalesLogsMapper.java

@@ -0,0 +1,61 @@
+package com.fs.live.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fs.live.domain.LiveAfterSalesLogs;
+
+/**
+ * 售后订单操作Mapper接口
+ * 
+ * @author fs
+ * @date 2025-07-08
+ */
+public interface LiveAfterSalesLogsMapper extends BaseMapper<LiveAfterSalesLogs>{
+    /**
+     * 查询售后订单操作
+     * 
+     * @param logsId 售后订单操作主键
+     * @return 售后订单操作
+     */
+    LiveAfterSalesLogs selectLiveAfterSalesLogsByLogsId(Long logsId);
+
+    /**
+     * 查询售后订单操作列表
+     * 
+     * @param liveAfterSalesLogs 售后订单操作
+     * @return 售后订单操作集合
+     */
+    List<LiveAfterSalesLogs> selectLiveAfterSalesLogsList(LiveAfterSalesLogs liveAfterSalesLogs);
+
+    /**
+     * 新增售后订单操作
+     * 
+     * @param liveAfterSalesLogs 售后订单操作
+     * @return 结果
+     */
+    int insertLiveAfterSalesLogs(LiveAfterSalesLogs liveAfterSalesLogs);
+
+    /**
+     * 修改售后订单操作
+     * 
+     * @param liveAfterSalesLogs 售后订单操作
+     * @return 结果
+     */
+    int updateLiveAfterSalesLogs(LiveAfterSalesLogs liveAfterSalesLogs);
+
+    /**
+     * 删除售后订单操作
+     * 
+     * @param logsId 售后订单操作主键
+     * @return 结果
+     */
+    int deleteLiveAfterSalesLogsByLogsId(Long logsId);
+
+    /**
+     * 批量删除售后订单操作
+     * 
+     * @param logsIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteLiveAfterSalesLogsByLogsIds(Long[] logsIds);
+}

+ 61 - 0
fs-service/src/main/java/com/fs/live/mapper/LiveAfterSalesMapper.java

@@ -0,0 +1,61 @@
+package com.fs.live.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fs.live.domain.LiveAfterSales;
+
+/**
+ * 售后记录Mapper接口
+ * 
+ * @author fs
+ * @date 2025-07-08
+ */
+public interface LiveAfterSalesMapper extends BaseMapper<LiveAfterSales>{
+    /**
+     * 查询售后记录
+     * 
+     * @param id 售后记录主键
+     * @return 售后记录
+     */
+    LiveAfterSales selectLiveAfterSalesById(Long id);
+
+    /**
+     * 查询售后记录列表
+     * 
+     * @param liveAfterSales 售后记录
+     * @return 售后记录集合
+     */
+    List<LiveAfterSales> selectLiveAfterSalesList(LiveAfterSales liveAfterSales);
+
+    /**
+     * 新增售后记录
+     * 
+     * @param liveAfterSales 售后记录
+     * @return 结果
+     */
+    int insertLiveAfterSales(LiveAfterSales liveAfterSales);
+
+    /**
+     * 修改售后记录
+     * 
+     * @param liveAfterSales 售后记录
+     * @return 结果
+     */
+    int updateLiveAfterSales(LiveAfterSales liveAfterSales);
+
+    /**
+     * 删除售后记录
+     * 
+     * @param id 售后记录主键
+     * @return 结果
+     */
+    int deleteLiveAfterSalesById(Long id);
+
+    /**
+     * 批量删除售后记录
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteLiveAfterSalesByIds(Long[] ids);
+}

+ 61 - 0
fs-service/src/main/java/com/fs/live/mapper/LiveCartMapper.java

@@ -0,0 +1,61 @@
+package com.fs.live.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fs.live.domain.LiveCart;
+
+/**
+ * 购物车Mapper接口
+ * 
+ * @author fs
+ * @date 2025-07-08
+ */
+public interface LiveCartMapper extends BaseMapper<LiveCart>{
+    /**
+     * 查询购物车
+     * 
+     * @param cardId 购物车主键
+     * @return 购物车
+     */
+    LiveCart selectLiveCartByCardId(Long cardId);
+
+    /**
+     * 查询购物车列表
+     * 
+     * @param liveCart 购物车
+     * @return 购物车集合
+     */
+    List<LiveCart> selectLiveCartList(LiveCart liveCart);
+
+    /**
+     * 新增购物车
+     * 
+     * @param liveCart 购物车
+     * @return 结果
+     */
+    int insertLiveCart(LiveCart liveCart);
+
+    /**
+     * 修改购物车
+     * 
+     * @param liveCart 购物车
+     * @return 结果
+     */
+    int updateLiveCart(LiveCart liveCart);
+
+    /**
+     * 删除购物车
+     * 
+     * @param cardId 购物车主键
+     * @return 结果
+     */
+    int deleteLiveCartByCardId(Long cardId);
+
+    /**
+     * 批量删除购物车
+     * 
+     * @param cardIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteLiveCartByCardIds(Long[] cardIds);
+}

+ 16 - 28
fs-service/src/main/java/com/fs/live/mapper/LiveGoodsMapper.java

@@ -1,73 +1,61 @@
 package com.fs.live.mapper;
 
+import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.live.domain.LiveGoods;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * 直播商品Mapper接口
- *
+ * 
  * @author fs
- * @date 2025-01-17
+ * @date 2025-07-08
  */
-public interface LiveGoodsMapper extends BaseMapper<LiveGoods>
-{
+public interface LiveGoodsMapper extends BaseMapper<LiveGoods>{
     /**
      * 查询直播商品
-     *
+     * 
      * @param goodsId 直播商品主键
      * @return 直播商品
      */
-    public LiveGoods selectLiveGoodsByGoodsId(Long goodsId);
-
-    /**
-     * 查询企业直播商品
-     * @param goodsId       商品ID
-     * @param companyId     企业ID
-     * @param companyUserId 企业用户ID
-     * @return liveGoods
-     */
-    LiveGoods selectLiveGoodsByGoodsIdAndCompanyIdAndCompanyUserId(@Param("goodsId") Long goodsId, @Param("companyId") Long companyId, @Param("companyUserId") Long companyUserId);
+    LiveGoods selectLiveGoodsByGoodsId(Long goodsId);
 
     /**
      * 查询直播商品列表
-     *
+     * 
      * @param liveGoods 直播商品
      * @return 直播商品集合
      */
-    public List<LiveGoods> selectLiveGoodsList(LiveGoods liveGoods);
+    List<LiveGoods> selectLiveGoodsList(LiveGoods liveGoods);
 
     /**
      * 新增直播商品
-     *
+     * 
      * @param liveGoods 直播商品
      * @return 结果
      */
-    public int insertLiveGoods(LiveGoods liveGoods);
+    int insertLiveGoods(LiveGoods liveGoods);
 
     /**
      * 修改直播商品
-     *
+     * 
      * @param liveGoods 直播商品
      * @return 结果
      */
-    public int updateLiveGoods(LiveGoods liveGoods);
+    int updateLiveGoods(LiveGoods liveGoods);
 
     /**
      * 删除直播商品
-     *
+     * 
      * @param goodsId 直播商品主键
      * @return 结果
      */
-    public int deleteLiveGoodsByGoodsId(Long goodsId);
+    int deleteLiveGoodsByGoodsId(Long goodsId);
 
     /**
      * 批量删除直播商品
-     *
+     * 
      * @param goodsIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteLiveGoodsByGoodsIds(Long[] goodsIds);
+    int deleteLiveGoodsByGoodsIds(Long[] goodsIds);
 }

+ 61 - 0
fs-service/src/main/java/com/fs/live/mapper/LiveOrderItemMapper.java

@@ -0,0 +1,61 @@
+package com.fs.live.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fs.live.domain.LiveOrderItem;
+
+/**
+ * 订单详情Mapper接口
+ * 
+ * @author fs
+ * @date 2025-07-08
+ */
+public interface LiveOrderItemMapper extends BaseMapper<LiveOrderItem>{
+    /**
+     * 查询订单详情
+     * 
+     * @param itemId 订单详情主键
+     * @return 订单详情
+     */
+    LiveOrderItem selectLiveOrderItemByItemId(String itemId);
+
+    /**
+     * 查询订单详情列表
+     * 
+     * @param liveOrderItem 订单详情
+     * @return 订单详情集合
+     */
+    List<LiveOrderItem> selectLiveOrderItemList(LiveOrderItem liveOrderItem);
+
+    /**
+     * 新增订单详情
+     * 
+     * @param liveOrderItem 订单详情
+     * @return 结果
+     */
+    int insertLiveOrderItem(LiveOrderItem liveOrderItem);
+
+    /**
+     * 修改订单详情
+     * 
+     * @param liveOrderItem 订单详情
+     * @return 结果
+     */
+    int updateLiveOrderItem(LiveOrderItem liveOrderItem);
+
+    /**
+     * 删除订单详情
+     * 
+     * @param itemId 订单详情主键
+     * @return 结果
+     */
+    int deleteLiveOrderItemByItemId(String itemId);
+
+    /**
+     * 批量删除订单详情
+     * 
+     * @param itemIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteLiveOrderItemByItemIds(String[] itemIds);
+}

+ 61 - 0
fs-service/src/main/java/com/fs/live/mapper/LiveOrderLogsMapper.java

@@ -0,0 +1,61 @@
+package com.fs.live.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fs.live.domain.LiveOrderLogs;
+
+/**
+ * 订单操作记录Mapper接口
+ * 
+ * @author fs
+ * @date 2025-07-08
+ */
+public interface LiveOrderLogsMapper extends BaseMapper<LiveOrderLogs>{
+    /**
+     * 查询订单操作记录
+     * 
+     * @param logsId 订单操作记录主键
+     * @return 订单操作记录
+     */
+    LiveOrderLogs selectLiveOrderLogsByLogsId(String logsId);
+
+    /**
+     * 查询订单操作记录列表
+     * 
+     * @param liveOrderLogs 订单操作记录
+     * @return 订单操作记录集合
+     */
+    List<LiveOrderLogs> selectLiveOrderLogsList(LiveOrderLogs liveOrderLogs);
+
+    /**
+     * 新增订单操作记录
+     * 
+     * @param liveOrderLogs 订单操作记录
+     * @return 结果
+     */
+    int insertLiveOrderLogs(LiveOrderLogs liveOrderLogs);
+
+    /**
+     * 修改订单操作记录
+     * 
+     * @param liveOrderLogs 订单操作记录
+     * @return 结果
+     */
+    int updateLiveOrderLogs(LiveOrderLogs liveOrderLogs);
+
+    /**
+     * 删除订单操作记录
+     * 
+     * @param logsId 订单操作记录主键
+     * @return 结果
+     */
+    int deleteLiveOrderLogsByLogsId(String logsId);
+
+    /**
+     * 批量删除订单操作记录
+     * 
+     * @param logsIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteLiveOrderLogsByLogsIds(String[] logsIds);
+}

+ 61 - 0
fs-service/src/main/java/com/fs/live/mapper/LiveOrderMapper.java

@@ -0,0 +1,61 @@
+package com.fs.live.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fs.live.domain.LiveOrder;
+
+/**
+ * 订单Mapper接口
+ * 
+ * @author fs
+ * @date 2025-07-08
+ */
+public interface LiveOrderMapper extends BaseMapper<LiveOrder>{
+    /**
+     * 查询订单
+     * 
+     * @param orderId 订单主键
+     * @return 订单
+     */
+    LiveOrder selectLiveOrderByOrderId(String orderId);
+
+    /**
+     * 查询订单列表
+     * 
+     * @param liveOrder 订单
+     * @return 订单集合
+     */
+    List<LiveOrder> selectLiveOrderList(LiveOrder liveOrder);
+
+    /**
+     * 新增订单
+     * 
+     * @param liveOrder 订单
+     * @return 结果
+     */
+    int insertLiveOrder(LiveOrder liveOrder);
+
+    /**
+     * 修改订单
+     * 
+     * @param liveOrder 订单
+     * @return 结果
+     */
+    int updateLiveOrder(LiveOrder liveOrder);
+
+    /**
+     * 删除订单
+     * 
+     * @param orderId 订单主键
+     * @return 结果
+     */
+    int deleteLiveOrderByOrderId(String orderId);
+
+    /**
+     * 批量删除订单
+     * 
+     * @param orderIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteLiveOrderByOrderIds(String[] orderIds);
+}

+ 61 - 0
fs-service/src/main/java/com/fs/live/mapper/LiveOrderStatusMapper.java

@@ -0,0 +1,61 @@
+package com.fs.live.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fs.live.domain.LiveOrderStatus;
+
+/**
+ * 订单操作记录Mapper接口
+ * 
+ * @author fs
+ * @date 2025-07-08
+ */
+public interface LiveOrderStatusMapper extends BaseMapper<LiveOrderStatus>{
+    /**
+     * 查询订单操作记录
+     * 
+     * @param id 订单操作记录主键
+     * @return 订单操作记录
+     */
+    LiveOrderStatus selectLiveOrderStatusById(String id);
+
+    /**
+     * 查询订单操作记录列表
+     * 
+     * @param liveOrderStatus 订单操作记录
+     * @return 订单操作记录集合
+     */
+    List<LiveOrderStatus> selectLiveOrderStatusList(LiveOrderStatus liveOrderStatus);
+
+    /**
+     * 新增订单操作记录
+     * 
+     * @param liveOrderStatus 订单操作记录
+     * @return 结果
+     */
+    int insertLiveOrderStatus(LiveOrderStatus liveOrderStatus);
+
+    /**
+     * 修改订单操作记录
+     * 
+     * @param liveOrderStatus 订单操作记录
+     * @return 结果
+     */
+    int updateLiveOrderStatus(LiveOrderStatus liveOrderStatus);
+
+    /**
+     * 删除订单操作记录
+     * 
+     * @param id 订单操作记录主键
+     * @return 结果
+     */
+    int deleteLiveOrderStatusById(String id);
+
+    /**
+     * 批量删除订单操作记录
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteLiveOrderStatusByIds(String[] ids);
+}

+ 61 - 0
fs-service/src/main/java/com/fs/live/service/ILiveAfterSalesItemService.java

@@ -0,0 +1,61 @@
+package com.fs.live.service;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fs.live.domain.LiveAfterSalesItem;
+
+/**
+ * 售后子Service接口
+ * 
+ * @author fs
+ * @date 2025-07-08
+ */
+public interface ILiveAfterSalesItemService extends IService<LiveAfterSalesItem>{
+    /**
+     * 查询售后子
+     * 
+     * @param id 售后子主键
+     * @return 售后子
+     */
+    LiveAfterSalesItem selectLiveAfterSalesItemById(Long id);
+
+    /**
+     * 查询售后子列表
+     * 
+     * @param liveAfterSalesItem 售后子
+     * @return 售后子集合
+     */
+    List<LiveAfterSalesItem> selectLiveAfterSalesItemList(LiveAfterSalesItem liveAfterSalesItem);
+
+    /**
+     * 新增售后子
+     * 
+     * @param liveAfterSalesItem 售后子
+     * @return 结果
+     */
+    int insertLiveAfterSalesItem(LiveAfterSalesItem liveAfterSalesItem);
+
+    /**
+     * 修改售后子
+     * 
+     * @param liveAfterSalesItem 售后子
+     * @return 结果
+     */
+    int updateLiveAfterSalesItem(LiveAfterSalesItem liveAfterSalesItem);
+
+    /**
+     * 批量删除售后子
+     * 
+     * @param ids 需要删除的售后子主键集合
+     * @return 结果
+     */
+    int deleteLiveAfterSalesItemByIds(Long[] ids);
+
+    /**
+     * 删除售后子信息
+     * 
+     * @param id 售后子主键
+     * @return 结果
+     */
+    int deleteLiveAfterSalesItemById(Long id);
+}

+ 61 - 0
fs-service/src/main/java/com/fs/live/service/ILiveAfterSalesLogsService.java

@@ -0,0 +1,61 @@
+package com.fs.live.service;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fs.live.domain.LiveAfterSalesLogs;
+
+/**
+ * 售后订单操作Service接口
+ * 
+ * @author fs
+ * @date 2025-07-08
+ */
+public interface ILiveAfterSalesLogsService extends IService<LiveAfterSalesLogs>{
+    /**
+     * 查询售后订单操作
+     * 
+     * @param logsId 售后订单操作主键
+     * @return 售后订单操作
+     */
+    LiveAfterSalesLogs selectLiveAfterSalesLogsByLogsId(Long logsId);
+
+    /**
+     * 查询售后订单操作列表
+     * 
+     * @param liveAfterSalesLogs 售后订单操作
+     * @return 售后订单操作集合
+     */
+    List<LiveAfterSalesLogs> selectLiveAfterSalesLogsList(LiveAfterSalesLogs liveAfterSalesLogs);
+
+    /**
+     * 新增售后订单操作
+     * 
+     * @param liveAfterSalesLogs 售后订单操作
+     * @return 结果
+     */
+    int insertLiveAfterSalesLogs(LiveAfterSalesLogs liveAfterSalesLogs);
+
+    /**
+     * 修改售后订单操作
+     * 
+     * @param liveAfterSalesLogs 售后订单操作
+     * @return 结果
+     */
+    int updateLiveAfterSalesLogs(LiveAfterSalesLogs liveAfterSalesLogs);
+
+    /**
+     * 批量删除售后订单操作
+     * 
+     * @param logsIds 需要删除的售后订单操作主键集合
+     * @return 结果
+     */
+    int deleteLiveAfterSalesLogsByLogsIds(Long[] logsIds);
+
+    /**
+     * 删除售后订单操作信息
+     * 
+     * @param logsId 售后订单操作主键
+     * @return 结果
+     */
+    int deleteLiveAfterSalesLogsByLogsId(Long logsId);
+}

+ 61 - 0
fs-service/src/main/java/com/fs/live/service/ILiveAfterSalesService.java

@@ -0,0 +1,61 @@
+package com.fs.live.service;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fs.live.domain.LiveAfterSales;
+
+/**
+ * 售后记录Service接口
+ * 
+ * @author fs
+ * @date 2025-07-08
+ */
+public interface ILiveAfterSalesService extends IService<LiveAfterSales>{
+    /**
+     * 查询售后记录
+     * 
+     * @param id 售后记录主键
+     * @return 售后记录
+     */
+    LiveAfterSales selectLiveAfterSalesById(Long id);
+
+    /**
+     * 查询售后记录列表
+     * 
+     * @param liveAfterSales 售后记录
+     * @return 售后记录集合
+     */
+    List<LiveAfterSales> selectLiveAfterSalesList(LiveAfterSales liveAfterSales);
+
+    /**
+     * 新增售后记录
+     * 
+     * @param liveAfterSales 售后记录
+     * @return 结果
+     */
+    int insertLiveAfterSales(LiveAfterSales liveAfterSales);
+
+    /**
+     * 修改售后记录
+     * 
+     * @param liveAfterSales 售后记录
+     * @return 结果
+     */
+    int updateLiveAfterSales(LiveAfterSales liveAfterSales);
+
+    /**
+     * 批量删除售后记录
+     * 
+     * @param ids 需要删除的售后记录主键集合
+     * @return 结果
+     */
+    int deleteLiveAfterSalesByIds(Long[] ids);
+
+    /**
+     * 删除售后记录信息
+     * 
+     * @param id 售后记录主键
+     * @return 结果
+     */
+    int deleteLiveAfterSalesById(Long id);
+}

+ 61 - 0
fs-service/src/main/java/com/fs/live/service/ILiveCartService.java

@@ -0,0 +1,61 @@
+package com.fs.live.service;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fs.live.domain.LiveCart;
+
+/**
+ * 购物车Service接口
+ * 
+ * @author fs
+ * @date 2025-07-08
+ */
+public interface ILiveCartService extends IService<LiveCart>{
+    /**
+     * 查询购物车
+     * 
+     * @param cardId 购物车主键
+     * @return 购物车
+     */
+    LiveCart selectLiveCartByCardId(Long cardId);
+
+    /**
+     * 查询购物车列表
+     * 
+     * @param liveCart 购物车
+     * @return 购物车集合
+     */
+    List<LiveCart> selectLiveCartList(LiveCart liveCart);
+
+    /**
+     * 新增购物车
+     * 
+     * @param liveCart 购物车
+     * @return 结果
+     */
+    int insertLiveCart(LiveCart liveCart);
+
+    /**
+     * 修改购物车
+     * 
+     * @param liveCart 购物车
+     * @return 结果
+     */
+    int updateLiveCart(LiveCart liveCart);
+
+    /**
+     * 批量删除购物车
+     * 
+     * @param cardIds 需要删除的购物车主键集合
+     * @return 结果
+     */
+    int deleteLiveCartByCardIds(Long[] cardIds);
+
+    /**
+     * 删除购物车信息
+     * 
+     * @param cardId 购物车主键
+     * @return 结果
+     */
+    int deleteLiveCartByCardId(Long cardId);
+}

+ 16 - 28
fs-service/src/main/java/com/fs/live/service/ILiveGoodsService.java

@@ -1,73 +1,61 @@
 package com.fs.live.service;
 
+import java.util.List;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fs.live.domain.LiveGoods;
 
-import java.util.List;
-
 /**
  * 直播商品Service接口
- *
+ * 
  * @author fs
- * @date 2025-01-17
+ * @date 2025-07-08
  */
-public interface ILiveGoodsService extends IService<LiveGoods>
-{
+public interface ILiveGoodsService extends IService<LiveGoods>{
     /**
      * 查询直播商品
-     *
-     * @param goodsId 直播商品主键
-     * @return 直播商品
-     */
-    public LiveGoods selectLiveGoodsByGoodsId(Long goodsId);
-
-    /**
-     * 查询企业直播商品
-     *
+     * 
      * @param goodsId 直播商品主键
-     * @param companyId 企业ID
-     * @param companyUserId 企业用户ID
      * @return 直播商品
      */
-    LiveGoods selectLiveGoodsByGoodsIdAndCompanyIdAndCompanyUserId(Long goodsId, Long companyId, Long companyUserId);
+    LiveGoods selectLiveGoodsByGoodsId(Long goodsId);
 
     /**
      * 查询直播商品列表
-     *
+     * 
      * @param liveGoods 直播商品
      * @return 直播商品集合
      */
-    public List<LiveGoods> selectLiveGoodsList(LiveGoods liveGoods);
+    List<LiveGoods> selectLiveGoodsList(LiveGoods liveGoods);
 
     /**
      * 新增直播商品
-     *
+     * 
      * @param liveGoods 直播商品
      * @return 结果
      */
-    public int insertLiveGoods(LiveGoods liveGoods);
+    int insertLiveGoods(LiveGoods liveGoods);
 
     /**
      * 修改直播商品
-     *
+     * 
      * @param liveGoods 直播商品
      * @return 结果
      */
-    public int updateLiveGoods(LiveGoods liveGoods);
+    int updateLiveGoods(LiveGoods liveGoods);
 
     /**
      * 批量删除直播商品
-     *
+     * 
      * @param goodsIds 需要删除的直播商品主键集合
      * @return 结果
      */
-    public int deleteLiveGoodsByGoodsIds(Long[] goodsIds);
+    int deleteLiveGoodsByGoodsIds(Long[] goodsIds);
 
     /**
      * 删除直播商品信息
-     *
+     * 
      * @param goodsId 直播商品主键
      * @return 结果
      */
-    public int deleteLiveGoodsByGoodsId(Long goodsId);
+    int deleteLiveGoodsByGoodsId(Long goodsId);
 }

+ 61 - 0
fs-service/src/main/java/com/fs/live/service/ILiveOrderItemService.java

@@ -0,0 +1,61 @@
+package com.fs.live.service;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fs.live.domain.LiveOrderItem;
+
+/**
+ * 订单详情Service接口
+ * 
+ * @author fs
+ * @date 2025-07-08
+ */
+public interface ILiveOrderItemService extends IService<LiveOrderItem>{
+    /**
+     * 查询订单详情
+     * 
+     * @param itemId 订单详情主键
+     * @return 订单详情
+     */
+    LiveOrderItem selectLiveOrderItemByItemId(String itemId);
+
+    /**
+     * 查询订单详情列表
+     * 
+     * @param liveOrderItem 订单详情
+     * @return 订单详情集合
+     */
+    List<LiveOrderItem> selectLiveOrderItemList(LiveOrderItem liveOrderItem);
+
+    /**
+     * 新增订单详情
+     * 
+     * @param liveOrderItem 订单详情
+     * @return 结果
+     */
+    int insertLiveOrderItem(LiveOrderItem liveOrderItem);
+
+    /**
+     * 修改订单详情
+     * 
+     * @param liveOrderItem 订单详情
+     * @return 结果
+     */
+    int updateLiveOrderItem(LiveOrderItem liveOrderItem);
+
+    /**
+     * 批量删除订单详情
+     * 
+     * @param itemIds 需要删除的订单详情主键集合
+     * @return 结果
+     */
+    int deleteLiveOrderItemByItemIds(String[] itemIds);
+
+    /**
+     * 删除订单详情信息
+     * 
+     * @param itemId 订单详情主键
+     * @return 结果
+     */
+    int deleteLiveOrderItemByItemId(String itemId);
+}

+ 61 - 0
fs-service/src/main/java/com/fs/live/service/ILiveOrderLogsService.java

@@ -0,0 +1,61 @@
+package com.fs.live.service;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fs.live.domain.LiveOrderLogs;
+
+/**
+ * 订单操作记录Service接口
+ * 
+ * @author fs
+ * @date 2025-07-08
+ */
+public interface ILiveOrderLogsService extends IService<LiveOrderLogs>{
+    /**
+     * 查询订单操作记录
+     * 
+     * @param logsId 订单操作记录主键
+     * @return 订单操作记录
+     */
+    LiveOrderLogs selectLiveOrderLogsByLogsId(String logsId);
+
+    /**
+     * 查询订单操作记录列表
+     * 
+     * @param liveOrderLogs 订单操作记录
+     * @return 订单操作记录集合
+     */
+    List<LiveOrderLogs> selectLiveOrderLogsList(LiveOrderLogs liveOrderLogs);
+
+    /**
+     * 新增订单操作记录
+     * 
+     * @param liveOrderLogs 订单操作记录
+     * @return 结果
+     */
+    int insertLiveOrderLogs(LiveOrderLogs liveOrderLogs);
+
+    /**
+     * 修改订单操作记录
+     * 
+     * @param liveOrderLogs 订单操作记录
+     * @return 结果
+     */
+    int updateLiveOrderLogs(LiveOrderLogs liveOrderLogs);
+
+    /**
+     * 批量删除订单操作记录
+     * 
+     * @param logsIds 需要删除的订单操作记录主键集合
+     * @return 结果
+     */
+    int deleteLiveOrderLogsByLogsIds(String[] logsIds);
+
+    /**
+     * 删除订单操作记录信息
+     * 
+     * @param logsId 订单操作记录主键
+     * @return 结果
+     */
+    int deleteLiveOrderLogsByLogsId(String logsId);
+}

+ 61 - 0
fs-service/src/main/java/com/fs/live/service/ILiveOrderService.java

@@ -0,0 +1,61 @@
+package com.fs.live.service;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fs.live.domain.LiveOrder;
+
+/**
+ * 订单Service接口
+ * 
+ * @author fs
+ * @date 2025-07-08
+ */
+public interface ILiveOrderService extends IService<LiveOrder>{
+    /**
+     * 查询订单
+     * 
+     * @param orderId 订单主键
+     * @return 订单
+     */
+    LiveOrder selectLiveOrderByOrderId(String orderId);
+
+    /**
+     * 查询订单列表
+     * 
+     * @param liveOrder 订单
+     * @return 订单集合
+     */
+    List<LiveOrder> selectLiveOrderList(LiveOrder liveOrder);
+
+    /**
+     * 新增订单
+     * 
+     * @param liveOrder 订单
+     * @return 结果
+     */
+    int insertLiveOrder(LiveOrder liveOrder);
+
+    /**
+     * 修改订单
+     * 
+     * @param liveOrder 订单
+     * @return 结果
+     */
+    int updateLiveOrder(LiveOrder liveOrder);
+
+    /**
+     * 批量删除订单
+     * 
+     * @param orderIds 需要删除的订单主键集合
+     * @return 结果
+     */
+    int deleteLiveOrderByOrderIds(String[] orderIds);
+
+    /**
+     * 删除订单信息
+     * 
+     * @param orderId 订单主键
+     * @return 结果
+     */
+    int deleteLiveOrderByOrderId(String orderId);
+}

+ 61 - 0
fs-service/src/main/java/com/fs/live/service/ILiveOrderStatusService.java

@@ -0,0 +1,61 @@
+package com.fs.live.service;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fs.live.domain.LiveOrderStatus;
+
+/**
+ * 订单操作记录Service接口
+ * 
+ * @author fs
+ * @date 2025-07-08
+ */
+public interface ILiveOrderStatusService extends IService<LiveOrderStatus>{
+    /**
+     * 查询订单操作记录
+     * 
+     * @param id 订单操作记录主键
+     * @return 订单操作记录
+     */
+    LiveOrderStatus selectLiveOrderStatusById(String id);
+
+    /**
+     * 查询订单操作记录列表
+     * 
+     * @param liveOrderStatus 订单操作记录
+     * @return 订单操作记录集合
+     */
+    List<LiveOrderStatus> selectLiveOrderStatusList(LiveOrderStatus liveOrderStatus);
+
+    /**
+     * 新增订单操作记录
+     * 
+     * @param liveOrderStatus 订单操作记录
+     * @return 结果
+     */
+    int insertLiveOrderStatus(LiveOrderStatus liveOrderStatus);
+
+    /**
+     * 修改订单操作记录
+     * 
+     * @param liveOrderStatus 订单操作记录
+     * @return 结果
+     */
+    int updateLiveOrderStatus(LiveOrderStatus liveOrderStatus);
+
+    /**
+     * 批量删除订单操作记录
+     * 
+     * @param ids 需要删除的订单操作记录主键集合
+     * @return 结果
+     */
+    int deleteLiveOrderStatusByIds(String[] ids);
+
+    /**
+     * 删除订单操作记录信息
+     * 
+     * @param id 订单操作记录主键
+     * @return 结果
+     */
+    int deleteLiveOrderStatusById(String id);
+}

+ 91 - 0
fs-service/src/main/java/com/fs/live/service/impl/LiveAfterSalesItemServiceImpl.java

@@ -0,0 +1,91 @@
+package com.fs.live.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.fs.live.mapper.LiveAfterSalesItemMapper;
+import com.fs.live.domain.LiveAfterSalesItem;
+import com.fs.live.service.ILiveAfterSalesItemService;
+
+/**
+ * 售后子Service业务层处理
+ * 
+ * @author fs
+ * @date 2025-07-08
+ */
+@Service
+public class LiveAfterSalesItemServiceImpl extends ServiceImpl<LiveAfterSalesItemMapper, LiveAfterSalesItem> implements ILiveAfterSalesItemService {
+
+    /**
+     * 查询售后子
+     * 
+     * @param id 售后子主键
+     * @return 售后子
+     */
+    @Override
+    public LiveAfterSalesItem selectLiveAfterSalesItemById(Long id)
+    {
+        return baseMapper.selectLiveAfterSalesItemById(id);
+    }
+
+    /**
+     * 查询售后子列表
+     * 
+     * @param liveAfterSalesItem 售后子
+     * @return 售后子
+     */
+    @Override
+    public List<LiveAfterSalesItem> selectLiveAfterSalesItemList(LiveAfterSalesItem liveAfterSalesItem)
+    {
+        return baseMapper.selectLiveAfterSalesItemList(liveAfterSalesItem);
+    }
+
+    /**
+     * 新增售后子
+     * 
+     * @param liveAfterSalesItem 售后子
+     * @return 结果
+     */
+    @Override
+    public int insertLiveAfterSalesItem(LiveAfterSalesItem liveAfterSalesItem)
+    {
+        return baseMapper.insertLiveAfterSalesItem(liveAfterSalesItem);
+    }
+
+    /**
+     * 修改售后子
+     * 
+     * @param liveAfterSalesItem 售后子
+     * @return 结果
+     */
+    @Override
+    public int updateLiveAfterSalesItem(LiveAfterSalesItem liveAfterSalesItem)
+    {
+        return baseMapper.updateLiveAfterSalesItem(liveAfterSalesItem);
+    }
+
+    /**
+     * 批量删除售后子
+     * 
+     * @param ids 需要删除的售后子主键
+     * @return 结果
+     */
+    @Override
+    public int deleteLiveAfterSalesItemByIds(Long[] ids)
+    {
+        return baseMapper.deleteLiveAfterSalesItemByIds(ids);
+    }
+
+    /**
+     * 删除售后子信息
+     * 
+     * @param id 售后子主键
+     * @return 结果
+     */
+    @Override
+    public int deleteLiveAfterSalesItemById(Long id)
+    {
+        return baseMapper.deleteLiveAfterSalesItemById(id);
+    }
+}

+ 91 - 0
fs-service/src/main/java/com/fs/live/service/impl/LiveAfterSalesLogsServiceImpl.java

@@ -0,0 +1,91 @@
+package com.fs.live.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.fs.live.mapper.LiveAfterSalesLogsMapper;
+import com.fs.live.domain.LiveAfterSalesLogs;
+import com.fs.live.service.ILiveAfterSalesLogsService;
+
+/**
+ * 售后订单操作Service业务层处理
+ * 
+ * @author fs
+ * @date 2025-07-08
+ */
+@Service
+public class LiveAfterSalesLogsServiceImpl extends ServiceImpl<LiveAfterSalesLogsMapper, LiveAfterSalesLogs> implements ILiveAfterSalesLogsService {
+
+    /**
+     * 查询售后订单操作
+     * 
+     * @param logsId 售后订单操作主键
+     * @return 售后订单操作
+     */
+    @Override
+    public LiveAfterSalesLogs selectLiveAfterSalesLogsByLogsId(Long logsId)
+    {
+        return baseMapper.selectLiveAfterSalesLogsByLogsId(logsId);
+    }
+
+    /**
+     * 查询售后订单操作列表
+     * 
+     * @param liveAfterSalesLogs 售后订单操作
+     * @return 售后订单操作
+     */
+    @Override
+    public List<LiveAfterSalesLogs> selectLiveAfterSalesLogsList(LiveAfterSalesLogs liveAfterSalesLogs)
+    {
+        return baseMapper.selectLiveAfterSalesLogsList(liveAfterSalesLogs);
+    }
+
+    /**
+     * 新增售后订单操作
+     * 
+     * @param liveAfterSalesLogs 售后订单操作
+     * @return 结果
+     */
+    @Override
+    public int insertLiveAfterSalesLogs(LiveAfterSalesLogs liveAfterSalesLogs)
+    {
+        return baseMapper.insertLiveAfterSalesLogs(liveAfterSalesLogs);
+    }
+
+    /**
+     * 修改售后订单操作
+     * 
+     * @param liveAfterSalesLogs 售后订单操作
+     * @return 结果
+     */
+    @Override
+    public int updateLiveAfterSalesLogs(LiveAfterSalesLogs liveAfterSalesLogs)
+    {
+        return baseMapper.updateLiveAfterSalesLogs(liveAfterSalesLogs);
+    }
+
+    /**
+     * 批量删除售后订单操作
+     * 
+     * @param logsIds 需要删除的售后订单操作主键
+     * @return 结果
+     */
+    @Override
+    public int deleteLiveAfterSalesLogsByLogsIds(Long[] logsIds)
+    {
+        return baseMapper.deleteLiveAfterSalesLogsByLogsIds(logsIds);
+    }
+
+    /**
+     * 删除售后订单操作信息
+     * 
+     * @param logsId 售后订单操作主键
+     * @return 结果
+     */
+    @Override
+    public int deleteLiveAfterSalesLogsByLogsId(Long logsId)
+    {
+        return baseMapper.deleteLiveAfterSalesLogsByLogsId(logsId);
+    }
+}

+ 93 - 0
fs-service/src/main/java/com/fs/live/service/impl/LiveAfterSalesServiceImpl.java

@@ -0,0 +1,93 @@
+package com.fs.live.service.impl;
+
+import java.util.List;
+import com.fs.common.utils.DateUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.fs.live.mapper.LiveAfterSalesMapper;
+import com.fs.live.domain.LiveAfterSales;
+import com.fs.live.service.ILiveAfterSalesService;
+
+/**
+ * 售后记录Service业务层处理
+ * 
+ * @author fs
+ * @date 2025-07-08
+ */
+@Service
+public class LiveAfterSalesServiceImpl extends ServiceImpl<LiveAfterSalesMapper, LiveAfterSales> implements ILiveAfterSalesService {
+
+    /**
+     * 查询售后记录
+     * 
+     * @param id 售后记录主键
+     * @return 售后记录
+     */
+    @Override
+    public LiveAfterSales selectLiveAfterSalesById(Long id)
+    {
+        return baseMapper.selectLiveAfterSalesById(id);
+    }
+
+    /**
+     * 查询售后记录列表
+     * 
+     * @param liveAfterSales 售后记录
+     * @return 售后记录
+     */
+    @Override
+    public List<LiveAfterSales> selectLiveAfterSalesList(LiveAfterSales liveAfterSales)
+    {
+        return baseMapper.selectLiveAfterSalesList(liveAfterSales);
+    }
+
+    /**
+     * 新增售后记录
+     * 
+     * @param liveAfterSales 售后记录
+     * @return 结果
+     */
+    @Override
+    public int insertLiveAfterSales(LiveAfterSales liveAfterSales)
+    {
+        liveAfterSales.setCreateTime(DateUtils.getNowDate());
+        return baseMapper.insertLiveAfterSales(liveAfterSales);
+    }
+
+    /**
+     * 修改售后记录
+     * 
+     * @param liveAfterSales 售后记录
+     * @return 结果
+     */
+    @Override
+    public int updateLiveAfterSales(LiveAfterSales liveAfterSales)
+    {
+        return baseMapper.updateLiveAfterSales(liveAfterSales);
+    }
+
+    /**
+     * 批量删除售后记录
+     * 
+     * @param ids 需要删除的售后记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteLiveAfterSalesByIds(Long[] ids)
+    {
+        return baseMapper.deleteLiveAfterSalesByIds(ids);
+    }
+
+    /**
+     * 删除售后记录信息
+     * 
+     * @param id 售后记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteLiveAfterSalesById(Long id)
+    {
+        return baseMapper.deleteLiveAfterSalesById(id);
+    }
+}

+ 94 - 0
fs-service/src/main/java/com/fs/live/service/impl/LiveCartServiceImpl.java

@@ -0,0 +1,94 @@
+package com.fs.live.service.impl;
+
+import java.util.List;
+import com.fs.common.utils.DateUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.fs.live.mapper.LiveCartMapper;
+import com.fs.live.domain.LiveCart;
+import com.fs.live.service.ILiveCartService;
+
+/**
+ * 购物车Service业务层处理
+ * 
+ * @author fs
+ * @date 2025-07-08
+ */
+@Service
+public class LiveCartServiceImpl extends ServiceImpl<LiveCartMapper, LiveCart> implements ILiveCartService {
+
+    /**
+     * 查询购物车
+     * 
+     * @param cardId 购物车主键
+     * @return 购物车
+     */
+    @Override
+    public LiveCart selectLiveCartByCardId(Long cardId)
+    {
+        return baseMapper.selectLiveCartByCardId(cardId);
+    }
+
+    /**
+     * 查询购物车列表
+     * 
+     * @param liveCart 购物车
+     * @return 购物车
+     */
+    @Override
+    public List<LiveCart> selectLiveCartList(LiveCart liveCart)
+    {
+        return baseMapper.selectLiveCartList(liveCart);
+    }
+
+    /**
+     * 新增购物车
+     * 
+     * @param liveCart 购物车
+     * @return 结果
+     */
+    @Override
+    public int insertLiveCart(LiveCart liveCart)
+    {
+        liveCart.setCreateTime(DateUtils.getNowDate());
+        return baseMapper.insertLiveCart(liveCart);
+    }
+
+    /**
+     * 修改购物车
+     * 
+     * @param liveCart 购物车
+     * @return 结果
+     */
+    @Override
+    public int updateLiveCart(LiveCart liveCart)
+    {
+        liveCart.setUpdateTime(DateUtils.getNowDate());
+        return baseMapper.updateLiveCart(liveCart);
+    }
+
+    /**
+     * 批量删除购物车
+     * 
+     * @param cardIds 需要删除的购物车主键
+     * @return 结果
+     */
+    @Override
+    public int deleteLiveCartByCardIds(Long[] cardIds)
+    {
+        return baseMapper.deleteLiveCartByCardIds(cardIds);
+    }
+
+    /**
+     * 删除购物车信息
+     * 
+     * @param cardId 购物车主键
+     * @return 结果
+     */
+    @Override
+    public int deleteLiveCartByCardId(Long cardId)
+    {
+        return baseMapper.deleteLiveCartByCardId(cardId);
+    }
+}

+ 20 - 36
fs-service/src/main/java/com/fs/live/service/impl/LiveGoodsServiceImpl.java

@@ -1,66 +1,50 @@
 package com.fs.live.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.List;
 import com.fs.common.utils.DateUtils;
-import com.fs.live.domain.LiveGoods;
-import com.fs.live.mapper.LiveGoodsMapper;
-import com.fs.live.service.ILiveGoodsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import java.util.List;
+import com.fs.live.mapper.LiveGoodsMapper;
+import com.fs.live.domain.LiveGoods;
+import com.fs.live.service.ILiveGoodsService;
 
 /**
  * 直播商品Service业务层处理
- *
+ * 
  * @author fs
- * @date 2025-01-17
+ * @date 2025-07-08
  */
 @Service
-public class LiveGoodsServiceImpl extends ServiceImpl<LiveGoodsMapper, LiveGoods> implements ILiveGoodsService
-{
-    @Autowired
-    private LiveGoodsMapper liveGoodsMapper;
+public class LiveGoodsServiceImpl extends ServiceImpl<LiveGoodsMapper, LiveGoods> implements ILiveGoodsService {
 
     /**
      * 查询直播商品
-     *
+     * 
      * @param goodsId 直播商品主键
      * @return 直播商品
      */
     @Override
     public LiveGoods selectLiveGoodsByGoodsId(Long goodsId)
     {
-        return liveGoodsMapper.selectLiveGoodsByGoodsId(goodsId);
-    }
-
-    /**
-     * 查询企业直播商品
-     *
-     * @param goodsId 直播商品主键
-     * @return 直播商品
-     */
-    @Override
-    public LiveGoods selectLiveGoodsByGoodsIdAndCompanyIdAndCompanyUserId(Long goodsId, Long companyId, Long companyUserId)
-    {
-        return liveGoodsMapper.selectLiveGoodsByGoodsIdAndCompanyIdAndCompanyUserId(goodsId, companyId, companyUserId);
+        return baseMapper.selectLiveGoodsByGoodsId(goodsId);
     }
 
     /**
      * 查询直播商品列表
-     *
+     * 
      * @param liveGoods 直播商品
      * @return 直播商品
      */
     @Override
     public List<LiveGoods> selectLiveGoodsList(LiveGoods liveGoods)
     {
-        return liveGoodsMapper.selectLiveGoodsList(liveGoods);
+        return baseMapper.selectLiveGoodsList(liveGoods);
     }
 
     /**
      * 新增直播商品
-     *
+     * 
      * @param liveGoods 直播商品
      * @return 结果
      */
@@ -68,12 +52,12 @@ public class LiveGoodsServiceImpl extends ServiceImpl<LiveGoodsMapper, LiveGoods
     public int insertLiveGoods(LiveGoods liveGoods)
     {
         liveGoods.setCreateTime(DateUtils.getNowDate());
-        return liveGoodsMapper.insertLiveGoods(liveGoods);
+        return baseMapper.insertLiveGoods(liveGoods);
     }
 
     /**
      * 修改直播商品
-     *
+     * 
      * @param liveGoods 直播商品
      * @return 结果
      */
@@ -81,30 +65,30 @@ public class LiveGoodsServiceImpl extends ServiceImpl<LiveGoodsMapper, LiveGoods
     public int updateLiveGoods(LiveGoods liveGoods)
     {
         liveGoods.setUpdateTime(DateUtils.getNowDate());
-        return liveGoodsMapper.updateLiveGoods(liveGoods);
+        return baseMapper.updateLiveGoods(liveGoods);
     }
 
     /**
      * 批量删除直播商品
-     *
+     * 
      * @param goodsIds 需要删除的直播商品主键
      * @return 结果
      */
     @Override
     public int deleteLiveGoodsByGoodsIds(Long[] goodsIds)
     {
-        return liveGoodsMapper.deleteLiveGoodsByGoodsIds(goodsIds);
+        return baseMapper.deleteLiveGoodsByGoodsIds(goodsIds);
     }
 
     /**
      * 删除直播商品信息
-     *
+     * 
      * @param goodsId 直播商品主键
      * @return 结果
      */
     @Override
     public int deleteLiveGoodsByGoodsId(Long goodsId)
     {
-        return liveGoodsMapper.deleteLiveGoodsByGoodsId(goodsId);
+        return baseMapper.deleteLiveGoodsByGoodsId(goodsId);
     }
 }

+ 91 - 0
fs-service/src/main/java/com/fs/live/service/impl/LiveOrderItemServiceImpl.java

@@ -0,0 +1,91 @@
+package com.fs.live.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.fs.live.mapper.LiveOrderItemMapper;
+import com.fs.live.domain.LiveOrderItem;
+import com.fs.live.service.ILiveOrderItemService;
+
+/**
+ * 订单详情Service业务层处理
+ * 
+ * @author fs
+ * @date 2025-07-08
+ */
+@Service
+public class LiveOrderItemServiceImpl extends ServiceImpl<LiveOrderItemMapper, LiveOrderItem> implements ILiveOrderItemService {
+
+    /**
+     * 查询订单详情
+     * 
+     * @param itemId 订单详情主键
+     * @return 订单详情
+     */
+    @Override
+    public LiveOrderItem selectLiveOrderItemByItemId(String itemId)
+    {
+        return baseMapper.selectLiveOrderItemByItemId(itemId);
+    }
+
+    /**
+     * 查询订单详情列表
+     * 
+     * @param liveOrderItem 订单详情
+     * @return 订单详情
+     */
+    @Override
+    public List<LiveOrderItem> selectLiveOrderItemList(LiveOrderItem liveOrderItem)
+    {
+        return baseMapper.selectLiveOrderItemList(liveOrderItem);
+    }
+
+    /**
+     * 新增订单详情
+     * 
+     * @param liveOrderItem 订单详情
+     * @return 结果
+     */
+    @Override
+    public int insertLiveOrderItem(LiveOrderItem liveOrderItem)
+    {
+        return baseMapper.insertLiveOrderItem(liveOrderItem);
+    }
+
+    /**
+     * 修改订单详情
+     * 
+     * @param liveOrderItem 订单详情
+     * @return 结果
+     */
+    @Override
+    public int updateLiveOrderItem(LiveOrderItem liveOrderItem)
+    {
+        return baseMapper.updateLiveOrderItem(liveOrderItem);
+    }
+
+    /**
+     * 批量删除订单详情
+     * 
+     * @param itemIds 需要删除的订单详情主键
+     * @return 结果
+     */
+    @Override
+    public int deleteLiveOrderItemByItemIds(String[] itemIds)
+    {
+        return baseMapper.deleteLiveOrderItemByItemIds(itemIds);
+    }
+
+    /**
+     * 删除订单详情信息
+     * 
+     * @param itemId 订单详情主键
+     * @return 结果
+     */
+    @Override
+    public int deleteLiveOrderItemByItemId(String itemId)
+    {
+        return baseMapper.deleteLiveOrderItemByItemId(itemId);
+    }
+}

+ 91 - 0
fs-service/src/main/java/com/fs/live/service/impl/LiveOrderLogsServiceImpl.java

@@ -0,0 +1,91 @@
+package com.fs.live.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.fs.live.mapper.LiveOrderLogsMapper;
+import com.fs.live.domain.LiveOrderLogs;
+import com.fs.live.service.ILiveOrderLogsService;
+
+/**
+ * 订单操作记录Service业务层处理
+ * 
+ * @author fs
+ * @date 2025-07-08
+ */
+@Service
+public class LiveOrderLogsServiceImpl extends ServiceImpl<LiveOrderLogsMapper, LiveOrderLogs> implements ILiveOrderLogsService {
+
+    /**
+     * 查询订单操作记录
+     * 
+     * @param logsId 订单操作记录主键
+     * @return 订单操作记录
+     */
+    @Override
+    public LiveOrderLogs selectLiveOrderLogsByLogsId(String logsId)
+    {
+        return baseMapper.selectLiveOrderLogsByLogsId(logsId);
+    }
+
+    /**
+     * 查询订单操作记录列表
+     * 
+     * @param liveOrderLogs 订单操作记录
+     * @return 订单操作记录
+     */
+    @Override
+    public List<LiveOrderLogs> selectLiveOrderLogsList(LiveOrderLogs liveOrderLogs)
+    {
+        return baseMapper.selectLiveOrderLogsList(liveOrderLogs);
+    }
+
+    /**
+     * 新增订单操作记录
+     * 
+     * @param liveOrderLogs 订单操作记录
+     * @return 结果
+     */
+    @Override
+    public int insertLiveOrderLogs(LiveOrderLogs liveOrderLogs)
+    {
+        return baseMapper.insertLiveOrderLogs(liveOrderLogs);
+    }
+
+    /**
+     * 修改订单操作记录
+     * 
+     * @param liveOrderLogs 订单操作记录
+     * @return 结果
+     */
+    @Override
+    public int updateLiveOrderLogs(LiveOrderLogs liveOrderLogs)
+    {
+        return baseMapper.updateLiveOrderLogs(liveOrderLogs);
+    }
+
+    /**
+     * 批量删除订单操作记录
+     * 
+     * @param logsIds 需要删除的订单操作记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteLiveOrderLogsByLogsIds(String[] logsIds)
+    {
+        return baseMapper.deleteLiveOrderLogsByLogsIds(logsIds);
+    }
+
+    /**
+     * 删除订单操作记录信息
+     * 
+     * @param logsId 订单操作记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteLiveOrderLogsByLogsId(String logsId)
+    {
+        return baseMapper.deleteLiveOrderLogsByLogsId(logsId);
+    }
+}

+ 94 - 0
fs-service/src/main/java/com/fs/live/service/impl/LiveOrderServiceImpl.java

@@ -0,0 +1,94 @@
+package com.fs.live.service.impl;
+
+import java.util.List;
+import com.fs.common.utils.DateUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.fs.live.mapper.LiveOrderMapper;
+import com.fs.live.domain.LiveOrder;
+import com.fs.live.service.ILiveOrderService;
+
+/**
+ * 订单Service业务层处理
+ * 
+ * @author fs
+ * @date 2025-07-08
+ */
+@Service
+public class LiveOrderServiceImpl extends ServiceImpl<LiveOrderMapper, LiveOrder> implements ILiveOrderService {
+
+    /**
+     * 查询订单
+     * 
+     * @param orderId 订单主键
+     * @return 订单
+     */
+    @Override
+    public LiveOrder selectLiveOrderByOrderId(String orderId)
+    {
+        return baseMapper.selectLiveOrderByOrderId(orderId);
+    }
+
+    /**
+     * 查询订单列表
+     * 
+     * @param liveOrder 订单
+     * @return 订单
+     */
+    @Override
+    public List<LiveOrder> selectLiveOrderList(LiveOrder liveOrder)
+    {
+        return baseMapper.selectLiveOrderList(liveOrder);
+    }
+
+    /**
+     * 新增订单
+     * 
+     * @param liveOrder 订单
+     * @return 结果
+     */
+    @Override
+    public int insertLiveOrder(LiveOrder liveOrder)
+    {
+        liveOrder.setCreateTime(DateUtils.getNowDate());
+        return baseMapper.insertLiveOrder(liveOrder);
+    }
+
+    /**
+     * 修改订单
+     * 
+     * @param liveOrder 订单
+     * @return 结果
+     */
+    @Override
+    public int updateLiveOrder(LiveOrder liveOrder)
+    {
+        liveOrder.setUpdateTime(DateUtils.getNowDate());
+        return baseMapper.updateLiveOrder(liveOrder);
+    }
+
+    /**
+     * 批量删除订单
+     * 
+     * @param orderIds 需要删除的订单主键
+     * @return 结果
+     */
+    @Override
+    public int deleteLiveOrderByOrderIds(String[] orderIds)
+    {
+        return baseMapper.deleteLiveOrderByOrderIds(orderIds);
+    }
+
+    /**
+     * 删除订单信息
+     * 
+     * @param orderId 订单主键
+     * @return 结果
+     */
+    @Override
+    public int deleteLiveOrderByOrderId(String orderId)
+    {
+        return baseMapper.deleteLiveOrderByOrderId(orderId);
+    }
+}

+ 91 - 0
fs-service/src/main/java/com/fs/live/service/impl/LiveOrderStatusServiceImpl.java

@@ -0,0 +1,91 @@
+package com.fs.live.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.fs.live.mapper.LiveOrderStatusMapper;
+import com.fs.live.domain.LiveOrderStatus;
+import com.fs.live.service.ILiveOrderStatusService;
+
+/**
+ * 订单操作记录Service业务层处理
+ * 
+ * @author fs
+ * @date 2025-07-08
+ */
+@Service
+public class LiveOrderStatusServiceImpl extends ServiceImpl<LiveOrderStatusMapper, LiveOrderStatus> implements ILiveOrderStatusService {
+
+    /**
+     * 查询订单操作记录
+     * 
+     * @param id 订单操作记录主键
+     * @return 订单操作记录
+     */
+    @Override
+    public LiveOrderStatus selectLiveOrderStatusById(String id)
+    {
+        return baseMapper.selectLiveOrderStatusById(id);
+    }
+
+    /**
+     * 查询订单操作记录列表
+     * 
+     * @param liveOrderStatus 订单操作记录
+     * @return 订单操作记录
+     */
+    @Override
+    public List<LiveOrderStatus> selectLiveOrderStatusList(LiveOrderStatus liveOrderStatus)
+    {
+        return baseMapper.selectLiveOrderStatusList(liveOrderStatus);
+    }
+
+    /**
+     * 新增订单操作记录
+     * 
+     * @param liveOrderStatus 订单操作记录
+     * @return 结果
+     */
+    @Override
+    public int insertLiveOrderStatus(LiveOrderStatus liveOrderStatus)
+    {
+        return baseMapper.insertLiveOrderStatus(liveOrderStatus);
+    }
+
+    /**
+     * 修改订单操作记录
+     * 
+     * @param liveOrderStatus 订单操作记录
+     * @return 结果
+     */
+    @Override
+    public int updateLiveOrderStatus(LiveOrderStatus liveOrderStatus)
+    {
+        return baseMapper.updateLiveOrderStatus(liveOrderStatus);
+    }
+
+    /**
+     * 批量删除订单操作记录
+     * 
+     * @param ids 需要删除的订单操作记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteLiveOrderStatusByIds(String[] ids)
+    {
+        return baseMapper.deleteLiveOrderStatusByIds(ids);
+    }
+
+    /**
+     * 删除订单操作记录信息
+     * 
+     * @param id 订单操作记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteLiveOrderStatusById(String id)
+    {
+        return baseMapper.deleteLiveOrderStatusById(id);
+    }
+}

+ 81 - 0
fs-service/src/main/resources/mapper/live/LiveAfterSalesItemMapper.xml

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fs.live.mapper.LiveAfterSalesItemMapper">
+
+    <resultMap type="LiveAfterSalesItem" id="LiveAfterSalesItemResult">
+        <result property="id"    column="id"    />
+        <result property="afterSalesId"    column="after_sales_id"    />
+        <result property="goodsId"    column="goods_id"    />
+        <result property="productId"    column="product_id"    />
+        <result property="jsonInfo"    column="json_info"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="productAttrValueId"    column="product_attr_value_id"    />
+    </resultMap>
+
+    <sql id="selectLiveAfterSalesItemVo">
+        select id, after_sales_id, goods_id, product_id, json_info, is_del, product_attr_value_id from live_after_sales_item
+    </sql>
+
+    <select id="selectLiveAfterSalesItemList" parameterType="LiveAfterSalesItem" resultMap="LiveAfterSalesItemResult">
+        <include refid="selectLiveAfterSalesItemVo"/>
+        <where>
+            <if test="afterSalesId != null "> and after_sales_id = #{afterSalesId}</if>
+            <if test="goodsId != null "> and goods_id = #{goodsId}</if>
+            <if test="productId != null "> and product_id = #{productId}</if>
+            <if test="jsonInfo != null  and jsonInfo != ''"> and json_info = #{jsonInfo}</if>
+            <if test="isDel != null "> and is_del = #{isDel}</if>
+            <if test="productAttrValueId != null "> and product_attr_value_id = #{productAttrValueId}</if>
+        </where>
+    </select>
+
+    <select id="selectLiveAfterSalesItemById" parameterType="Long" resultMap="LiveAfterSalesItemResult">
+        <include refid="selectLiveAfterSalesItemVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertLiveAfterSalesItem" parameterType="LiveAfterSalesItem" useGeneratedKeys="true" keyProperty="id">
+        insert into live_after_sales_item
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="afterSalesId != null">after_sales_id,</if>
+            <if test="goodsId != null">goods_id,</if>
+            <if test="productId != null">product_id,</if>
+            <if test="jsonInfo != null and jsonInfo != ''">json_info,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="productAttrValueId != null">product_attr_value_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="afterSalesId != null">#{afterSalesId},</if>
+            <if test="goodsId != null">#{goodsId},</if>
+            <if test="productId != null">#{productId},</if>
+            <if test="jsonInfo != null and jsonInfo != ''">#{jsonInfo},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="productAttrValueId != null">#{productAttrValueId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateLiveAfterSalesItem" parameterType="LiveAfterSalesItem">
+        update live_after_sales_item
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="afterSalesId != null">after_sales_id = #{afterSalesId},</if>
+            <if test="goodsId != null">goods_id = #{goodsId},</if>
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="jsonInfo != null and jsonInfo != ''">json_info = #{jsonInfo},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="productAttrValueId != null">product_attr_value_id = #{productAttrValueId},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteLiveAfterSalesItemById" parameterType="Long">
+        delete from live_after_sales_item where id = #{id}
+    </delete>
+
+    <delete id="deleteLiveAfterSalesItemByIds" parameterType="String">
+        delete from live_after_sales_item where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

+ 86 - 0
fs-service/src/main/resources/mapper/live/LiveAfterSalesLogsMapper.xml

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fs.live.mapper.LiveAfterSalesLogsMapper">
+
+    <resultMap type="LiveAfterSalesLogs" id="LiveAfterSalesLogsResult">
+        <result property="logsId"    column="logs_id"    />
+        <result property="storeAfterSalesId"    column="store_after_sales_id"    />
+        <result property="changeType"    column="change_type"    />
+        <result property="changeMessage"    column="change_message"    />
+        <result property="changeTime"    column="change_time"    />
+        <result property="operator"    column="operator"    />
+        <result property="companyId"    column="company_id"    />
+        <result property="storeId"    column="store_id"    />
+    </resultMap>
+
+    <sql id="selectLiveAfterSalesLogsVo">
+        select logs_id, store_after_sales_id, change_type, change_message, change_time, operator, company_id, store_id from live_after_sales_logs
+    </sql>
+
+    <select id="selectLiveAfterSalesLogsList" parameterType="LiveAfterSalesLogs" resultMap="LiveAfterSalesLogsResult">
+        <include refid="selectLiveAfterSalesLogsVo"/>
+        <where>
+            <if test="storeAfterSalesId != null "> and store_after_sales_id = #{storeAfterSalesId}</if>
+            <if test="changeType != null "> and change_type = #{changeType}</if>
+            <if test="changeMessage != null  and changeMessage != ''"> and change_message = #{changeMessage}</if>
+            <if test="changeTime != null "> and change_time = #{changeTime}</if>
+            <if test="operator != null  and operator != ''"> and operator = #{operator}</if>
+            <if test="companyId != null "> and company_id = #{companyId}</if>
+            <if test="storeId != null "> and store_id = #{storeId}</if>
+        </where>
+    </select>
+
+    <select id="selectLiveAfterSalesLogsByLogsId" parameterType="Long" resultMap="LiveAfterSalesLogsResult">
+        <include refid="selectLiveAfterSalesLogsVo"/>
+        where logs_id = #{logsId}
+    </select>
+
+    <insert id="insertLiveAfterSalesLogs" parameterType="LiveAfterSalesLogs" useGeneratedKeys="true" keyProperty="logsId">
+        insert into live_after_sales_logs
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="storeAfterSalesId != null">store_after_sales_id,</if>
+            <if test="changeType != null">change_type,</if>
+            <if test="changeMessage != null">change_message,</if>
+            <if test="changeTime != null">change_time,</if>
+            <if test="operator != null">operator,</if>
+            <if test="companyId != null">company_id,</if>
+            <if test="storeId != null">store_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="storeAfterSalesId != null">#{storeAfterSalesId},</if>
+            <if test="changeType != null">#{changeType},</if>
+            <if test="changeMessage != null">#{changeMessage},</if>
+            <if test="changeTime != null">#{changeTime},</if>
+            <if test="operator != null">#{operator},</if>
+            <if test="companyId != null">#{companyId},</if>
+            <if test="storeId != null">#{storeId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateLiveAfterSalesLogs" parameterType="LiveAfterSalesLogs">
+        update live_after_sales_logs
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="storeAfterSalesId != null">store_after_sales_id = #{storeAfterSalesId},</if>
+            <if test="changeType != null">change_type = #{changeType},</if>
+            <if test="changeMessage != null">change_message = #{changeMessage},</if>
+            <if test="changeTime != null">change_time = #{changeTime},</if>
+            <if test="operator != null">operator = #{operator},</if>
+            <if test="companyId != null">company_id = #{companyId},</if>
+            <if test="storeId != null">store_id = #{storeId},</if>
+        </trim>
+        where logs_id = #{logsId}
+    </update>
+
+    <delete id="deleteLiveAfterSalesLogsByLogsId" parameterType="Long">
+        delete from live_after_sales_logs where logs_id = #{logsId}
+    </delete>
+
+    <delete id="deleteLiveAfterSalesLogsByLogsIds" parameterType="String">
+        delete from live_after_sales_logs where logs_id in
+        <foreach item="logsId" collection="array" open="(" separator="," close=")">
+            #{logsId}
+        </foreach>
+    </delete>
+</mapper>

+ 165 - 0
fs-service/src/main/resources/mapper/live/LiveAfterSalesMapper.xml

@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fs.live.mapper.LiveAfterSalesMapper">
+
+    <resultMap type="LiveAfterSales" id="LiveAfterSalesResult">
+        <result property="id"    column="id"    />
+        <result property="liveId"    column="live_id"    />
+        <result property="storeId"    column="store_id"    />
+        <result property="orderId"    column="order_id"    />
+        <result property="refundAmount"    column="refund_amount"    />
+        <result property="refundType"    column="refund_type"    />
+        <result property="reasons"    column="reasons"    />
+        <result property="explains"    column="explains"    />
+        <result property="explainImg"    column="explain_img"    />
+        <result property="deliveryCode"    column="delivery_code"    />
+        <result property="deliverySn"    column="delivery_sn"    />
+        <result property="deliveryName"    column="delivery_name"    />
+        <result property="status"    column="status"    />
+        <result property="salesStatus"    column="sales_status"    />
+        <result property="orderStatus"    column="order_status"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="userId"    column="user_id"    />
+        <result property="consignee"    column="consignee"    />
+        <result property="phoneNumber"    column="phone_number"    />
+        <result property="address"    column="address"    />
+        <result property="companyId"    column="company_id"    />
+        <result property="companyUserId"    column="company_user_id"    />
+        <result property="deptId"    column="dept_id"    />
+    </resultMap>
+
+    <sql id="selectLiveAfterSalesVo">
+        select id, live_id, store_id, order_id, refund_amount, refund_type, reasons, explains, explain_img, delivery_code, delivery_sn, delivery_name, status, sales_status, order_status, create_time, is_del, user_id, consignee, phone_number, address, company_id, company_user_id, dept_id from live_after_sales
+    </sql>
+
+    <select id="selectLiveAfterSalesList" parameterType="LiveAfterSales" resultMap="LiveAfterSalesResult">
+        <include refid="selectLiveAfterSalesVo"/>
+        <where>
+            <if test="liveId != null "> and live_id = #{liveId}</if>
+            <if test="storeId != null "> and store_id = #{storeId}</if>
+            <if test="orderId != null "> and order_id = #{orderId}</if>
+            <if test="refundAmount != null "> and refund_amount = #{refundAmount}</if>
+            <if test="refundType != null "> and refund_type = #{refundType}</if>
+            <if test="reasons != null  and reasons != ''"> and reasons = #{reasons}</if>
+            <if test="explains != null  and explains != ''"> and explains = #{explains}</if>
+            <if test="explainImg != null  and explainImg != ''"> and explain_img = #{explainImg}</if>
+            <if test="deliveryCode != null  and deliveryCode != ''"> and delivery_code = #{deliveryCode}</if>
+            <if test="deliverySn != null  and deliverySn != ''"> and delivery_sn = #{deliverySn}</if>
+            <if test="deliveryName != null  and deliveryName != ''"> and delivery_name like concat('%', #{deliveryName}, '%')</if>
+            <if test="status != null "> and status = #{status}</if>
+            <if test="salesStatus != null "> and sales_status = #{salesStatus}</if>
+            <if test="orderStatus != null "> and order_status = #{orderStatus}</if>
+            <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="consignee != null  and consignee != ''"> and consignee = #{consignee}</if>
+            <if test="phoneNumber != null  and phoneNumber != ''"> and phone_number = #{phoneNumber}</if>
+            <if test="address != null  and address != ''"> and address = #{address}</if>
+            <if test="companyId != null "> and company_id = #{companyId}</if>
+            <if test="companyUserId != null "> and company_user_id = #{companyUserId}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+        </where>
+    </select>
+
+    <select id="selectLiveAfterSalesById" parameterType="Long" resultMap="LiveAfterSalesResult">
+        <include refid="selectLiveAfterSalesVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertLiveAfterSales" parameterType="LiveAfterSales" useGeneratedKeys="true" keyProperty="id">
+        insert into live_after_sales
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="liveId != null">live_id,</if>
+            <if test="storeId != null">store_id,</if>
+            <if test="orderId != null">order_id,</if>
+            <if test="refundAmount != null">refund_amount,</if>
+            <if test="refundType != null">refund_type,</if>
+            <if test="reasons != null">reasons,</if>
+            <if test="explains != null">explains,</if>
+            <if test="explainImg != null">explain_img,</if>
+            <if test="deliveryCode != null">delivery_code,</if>
+            <if test="deliverySn != null">delivery_sn,</if>
+            <if test="deliveryName != null">delivery_name,</if>
+            <if test="status != null">status,</if>
+            <if test="salesStatus != null">sales_status,</if>
+            <if test="orderStatus != null">order_status,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="consignee != null">consignee,</if>
+            <if test="phoneNumber != null">phone_number,</if>
+            <if test="address != null">address,</if>
+            <if test="companyId != null">company_id,</if>
+            <if test="companyUserId != null">company_user_id,</if>
+            <if test="deptId != null">dept_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="liveId != null">#{liveId},</if>
+            <if test="storeId != null">#{storeId},</if>
+            <if test="orderId != null">#{orderId},</if>
+            <if test="refundAmount != null">#{refundAmount},</if>
+            <if test="refundType != null">#{refundType},</if>
+            <if test="reasons != null">#{reasons},</if>
+            <if test="explains != null">#{explains},</if>
+            <if test="explainImg != null">#{explainImg},</if>
+            <if test="deliveryCode != null">#{deliveryCode},</if>
+            <if test="deliverySn != null">#{deliverySn},</if>
+            <if test="deliveryName != null">#{deliveryName},</if>
+            <if test="status != null">#{status},</if>
+            <if test="salesStatus != null">#{salesStatus},</if>
+            <if test="orderStatus != null">#{orderStatus},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="consignee != null">#{consignee},</if>
+            <if test="phoneNumber != null">#{phoneNumber},</if>
+            <if test="address != null">#{address},</if>
+            <if test="companyId != null">#{companyId},</if>
+            <if test="companyUserId != null">#{companyUserId},</if>
+            <if test="deptId != null">#{deptId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateLiveAfterSales" parameterType="LiveAfterSales">
+        update live_after_sales
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="liveId != null">live_id = #{liveId},</if>
+            <if test="storeId != null">store_id = #{storeId},</if>
+            <if test="orderId != null">order_id = #{orderId},</if>
+            <if test="refundAmount != null">refund_amount = #{refundAmount},</if>
+            <if test="refundType != null">refund_type = #{refundType},</if>
+            <if test="reasons != null">reasons = #{reasons},</if>
+            <if test="explains != null">explains = #{explains},</if>
+            <if test="explainImg != null">explain_img = #{explainImg},</if>
+            <if test="deliveryCode != null">delivery_code = #{deliveryCode},</if>
+            <if test="deliverySn != null">delivery_sn = #{deliverySn},</if>
+            <if test="deliveryName != null">delivery_name = #{deliveryName},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="salesStatus != null">sales_status = #{salesStatus},</if>
+            <if test="orderStatus != null">order_status = #{orderStatus},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="consignee != null">consignee = #{consignee},</if>
+            <if test="phoneNumber != null">phone_number = #{phoneNumber},</if>
+            <if test="address != null">address = #{address},</if>
+            <if test="companyId != null">company_id = #{companyId},</if>
+            <if test="companyUserId != null">company_user_id = #{companyUserId},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteLiveAfterSalesById" parameterType="Long">
+        delete from live_after_sales where id = #{id}
+    </delete>
+
+    <delete id="deleteLiveAfterSalesByIds" parameterType="String">
+        delete from live_after_sales where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

+ 104 - 0
fs-service/src/main/resources/mapper/live/LiveCartMapper.xml

@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fs.live.mapper.LiveCartMapper">
+
+    <resultMap type="LiveCart" id="LiveCartResult">
+        <result property="cardId"    column="card_id"    />
+        <result property="liveId"    column="live_id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="goodsId"    column="goods_id"    />
+        <result property="productId"    column="product_id"    />
+        <result property="productAttrValueId"    column="product_attr_value_id"    />
+        <result property="cartNum"    column="cart_num"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isPay"    column="is_pay"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="isBuy"    column="is_buy"    />
+    </resultMap>
+
+    <sql id="selectLiveCartVo">
+        select card_id, live_id, user_id, goods_id, product_id, product_attr_value_id, cart_num, create_time, update_time, is_pay, is_del, is_buy from live_cart
+    </sql>
+
+    <select id="selectLiveCartList" parameterType="LiveCart" resultMap="LiveCartResult">
+        <include refid="selectLiveCartVo"/>
+        <where>
+            <if test="liveId != null "> and live_id = #{liveId}</if>
+            <if test="userId != null  and userId != ''"> and user_id = #{userId}</if>
+            <if test="goodsId != null "> and goods_id = #{goodsId}</if>
+            <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
+            <if test="productAttrValueId != null "> and product_attr_value_id = #{productAttrValueId}</if>
+            <if test="cartNum != null  and cartNum != ''"> and cart_num = #{cartNum}</if>
+            <if test="isPay != null "> and is_pay = #{isPay}</if>
+            <if test="isDel != null "> and is_del = #{isDel}</if>
+            <if test="isBuy != null "> and is_buy = #{isBuy}</if>
+        </where>
+    </select>
+
+    <select id="selectLiveCartByCardId" parameterType="Long" resultMap="LiveCartResult">
+        <include refid="selectLiveCartVo"/>
+        where card_id = #{cardId}
+    </select>
+
+    <insert id="insertLiveCart" parameterType="LiveCart" useGeneratedKeys="true" keyProperty="cardId">
+        insert into live_cart
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="liveId != null">live_id,</if>
+            <if test="userId != null and userId != ''">user_id,</if>
+            <if test="goodsId != null">goods_id,</if>
+            <if test="productId != null and productId != ''">product_id,</if>
+            <if test="productAttrValueId != null">product_attr_value_id,</if>
+            <if test="cartNum != null and cartNum != ''">cart_num,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isPay != null">is_pay,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="isBuy != null">is_buy,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="liveId != null">#{liveId},</if>
+            <if test="userId != null and userId != ''">#{userId},</if>
+            <if test="goodsId != null">#{goodsId},</if>
+            <if test="productId != null and productId != ''">#{productId},</if>
+            <if test="productAttrValueId != null">#{productAttrValueId},</if>
+            <if test="cartNum != null and cartNum != ''">#{cartNum},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="isPay != null">#{isPay},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="isBuy != null">#{isBuy},</if>
+         </trim>
+    </insert>
+
+    <update id="updateLiveCart" parameterType="LiveCart">
+        update live_cart
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="liveId != null">live_id = #{liveId},</if>
+            <if test="userId != null and userId != ''">user_id = #{userId},</if>
+            <if test="goodsId != null">goods_id = #{goodsId},</if>
+            <if test="productId != null and productId != ''">product_id = #{productId},</if>
+            <if test="productAttrValueId != null">product_attr_value_id = #{productAttrValueId},</if>
+            <if test="cartNum != null and cartNum != ''">cart_num = #{cartNum},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="isPay != null">is_pay = #{isPay},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="isBuy != null">is_buy = #{isBuy},</if>
+        </trim>
+        where card_id = #{cardId}
+    </update>
+
+    <delete id="deleteLiveCartByCardId" parameterType="Long">
+        delete from live_cart where card_id = #{cardId}
+    </delete>
+
+    <delete id="deleteLiveCartByCardIds" parameterType="String">
+        delete from live_cart where card_id in
+        <foreach item="cardId" collection="array" open="(" separator="," close=")">
+            #{cardId}
+        </foreach>
+    </delete>
+</mapper>

+ 30 - 53
fs-service/src/main/resources/mapper/live/LiveGoodsMapper.xml

@@ -3,99 +3,78 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fs.live.mapper.LiveGoodsMapper">
-    
+
     <resultMap type="LiveGoods" id="LiveGoodsResult">
         <result property="goodsId"    column="goods_id"    />
         <result property="liveId"    column="live_id"    />
         <result property="companyId"    column="company_id"    />
         <result property="companyUserId"    column="company_user_id"    />
-        <result property="goodsName"    column="goods_name"    />
-        <result property="goodsDesc"    column="goods_desc"    />
-        <result property="imgUrl"    column="img_url"    />
-        <result property="images"    column="images"    />
-        <result property="price"    column="price"    />
-        <result property="opPrice"    column="op_price"    />
-        <result property="status"    column="status"    />
-        <result property="stock"    column="stock"    />
-        <result property="sort"    column="sort"    />
+        <result property="storeId"    column="store_id"    />
+        <result property="productId"    column="product_id"    />
         <result property="createTime"    column="create_time"    />
         <result property="createBy"    column="create_by"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
+        <result property="status"    column="status"    />
+        <result property="stock"    column="stock"    />
+        <result property="sort"    column="sort"    />
     </resultMap>
 
     <sql id="selectLiveGoodsVo">
-        select goods_id, live_id, company_id, company_user_id, goods_name, goods_desc, img_url, images, price, op_price, status, stock, sort, create_time, create_by, update_by, update_time, remark from live_goods
+        select goods_id, live_id, company_id, company_user_id, store_id, product_id, create_time, create_by, update_by, update_time, remark, status, stock, sort from live_goods
     </sql>
 
     <select id="selectLiveGoodsList" parameterType="LiveGoods" resultMap="LiveGoodsResult">
         <include refid="selectLiveGoodsVo"/>
-        <where>  
+        <where>
             <if test="liveId != null "> and live_id = #{liveId}</if>
             <if test="companyId != null "> and company_id = #{companyId}</if>
             <if test="companyUserId != null "> and company_user_id = #{companyUserId}</if>
-            <if test="goodsName != null  and goodsName != ''"> and goods_name like concat('%', #{goodsName}, '%')</if>
-            <if test="goodsDesc != null  and goodsDesc != ''"> and goods_desc = #{goodsDesc}</if>
-            <if test="imgUrl != null  and imgUrl != ''"> and img_url = #{imgUrl}</if>
-            <if test="images != null  and images != ''"> and images = #{images}</if>
-            <if test="price != null "> and price = #{price}</if>
-            <if test="opPrice != null "> and op_price = #{opPrice}</if>
+            <if test="storeId != null "> and store_id = #{storeId}</if>
+            <if test="productId != null "> and product_id = #{productId}</if>
             <if test="status != null "> and status = #{status}</if>
             <if test="stock != null "> and stock = #{stock}</if>
             <if test="sort != null "> and sort = #{sort}</if>
         </where>
     </select>
-    
+
     <select id="selectLiveGoodsByGoodsId" parameterType="Long" resultMap="LiveGoodsResult">
         <include refid="selectLiveGoodsVo"/>
         where goods_id = #{goodsId}
     </select>
 
-    <select id="selectLiveGoodsByGoodsIdAndCompanyIdAndCompanyUserId" resultMap="LiveGoodsResult">
-        <include refid="selectLiveGoodsVo"/>
-        where goods_id = #{goodsId} and company_id = #{companyId} and company_user_id = #{companyUserId}
-    </select>
-
     <insert id="insertLiveGoods" parameterType="LiveGoods" useGeneratedKeys="true" keyProperty="goodsId">
         insert into live_goods
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="liveId != null">live_id,</if>
             <if test="companyId != null">company_id,</if>
             <if test="companyUserId != null">company_user_id,</if>
-            <if test="goodsName != null">goods_name,</if>
-            <if test="goodsDesc != null">goods_desc,</if>
-            <if test="imgUrl != null">img_url,</if>
-            <if test="images != null">images,</if>
-            <if test="price != null">price,</if>
-            <if test="opPrice != null">op_price,</if>
-            <if test="status != null">status,</if>
-            <if test="stock != null">stock,</if>
-            <if test="sort != null">sort,</if>
+            <if test="storeId != null">store_id,</if>
+            <if test="productId != null">product_id,</if>
             <if test="createTime != null">create_time,</if>
             <if test="createBy != null">create_by,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
+            <if test="status != null">status,</if>
+            <if test="stock != null">stock,</if>
+            <if test="sort != null">sort,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="liveId != null">#{liveId},</if>
             <if test="companyId != null">#{companyId},</if>
             <if test="companyUserId != null">#{companyUserId},</if>
-            <if test="goodsName != null">#{goodsName},</if>
-            <if test="goodsDesc != null">#{goodsDesc},</if>
-            <if test="imgUrl != null">#{imgUrl},</if>
-            <if test="images != null">#{images},</if>
-            <if test="price != null">#{price},</if>
-            <if test="opPrice != null">#{opPrice},</if>
-            <if test="status != null">#{status},</if>
-            <if test="stock != null">#{stock},</if>
-            <if test="sort != null">#{sort},</if>
+            <if test="storeId != null">#{storeId},</if>
+            <if test="productId != null">#{productId},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="status != null">#{status},</if>
+            <if test="stock != null">#{stock},</if>
+            <if test="sort != null">#{sort},</if>
          </trim>
     </insert>
 
@@ -103,20 +82,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update live_goods
         <trim prefix="SET" suffixOverrides=",">
             <if test="liveId != null">live_id = #{liveId},</if>
-            <if test="goodsName != null">goods_name = #{goodsName},</if>
-            <if test="goodsDesc != null">goods_desc = #{goodsDesc},</if>
-            <if test="imgUrl != null">img_url = #{imgUrl},</if>
-            <if test="images != null">images = #{images},</if>
-            <if test="price != null">price = #{price},</if>
-            <if test="opPrice != null">op_price = #{opPrice},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="stock != null">stock = #{stock},</if>
-            <if test="sort != null">sort = #{sort},</if>
+            <if test="companyId != null">company_id = #{companyId},</if>
+            <if test="companyUserId != null">company_user_id = #{companyUserId},</if>
+            <if test="storeId != null">store_id = #{storeId},</if>
+            <if test="productId != null">product_id = #{productId},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="stock != null">stock = #{stock},</if>
+            <if test="sort != null">sort = #{sort},</if>
         </trim>
         where goods_id = #{goodsId}
     </update>
@@ -126,9 +103,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteLiveGoodsByGoodsIds" parameterType="String">
-        delete from live_goods where goods_id in 
+        delete from live_goods where goods_id in
         <foreach item="goodsId" collection="array" open="(" separator="," close=")">
             #{goodsId}
         </foreach>
     </delete>
-</mapper>
+</mapper>

+ 111 - 0
fs-service/src/main/resources/mapper/live/LiveOrderItemMapper.xml

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fs.live.mapper.LiveOrderItemMapper">
+
+    <resultMap type="LiveOrderItem" id="LiveOrderItemResult">
+        <result property="itemId"    column="item_id"    />
+        <result property="orderId"    column="order_id"    />
+        <result property="orderCode"    column="order_code"    />
+        <result property="cartId"    column="cart_id"    />
+        <result property="goodsId"    column="goods_id"    />
+        <result property="productId"    column="product_id"    />
+        <result property="productAttrValueId"    column="product_attr_value_id"    />
+        <result property="jsonInfo"    column="json_info"    />
+        <result property="num"    column="num"    />
+        <result property="isAfterSales"    column="is_after_sales"    />
+        <result property="isPrescribe"    column="is_prescribe"    />
+        <result property="storeId"    column="store_id"    />
+        <result property="isGift"    column="is_gift"    />
+    </resultMap>
+
+    <sql id="selectLiveOrderItemVo">
+        select item_id, order_id, order_code, cart_id, goods_id, product_id, product_attr_value_id, json_info, num, is_after_sales, is_prescribe, store_id, is_gift from live_order_item
+    </sql>
+
+    <select id="selectLiveOrderItemList" parameterType="LiveOrderItem" resultMap="LiveOrderItemResult">
+        <include refid="selectLiveOrderItemVo"/>
+        <where>
+            <if test="orderId != null  and orderId != ''"> and order_id = #{orderId}</if>
+            <if test="orderCode != null  and orderCode != ''"> and order_code = #{orderCode}</if>
+            <if test="cartId != null  and cartId != ''"> and cart_id = #{cartId}</if>
+            <if test="goodsId != null "> and goods_id = #{goodsId}</if>
+            <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
+            <if test="productAttrValueId != null "> and product_attr_value_id = #{productAttrValueId}</if>
+            <if test="jsonInfo != null  and jsonInfo != ''"> and json_info = #{jsonInfo}</if>
+            <if test="num != null "> and num = #{num}</if>
+            <if test="isAfterSales != null "> and is_after_sales = #{isAfterSales}</if>
+            <if test="isPrescribe != null "> and is_prescribe = #{isPrescribe}</if>
+            <if test="storeId != null "> and store_id = #{storeId}</if>
+            <if test="isGift != null "> and is_gift = #{isGift}</if>
+        </where>
+    </select>
+
+    <select id="selectLiveOrderItemByItemId" parameterType="String" resultMap="LiveOrderItemResult">
+        <include refid="selectLiveOrderItemVo"/>
+        where item_id = #{itemId}
+    </select>
+
+    <insert id="insertLiveOrderItem" parameterType="LiveOrderItem" useGeneratedKeys="true" keyProperty="itemId">
+        insert into live_order_item
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderId != null and orderId != ''">order_id,</if>
+            <if test="orderCode != null">order_code,</if>
+            <if test="cartId != null and cartId != ''">cart_id,</if>
+            <if test="goodsId != null">goods_id,</if>
+            <if test="productId != null and productId != ''">product_id,</if>
+            <if test="productAttrValueId != null">product_attr_value_id,</if>
+            <if test="jsonInfo != null">json_info,</if>
+            <if test="num != null">num,</if>
+            <if test="isAfterSales != null">is_after_sales,</if>
+            <if test="isPrescribe != null">is_prescribe,</if>
+            <if test="storeId != null">store_id,</if>
+            <if test="isGift != null">is_gift,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderId != null and orderId != ''">#{orderId},</if>
+            <if test="orderCode != null">#{orderCode},</if>
+            <if test="cartId != null and cartId != ''">#{cartId},</if>
+            <if test="goodsId != null">#{goodsId},</if>
+            <if test="productId != null and productId != ''">#{productId},</if>
+            <if test="productAttrValueId != null">#{productAttrValueId},</if>
+            <if test="jsonInfo != null">#{jsonInfo},</if>
+            <if test="num != null">#{num},</if>
+            <if test="isAfterSales != null">#{isAfterSales},</if>
+            <if test="isPrescribe != null">#{isPrescribe},</if>
+            <if test="storeId != null">#{storeId},</if>
+            <if test="isGift != null">#{isGift},</if>
+         </trim>
+    </insert>
+
+    <update id="updateLiveOrderItem" parameterType="LiveOrderItem">
+        update live_order_item
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="orderId != null and orderId != ''">order_id = #{orderId},</if>
+            <if test="orderCode != null">order_code = #{orderCode},</if>
+            <if test="cartId != null and cartId != ''">cart_id = #{cartId},</if>
+            <if test="goodsId != null">goods_id = #{goodsId},</if>
+            <if test="productId != null and productId != ''">product_id = #{productId},</if>
+            <if test="productAttrValueId != null">product_attr_value_id = #{productAttrValueId},</if>
+            <if test="jsonInfo != null">json_info = #{jsonInfo},</if>
+            <if test="num != null">num = #{num},</if>
+            <if test="isAfterSales != null">is_after_sales = #{isAfterSales},</if>
+            <if test="isPrescribe != null">is_prescribe = #{isPrescribe},</if>
+            <if test="storeId != null">store_id = #{storeId},</if>
+            <if test="isGift != null">is_gift = #{isGift},</if>
+        </trim>
+        where item_id = #{itemId}
+    </update>
+
+    <delete id="deleteLiveOrderItemByItemId" parameterType="String">
+        delete from live_order_item where item_id = #{itemId}
+    </delete>
+
+    <delete id="deleteLiveOrderItemByItemIds" parameterType="String">
+        delete from live_order_item where item_id in
+        <foreach item="itemId" collection="array" open="(" separator="," close=")">
+            #{itemId}
+        </foreach>
+    </delete>
+</mapper>

+ 76 - 0
fs-service/src/main/resources/mapper/live/LiveOrderLogsMapper.xml

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fs.live.mapper.LiveOrderLogsMapper">
+
+    <resultMap type="LiveOrderLogs" id="LiveOrderLogsResult">
+        <result property="logsId"    column="logs_id"    />
+        <result property="orderId"    column="order_id"    />
+        <result property="changeType"    column="change_type"    />
+        <result property="changeMessage"    column="change_message"    />
+        <result property="changeTime"    column="change_time"    />
+        <result property="operator"    column="operator"    />
+    </resultMap>
+
+    <sql id="selectLiveOrderLogsVo">
+        select logs_id, order_id, change_type, change_message, change_time, operator from live_order_logs
+    </sql>
+
+    <select id="selectLiveOrderLogsList" parameterType="LiveOrderLogs" resultMap="LiveOrderLogsResult">
+        <include refid="selectLiveOrderLogsVo"/>
+        <where>
+            <if test="orderId != null  and orderId != ''"> and order_id = #{orderId}</if>
+            <if test="changeType != null  and changeType != ''"> and change_type = #{changeType}</if>
+            <if test="changeMessage != null  and changeMessage != ''"> and change_message = #{changeMessage}</if>
+            <if test="changeTime != null "> and change_time = #{changeTime}</if>
+            <if test="operator != null  and operator != ''"> and operator = #{operator}</if>
+        </where>
+    </select>
+
+    <select id="selectLiveOrderLogsByLogsId" parameterType="String" resultMap="LiveOrderLogsResult">
+        <include refid="selectLiveOrderLogsVo"/>
+        where logs_id = #{logsId}
+    </select>
+
+    <insert id="insertLiveOrderLogs" parameterType="LiveOrderLogs" useGeneratedKeys="true" keyProperty="logsId">
+        insert into live_order_logs
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderId != null and orderId != ''">order_id,</if>
+            <if test="changeType != null and changeType != ''">change_type,</if>
+            <if test="changeMessage != null and changeMessage != ''">change_message,</if>
+            <if test="changeTime != null">change_time,</if>
+            <if test="operator != null">operator,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderId != null and orderId != ''">#{orderId},</if>
+            <if test="changeType != null and changeType != ''">#{changeType},</if>
+            <if test="changeMessage != null and changeMessage != ''">#{changeMessage},</if>
+            <if test="changeTime != null">#{changeTime},</if>
+            <if test="operator != null">#{operator},</if>
+         </trim>
+    </insert>
+
+    <update id="updateLiveOrderLogs" parameterType="LiveOrderLogs">
+        update live_order_logs
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="orderId != null and orderId != ''">order_id = #{orderId},</if>
+            <if test="changeType != null and changeType != ''">change_type = #{changeType},</if>
+            <if test="changeMessage != null and changeMessage != ''">change_message = #{changeMessage},</if>
+            <if test="changeTime != null">change_time = #{changeTime},</if>
+            <if test="operator != null">operator = #{operator},</if>
+        </trim>
+        where logs_id = #{logsId}
+    </update>
+
+    <delete id="deleteLiveOrderLogsByLogsId" parameterType="String">
+        delete from live_order_logs where logs_id = #{logsId}
+    </delete>
+
+    <delete id="deleteLiveOrderLogsByLogsIds" parameterType="String">
+        delete from live_order_logs where logs_id in
+        <foreach item="logsId" collection="array" open="(" separator="," close=")">
+            #{logsId}
+        </foreach>
+    </delete>
+</mapper>

+ 378 - 0
fs-service/src/main/resources/mapper/live/LiveOrderMapper.xml

@@ -0,0 +1,378 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fs.live.mapper.LiveOrderMapper">
+
+    <resultMap type="LiveOrder" id="LiveOrderResult">
+        <result property="orderId"    column="order_id"    />
+        <result property="liveId"    column="live_id"    />
+        <result property="storeId"    column="store_id"    />
+        <result property="orderCode"    column="order_code"    />
+        <result property="userId"    column="user_id"    />
+        <result property="userName"    column="user_name"    />
+        <result property="userPhone"    column="user_phone"    />
+        <result property="userAddress"    column="user_address"    />
+        <result property="cartId"    column="cart_id"    />
+        <result property="totalNum"    column="total_num"    />
+        <result property="totalPrice"    column="total_price"    />
+        <result property="payPrice"    column="pay_price"    />
+        <result property="payMoney"    column="pay_money"    />
+        <result property="isPay"    column="is_pay"    />
+        <result property="payTime"    column="pay_time"    />
+        <result property="payType"    column="pay_type"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="status"    column="status"    />
+        <result property="refundStatus"    column="refund_status"    />
+        <result property="refundImg"    column="refund_img"    />
+        <result property="refundExplain"    column="refund_explain"    />
+        <result property="refundTime"    column="refund_time"    />
+        <result property="refundReason"    column="refund_reason"    />
+        <result property="refundMoney"    column="refund_money"    />
+        <result property="deliveryCode"    column="delivery_code"    />
+        <result property="deliveryName"    column="delivery_name"    />
+        <result property="deliverySn"    column="delivery_sn"    />
+        <result property="remark"    column="remark"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="costPrice"    column="cost_price"    />
+        <result property="verifyCode"    column="verify_code"    />
+        <result property="shippingType"    column="shipping_type"    />
+        <result property="isChannel"    column="is_channel"    />
+        <result property="finishTime"    column="finish_time"    />
+        <result property="deliveryTime"    column="delivery_time"    />
+        <result property="tuiMoney"    column="tui_money"    />
+        <result property="tuiMoneyStatus"    column="tui_money_status"    />
+        <result property="tuiUserId"    column="tui_user_id"    />
+        <result property="itemJson"    column="item_json"    />
+        <result property="discountMoney"    column="discount_money"    />
+        <result property="userCouponId"    column="user_coupon_id"    />
+        <result property="companyId"    column="company_id"    />
+        <result property="companyUserId"    column="company_user_id"    />
+        <result property="storeHouseCode"    column="store_house_code"    />
+        <result property="extendOrderId"    column="extend_order_id"    />
+        <result property="payDelivery"    column="pay_delivery"    />
+        <result property="payRemain"    column="pay_remain"    />
+        <result property="deliveryStatus"    column="delivery_status"    />
+        <result property="deliveryPayStatus"    column="delivery_pay_status"    />
+        <result property="deliveryPayTime"    column="delivery_pay_time"    />
+        <result property="deliveryType"    column="delivery_type"    />
+        <result property="deliveryPayMoney"    column="delivery_pay_money"    />
+        <result property="deliveryImportTime"    column="delivery_import_time"    />
+        <result property="deliverySendTime"    column="delivery_send_time"    />
+        <result property="isAfterSales"    column="is_after_sales"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="channel"    column="channel"    />
+        <result property="source"    column="source"    />
+        <result property="billPrice"    column="bill_price"    />
+        <result property="totalPostage"    column="total_postage"    />
+        <result property="payPostage"    column="pay_postage"    />
+        <result property="gainIntegral"    column="gain_integral"    />
+        <result property="useIntegral"    column="use_integral"    />
+        <result property="payIntegral"    column="pay_integral"    />
+        <result property="backIntegral"    column="back_integral"    />
+        <result property="isEditMoney"    column="is_edit_money"    />
+    </resultMap>
+
+    <sql id="selectLiveOrderVo">
+        select order_id, live_id, store_id, order_code, user_id, user_name, user_phone, user_address, cart_id, total_num, total_price, pay_price, pay_money, is_pay, pay_time, pay_type, create_time, update_time, status, refund_status, refund_img, refund_explain, refund_time, refund_reason, refund_money, delivery_code, delivery_name, delivery_sn, remark, is_del, cost_price, verify_code, shipping_type, is_channel, finish_time, delivery_time, tui_money, tui_money_status, tui_user_id, item_json, discount_money, user_coupon_id, company_id, company_user_id, store_house_code, extend_order_id, pay_delivery, pay_remain, delivery_status, delivery_pay_status, delivery_pay_time, delivery_type, delivery_pay_money, delivery_import_time, delivery_send_time, is_after_sales, dept_id, channel, source, bill_price, total_postage, pay_postage, gain_integral, use_integral, pay_integral, back_integral, is_edit_money from live_order
+    </sql>
+
+    <select id="selectLiveOrderList" parameterType="LiveOrder" resultMap="LiveOrderResult">
+        <include refid="selectLiveOrderVo"/>
+        <where>
+            <if test="liveId != null "> and live_id = #{liveId}</if>
+            <if test="storeId != null "> and store_id = #{storeId}</if>
+            <if test="orderCode != null  and orderCode != ''"> and order_code = #{orderCode}</if>
+            <if test="userId != null  and userId != ''"> and user_id = #{userId}</if>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+            <if test="userPhone != null  and userPhone != ''"> and user_phone = #{userPhone}</if>
+            <if test="userAddress != null  and userAddress != ''"> and user_address = #{userAddress}</if>
+            <if test="cartId != null  and cartId != ''"> and cart_id = #{cartId}</if>
+            <if test="totalNum != null  and totalNum != ''"> and total_num = #{totalNum}</if>
+            <if test="totalPrice != null "> and total_price = #{totalPrice}</if>
+            <if test="payPrice != null "> and pay_price = #{payPrice}</if>
+            <if test="payMoney != null "> and pay_money = #{payMoney}</if>
+            <if test="isPay != null  and isPay != ''"> and is_pay = #{isPay}</if>
+            <if test="payTime != null "> and pay_time = #{payTime}</if>
+            <if test="payType != null  and payType != ''"> and pay_type = #{payType}</if>
+            <if test="status != null "> and status = #{status}</if>
+            <if test="refundStatus != null  and refundStatus != ''"> and refund_status = #{refundStatus}</if>
+            <if test="refundImg != null  and refundImg != ''"> and refund_img = #{refundImg}</if>
+            <if test="refundExplain != null  and refundExplain != ''"> and refund_explain = #{refundExplain}</if>
+            <if test="refundTime != null "> and refund_time = #{refundTime}</if>
+            <if test="refundReason != null  and refundReason != ''"> and refund_reason = #{refundReason}</if>
+            <if test="refundMoney != null "> and refund_money = #{refundMoney}</if>
+            <if test="deliveryCode != null  and deliveryCode != ''"> and delivery_code = #{deliveryCode}</if>
+            <if test="deliveryName != null  and deliveryName != ''"> and delivery_name like concat('%', #{deliveryName}, '%')</if>
+            <if test="deliverySn != null  and deliverySn != ''"> and delivery_sn = #{deliverySn}</if>
+            <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
+            <if test="costPrice != null "> and cost_price = #{costPrice}</if>
+            <if test="verifyCode != null  and verifyCode != ''"> and verify_code = #{verifyCode}</if>
+            <if test="shippingType != null "> and shipping_type = #{shippingType}</if>
+            <if test="isChannel != null  and isChannel != ''"> and is_channel = #{isChannel}</if>
+            <if test="finishTime != null "> and finish_time = #{finishTime}</if>
+            <if test="deliveryTime != null  and deliveryTime != ''"> and delivery_time = #{deliveryTime}</if>
+            <if test="tuiMoney != null "> and tui_money = #{tuiMoney}</if>
+            <if test="tuiMoneyStatus != null "> and tui_money_status = #{tuiMoneyStatus}</if>
+            <if test="tuiUserId != null "> and tui_user_id = #{tuiUserId}</if>
+            <if test="itemJson != null  and itemJson != ''"> and item_json = #{itemJson}</if>
+            <if test="discountMoney != null "> and discount_money = #{discountMoney}</if>
+            <if test="userCouponId != null "> and user_coupon_id = #{userCouponId}</if>
+            <if test="companyId != null "> and company_id = #{companyId}</if>
+            <if test="companyUserId != null "> and company_user_id = #{companyUserId}</if>
+            <if test="storeHouseCode != null  and storeHouseCode != ''"> and store_house_code = #{storeHouseCode}</if>
+            <if test="extendOrderId != null  and extendOrderId != ''"> and extend_order_id = #{extendOrderId}</if>
+            <if test="payDelivery != null "> and pay_delivery = #{payDelivery}</if>
+            <if test="payRemain != null "> and pay_remain = #{payRemain}</if>
+            <if test="deliveryStatus != null "> and delivery_status = #{deliveryStatus}</if>
+            <if test="deliveryPayStatus != null "> and delivery_pay_status = #{deliveryPayStatus}</if>
+            <if test="deliveryPayTime != null  and deliveryPayTime != ''"> and delivery_pay_time = #{deliveryPayTime}</if>
+            <if test="deliveryType != null  and deliveryType != ''"> and delivery_type = #{deliveryType}</if>
+            <if test="deliveryPayMoney != null "> and delivery_pay_money = #{deliveryPayMoney}</if>
+            <if test="deliveryImportTime != null "> and delivery_import_time = #{deliveryImportTime}</if>
+            <if test="deliverySendTime != null "> and delivery_send_time = #{deliverySendTime}</if>
+            <if test="isAfterSales != null "> and is_after_sales = #{isAfterSales}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="channel != null  and channel != ''"> and channel = #{channel}</if>
+            <if test="source != null "> and source = #{source}</if>
+            <if test="billPrice != null "> and bill_price = #{billPrice}</if>
+            <if test="totalPostage != null "> and total_postage = #{totalPostage}</if>
+            <if test="payPostage != null "> and pay_postage = #{payPostage}</if>
+            <if test="gainIntegral != null "> and gain_integral = #{gainIntegral}</if>
+            <if test="useIntegral != null "> and use_integral = #{useIntegral}</if>
+            <if test="payIntegral != null "> and pay_integral = #{payIntegral}</if>
+            <if test="backIntegral != null "> and back_integral = #{backIntegral}</if>
+            <if test="isEditMoney != null "> and is_edit_money = #{isEditMoney}</if>
+        </where>
+    </select>
+
+    <select id="selectLiveOrderByOrderId" parameterType="String" resultMap="LiveOrderResult">
+        <include refid="selectLiveOrderVo"/>
+        where order_id = #{orderId}
+    </select>
+
+    <insert id="insertLiveOrder" parameterType="LiveOrder" useGeneratedKeys="true" keyProperty="orderId">
+        insert into live_order
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="liveId != null">live_id,</if>
+            <if test="storeId != null">store_id,</if>
+            <if test="orderCode != null and orderCode != ''">order_code,</if>
+            <if test="userId != null and userId != ''">user_id,</if>
+            <if test="userName != null">user_name,</if>
+            <if test="userPhone != null">user_phone,</if>
+            <if test="userAddress != null">user_address,</if>
+            <if test="cartId != null">cart_id,</if>
+            <if test="totalNum != null and totalNum != ''">total_num,</if>
+            <if test="totalPrice != null">total_price,</if>
+            <if test="payPrice != null">pay_price,</if>
+            <if test="payMoney != null">pay_money,</if>
+            <if test="isPay != null">is_pay,</if>
+            <if test="payTime != null">pay_time,</if>
+            <if test="payType != null">pay_type,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="status != null">status,</if>
+            <if test="refundStatus != null">refund_status,</if>
+            <if test="refundImg != null">refund_img,</if>
+            <if test="refundExplain != null">refund_explain,</if>
+            <if test="refundTime != null">refund_time,</if>
+            <if test="refundReason != null">refund_reason,</if>
+            <if test="refundMoney != null">refund_money,</if>
+            <if test="deliveryCode != null">delivery_code,</if>
+            <if test="deliveryName != null">delivery_name,</if>
+            <if test="deliverySn != null">delivery_sn,</if>
+            <if test="remark != null">remark,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="costPrice != null">cost_price,</if>
+            <if test="verifyCode != null">verify_code,</if>
+            <if test="shippingType != null">shipping_type,</if>
+            <if test="isChannel != null">is_channel,</if>
+            <if test="finishTime != null">finish_time,</if>
+            <if test="deliveryTime != null">delivery_time,</if>
+            <if test="tuiMoney != null">tui_money,</if>
+            <if test="tuiMoneyStatus != null">tui_money_status,</if>
+            <if test="tuiUserId != null">tui_user_id,</if>
+            <if test="itemJson != null">item_json,</if>
+            <if test="discountMoney != null">discount_money,</if>
+            <if test="userCouponId != null">user_coupon_id,</if>
+            <if test="companyId != null">company_id,</if>
+            <if test="companyUserId != null">company_user_id,</if>
+            <if test="storeHouseCode != null">store_house_code,</if>
+            <if test="extendOrderId != null">extend_order_id,</if>
+            <if test="payDelivery != null">pay_delivery,</if>
+            <if test="payRemain != null">pay_remain,</if>
+            <if test="deliveryStatus != null">delivery_status,</if>
+            <if test="deliveryPayStatus != null">delivery_pay_status,</if>
+            <if test="deliveryPayTime != null">delivery_pay_time,</if>
+            <if test="deliveryType != null">delivery_type,</if>
+            <if test="deliveryPayMoney != null">delivery_pay_money,</if>
+            <if test="deliveryImportTime != null">delivery_import_time,</if>
+            <if test="deliverySendTime != null">delivery_send_time,</if>
+            <if test="isAfterSales != null">is_after_sales,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="channel != null">channel,</if>
+            <if test="source != null">source,</if>
+            <if test="billPrice != null">bill_price,</if>
+            <if test="totalPostage != null">total_postage,</if>
+            <if test="payPostage != null">pay_postage,</if>
+            <if test="gainIntegral != null">gain_integral,</if>
+            <if test="useIntegral != null">use_integral,</if>
+            <if test="payIntegral != null">pay_integral,</if>
+            <if test="backIntegral != null">back_integral,</if>
+            <if test="isEditMoney != null">is_edit_money,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="liveId != null">#{liveId},</if>
+            <if test="storeId != null">#{storeId},</if>
+            <if test="orderCode != null and orderCode != ''">#{orderCode},</if>
+            <if test="userId != null and userId != ''">#{userId},</if>
+            <if test="userName != null">#{userName},</if>
+            <if test="userPhone != null">#{userPhone},</if>
+            <if test="userAddress != null">#{userAddress},</if>
+            <if test="cartId != null">#{cartId},</if>
+            <if test="totalNum != null and totalNum != ''">#{totalNum},</if>
+            <if test="totalPrice != null">#{totalPrice},</if>
+            <if test="payPrice != null">#{payPrice},</if>
+            <if test="payMoney != null">#{payMoney},</if>
+            <if test="isPay != null">#{isPay},</if>
+            <if test="payTime != null">#{payTime},</if>
+            <if test="payType != null">#{payType},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="status != null">#{status},</if>
+            <if test="refundStatus != null">#{refundStatus},</if>
+            <if test="refundImg != null">#{refundImg},</if>
+            <if test="refundExplain != null">#{refundExplain},</if>
+            <if test="refundTime != null">#{refundTime},</if>
+            <if test="refundReason != null">#{refundReason},</if>
+            <if test="refundMoney != null">#{refundMoney},</if>
+            <if test="deliveryCode != null">#{deliveryCode},</if>
+            <if test="deliveryName != null">#{deliveryName},</if>
+            <if test="deliverySn != null">#{deliverySn},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="costPrice != null">#{costPrice},</if>
+            <if test="verifyCode != null">#{verifyCode},</if>
+            <if test="shippingType != null">#{shippingType},</if>
+            <if test="isChannel != null">#{isChannel},</if>
+            <if test="finishTime != null">#{finishTime},</if>
+            <if test="deliveryTime != null">#{deliveryTime},</if>
+            <if test="tuiMoney != null">#{tuiMoney},</if>
+            <if test="tuiMoneyStatus != null">#{tuiMoneyStatus},</if>
+            <if test="tuiUserId != null">#{tuiUserId},</if>
+            <if test="itemJson != null">#{itemJson},</if>
+            <if test="discountMoney != null">#{discountMoney},</if>
+            <if test="userCouponId != null">#{userCouponId},</if>
+            <if test="companyId != null">#{companyId},</if>
+            <if test="companyUserId != null">#{companyUserId},</if>
+            <if test="storeHouseCode != null">#{storeHouseCode},</if>
+            <if test="extendOrderId != null">#{extendOrderId},</if>
+            <if test="payDelivery != null">#{payDelivery},</if>
+            <if test="payRemain != null">#{payRemain},</if>
+            <if test="deliveryStatus != null">#{deliveryStatus},</if>
+            <if test="deliveryPayStatus != null">#{deliveryPayStatus},</if>
+            <if test="deliveryPayTime != null">#{deliveryPayTime},</if>
+            <if test="deliveryType != null">#{deliveryType},</if>
+            <if test="deliveryPayMoney != null">#{deliveryPayMoney},</if>
+            <if test="deliveryImportTime != null">#{deliveryImportTime},</if>
+            <if test="deliverySendTime != null">#{deliverySendTime},</if>
+            <if test="isAfterSales != null">#{isAfterSales},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="channel != null">#{channel},</if>
+            <if test="source != null">#{source},</if>
+            <if test="billPrice != null">#{billPrice},</if>
+            <if test="totalPostage != null">#{totalPostage},</if>
+            <if test="payPostage != null">#{payPostage},</if>
+            <if test="gainIntegral != null">#{gainIntegral},</if>
+            <if test="useIntegral != null">#{useIntegral},</if>
+            <if test="payIntegral != null">#{payIntegral},</if>
+            <if test="backIntegral != null">#{backIntegral},</if>
+            <if test="isEditMoney != null">#{isEditMoney},</if>
+         </trim>
+    </insert>
+
+    <update id="updateLiveOrder" parameterType="LiveOrder">
+        update live_order
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="liveId != null">live_id = #{liveId},</if>
+            <if test="storeId != null">store_id = #{storeId},</if>
+            <if test="orderCode != null and orderCode != ''">order_code = #{orderCode},</if>
+            <if test="userId != null and userId != ''">user_id = #{userId},</if>
+            <if test="userName != null">user_name = #{userName},</if>
+            <if test="userPhone != null">user_phone = #{userPhone},</if>
+            <if test="userAddress != null">user_address = #{userAddress},</if>
+            <if test="cartId != null">cart_id = #{cartId},</if>
+            <if test="totalNum != null and totalNum != ''">total_num = #{totalNum},</if>
+            <if test="totalPrice != null">total_price = #{totalPrice},</if>
+            <if test="payPrice != null">pay_price = #{payPrice},</if>
+            <if test="payMoney != null">pay_money = #{payMoney},</if>
+            <if test="isPay != null">is_pay = #{isPay},</if>
+            <if test="payTime != null">pay_time = #{payTime},</if>
+            <if test="payType != null">pay_type = #{payType},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="refundStatus != null">refund_status = #{refundStatus},</if>
+            <if test="refundImg != null">refund_img = #{refundImg},</if>
+            <if test="refundExplain != null">refund_explain = #{refundExplain},</if>
+            <if test="refundTime != null">refund_time = #{refundTime},</if>
+            <if test="refundReason != null">refund_reason = #{refundReason},</if>
+            <if test="refundMoney != null">refund_money = #{refundMoney},</if>
+            <if test="deliveryCode != null">delivery_code = #{deliveryCode},</if>
+            <if test="deliveryName != null">delivery_name = #{deliveryName},</if>
+            <if test="deliverySn != null">delivery_sn = #{deliverySn},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="costPrice != null">cost_price = #{costPrice},</if>
+            <if test="verifyCode != null">verify_code = #{verifyCode},</if>
+            <if test="shippingType != null">shipping_type = #{shippingType},</if>
+            <if test="isChannel != null">is_channel = #{isChannel},</if>
+            <if test="finishTime != null">finish_time = #{finishTime},</if>
+            <if test="deliveryTime != null">delivery_time = #{deliveryTime},</if>
+            <if test="tuiMoney != null">tui_money = #{tuiMoney},</if>
+            <if test="tuiMoneyStatus != null">tui_money_status = #{tuiMoneyStatus},</if>
+            <if test="tuiUserId != null">tui_user_id = #{tuiUserId},</if>
+            <if test="itemJson != null">item_json = #{itemJson},</if>
+            <if test="discountMoney != null">discount_money = #{discountMoney},</if>
+            <if test="userCouponId != null">user_coupon_id = #{userCouponId},</if>
+            <if test="companyId != null">company_id = #{companyId},</if>
+            <if test="companyUserId != null">company_user_id = #{companyUserId},</if>
+            <if test="storeHouseCode != null">store_house_code = #{storeHouseCode},</if>
+            <if test="extendOrderId != null">extend_order_id = #{extendOrderId},</if>
+            <if test="payDelivery != null">pay_delivery = #{payDelivery},</if>
+            <if test="payRemain != null">pay_remain = #{payRemain},</if>
+            <if test="deliveryStatus != null">delivery_status = #{deliveryStatus},</if>
+            <if test="deliveryPayStatus != null">delivery_pay_status = #{deliveryPayStatus},</if>
+            <if test="deliveryPayTime != null">delivery_pay_time = #{deliveryPayTime},</if>
+            <if test="deliveryType != null">delivery_type = #{deliveryType},</if>
+            <if test="deliveryPayMoney != null">delivery_pay_money = #{deliveryPayMoney},</if>
+            <if test="deliveryImportTime != null">delivery_import_time = #{deliveryImportTime},</if>
+            <if test="deliverySendTime != null">delivery_send_time = #{deliverySendTime},</if>
+            <if test="isAfterSales != null">is_after_sales = #{isAfterSales},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="channel != null">channel = #{channel},</if>
+            <if test="source != null">source = #{source},</if>
+            <if test="billPrice != null">bill_price = #{billPrice},</if>
+            <if test="totalPostage != null">total_postage = #{totalPostage},</if>
+            <if test="payPostage != null">pay_postage = #{payPostage},</if>
+            <if test="gainIntegral != null">gain_integral = #{gainIntegral},</if>
+            <if test="useIntegral != null">use_integral = #{useIntegral},</if>
+            <if test="payIntegral != null">pay_integral = #{payIntegral},</if>
+            <if test="backIntegral != null">back_integral = #{backIntegral},</if>
+            <if test="isEditMoney != null">is_edit_money = #{isEditMoney},</if>
+        </trim>
+        where order_id = #{orderId}
+    </update>
+
+    <delete id="deleteLiveOrderByOrderId" parameterType="String">
+        delete from live_order where order_id = #{orderId}
+    </delete>
+
+    <delete id="deleteLiveOrderByOrderIds" parameterType="String">
+        delete from live_order where order_id in
+        <foreach item="orderId" collection="array" open="(" separator="," close=")">
+            #{orderId}
+        </foreach>
+    </delete>
+</mapper>

+ 71 - 0
fs-service/src/main/resources/mapper/live/LiveOrderStatusMapper.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fs.live.mapper.LiveOrderStatusMapper">
+
+    <resultMap type="LiveOrderStatus" id="LiveOrderStatusResult">
+        <result property="id"    column="id"    />
+        <result property="orderId"    column="order_id"    />
+        <result property="changeType"    column="change_type"    />
+        <result property="changeMessage"    column="change_message"    />
+        <result property="changeTime"    column="change_time"    />
+    </resultMap>
+
+    <sql id="selectLiveOrderStatusVo">
+        select id, order_id, change_type, change_message, change_time from live_order_status
+    </sql>
+
+    <select id="selectLiveOrderStatusList" parameterType="LiveOrderStatus" resultMap="LiveOrderStatusResult">
+        <include refid="selectLiveOrderStatusVo"/>
+        <where>
+            <if test="orderId != null  and orderId != ''"> and order_id = #{orderId}</if>
+            <if test="changeType != null  and changeType != ''"> and change_type = #{changeType}</if>
+            <if test="changeMessage != null  and changeMessage != ''"> and change_message = #{changeMessage}</if>
+            <if test="changeTime != null "> and change_time = #{changeTime}</if>
+        </where>
+    </select>
+
+    <select id="selectLiveOrderStatusById" parameterType="String" resultMap="LiveOrderStatusResult">
+        <include refid="selectLiveOrderStatusVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertLiveOrderStatus" parameterType="LiveOrderStatus" useGeneratedKeys="true" keyProperty="id">
+        insert into live_order_status
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderId != null and orderId != ''">order_id,</if>
+            <if test="changeType != null and changeType != ''">change_type,</if>
+            <if test="changeMessage != null and changeMessage != ''">change_message,</if>
+            <if test="changeTime != null">change_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderId != null and orderId != ''">#{orderId},</if>
+            <if test="changeType != null and changeType != ''">#{changeType},</if>
+            <if test="changeMessage != null and changeMessage != ''">#{changeMessage},</if>
+            <if test="changeTime != null">#{changeTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateLiveOrderStatus" parameterType="LiveOrderStatus">
+        update live_order_status
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="orderId != null and orderId != ''">order_id = #{orderId},</if>
+            <if test="changeType != null and changeType != ''">change_type = #{changeType},</if>
+            <if test="changeMessage != null and changeMessage != ''">change_message = #{changeMessage},</if>
+            <if test="changeTime != null">change_time = #{changeTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteLiveOrderStatusById" parameterType="String">
+        delete from live_order_status where id = #{id}
+    </delete>
+
+    <delete id="deleteLiveOrderStatusByIds" parameterType="String">
+        delete from live_order_status where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>