Browse Source

商城接口

lixueqiang 2 years ago
parent
commit
8c44ea779f
100 changed files with 5413 additions and 0 deletions
  1. 32 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/machine/MachineMachineBindListDTO.java
  2. 32 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/machine/MachineMachineStoreListDTO.java
  3. 39 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/machine/MachineMachineTransferDTO.java
  4. 32 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/machine/MachineMachineTransferListDTO.java
  5. 32 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/machine/MachineMachineUnBindListDTO.java
  6. 32 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/machine/MachineMachineUserListDTO.java
  7. 39 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/machine/MachineSearchStoreMachineDTO.java
  8. 32 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/machine/MachineSearchUserMachineDTO.java
  9. 32 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/machine/MachineToMerchantMakerDTO.java
  10. 34 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/machine/MachineUpdatePledgeDTO.java
  11. 34 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/merchant/MerchantMachineRatioDTO.java
  12. 60 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/merchant/MerchantMerchantListDTO.java
  13. 49 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/shop/GoodsSubmitDTO.java
  14. 39 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/ticket/TicketTicketTransferDTO.java
  15. 109 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsBrand.java
  16. 213 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsMachine.java
  17. 129 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsMachinePledge.java
  18. 129 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsMachineRatio.java
  19. 115 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsMachineTrack.java
  20. 115 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsMachineTransfer.java
  21. 164 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsMerchant.java
  22. 122 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsShopCate.java
  23. 157 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsShopGoods.java
  24. 94 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsShopGoodsPic.java
  25. 129 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsShopGoodsSku.java
  26. 101 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsShopGoodsSpec.java
  27. 213 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsShopOrder.java
  28. 129 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsShopOrderInfo.java
  29. 115 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsTicket.java
  30. 108 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsTicketTransfer.java
  31. 73 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/brand/BrandListVO.java
  32. 59 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/machine/MachineApplyRemarkVO.java
  33. 60 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/machine/MachineMachineBindListVO.java
  34. 45 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/machine/MachineMachineStoreListVO.java
  35. 66 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/machine/MachineMachineTransferListVO.java
  36. 60 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/machine/MachineMachineUnBindListVO.java
  37. 74 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/machine/MachineMachineUserListVO.java
  38. 45 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/machine/MachineRecycleListVO.java
  39. 45 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/machine/MachineRecycleMachinesVO.java
  40. 45 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/machine/MachineSearchStoreMachineVO.java
  41. 45 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/machine/MachineSearchUserMachineVO.java
  42. 123 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/merchant/MerchantMerchantDetailVO.java
  43. 52 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/merchant/MerchantMerchantListVO.java
  44. 66 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/merchant/MerchantMerchantTotalVO.java
  45. 65 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/shop/OrderInfoListVO.java
  46. 52 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/shop/ShopCategoriesVO.java
  47. 108 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/shop/ShopGoodsDetailVO.java
  48. 60 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/shop/ShopGoodsListVO.java
  49. 69 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/shop/ShopGoodsSkuVO.java
  50. 48 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/shop/ShopGoodsSpecVO.java
  51. 158 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/shop/ShopOrderDetailVO.java
  52. 59 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/ticket/TicketListVO.java
  53. 94 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/ticket/TicketTicketTransferDetailVO.java
  54. 66 0
      kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/ticket/TicketTicketTransferListVO.java
  55. 20 0
      kxs-product/kxs-product-biz/pom.xml
  56. 24 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/KxsProductApplication.java
  57. 13 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/constant/ProductConstants.java
  58. 43 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/constant/enums/KxsShopEnum.java
  59. 25 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/constant/enums/ProductErrorTypeEnum.java
  60. 54 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/BrandController.java
  61. 138 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/ShopController.java
  62. 22 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsBrandMapper.java
  63. 17 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsMachineMapper.java
  64. 17 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsMachinePledgeMapper.java
  65. 17 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsMachineRatioMapper.java
  66. 17 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsMachineTrackMapper.java
  67. 17 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsMachineTransferMapper.java
  68. 17 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsMerchantMapper.java
  69. 21 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsShopCateMapper.java
  70. 29 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsShopGoodsMapper.java
  71. 17 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsShopGoodsPicMapper.java
  72. 27 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsShopGoodsSkuMapper.java
  73. 27 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsShopGoodsSpecMapper.java
  74. 17 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsShopOrderInfoMapper.java
  75. 17 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsShopOrderMapper.java
  76. 17 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsTicketMapper.java
  77. 17 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsTicketTransferMapper.java
  78. 32 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsBrandService.java
  79. 15 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsMachinePledgeService.java
  80. 15 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsMachineRatioService.java
  81. 15 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsMachineService.java
  82. 15 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsMachineTrackService.java
  83. 15 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsMachineTransferService.java
  84. 15 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsMerchantService.java
  85. 19 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsShopCateService.java
  86. 15 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsShopGoodsPicService.java
  87. 35 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsShopGoodsService.java
  88. 15 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsShopGoodsSkuService.java
  89. 15 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsShopGoodsSpecService.java
  90. 15 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsShopOrderInfoService.java
  91. 57 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsShopOrderService.java
  92. 15 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsTicketService.java
  93. 15 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsTicketTransferService.java
  94. 49 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsBrandServiceImpl.java
  95. 19 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsMachinePledgeServiceImpl.java
  96. 19 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsMachineRatioServiceImpl.java
  97. 19 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsMachineServiceImpl.java
  98. 19 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsMachineTrackServiceImpl.java
  99. 19 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsMachineTransferServiceImpl.java
  100. 19 0
      kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsMerchantServiceImpl.java

+ 32 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/machine/MachineMachineBindListDTO.java

@@ -0,0 +1,32 @@
+package com.kxs.product.api.dto.kxsapp.machine;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+/**
+ * 已绑定列表-dto
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:38
+ */
+@Data
+public class MachineMachineBindListDTO {
+
+    /**
+     * 品牌ID
+     */
+    @Schema(description = "品牌ID")
+    private Integer brandId;
+
+
+    /**
+     * 搜索关键字
+     */
+    @Schema(description = "搜索关键字")
+    private Object keyword;
+
+
+
+
+}

+ 32 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/machine/MachineMachineStoreListDTO.java

@@ -0,0 +1,32 @@
+package com.kxs.product.api.dto.kxsapp.machine;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+/**
+ * 仓库库存机具列表-dto
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:39
+ */
+@Data
+public class MachineMachineStoreListDTO {
+
+    /**
+     * 仓库ID
+     */
+    @Schema(description = "仓库ID")
+    private Integer warehouseId;
+
+
+    /**
+     * 品牌ID
+     */
+    @Schema(description = "品牌ID")
+    private Integer brandId;
+
+
+
+
+}

+ 39 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/machine/MachineMachineTransferDTO.java

@@ -0,0 +1,39 @@
+package com.kxs.product.api.dto.kxsapp.machine;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+/**
+ * 机具未绑定划拨-dto
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:38
+ */
+@Data
+public class MachineMachineTransferDTO {
+
+    /**
+     * 品牌ID
+     */
+    @Schema(description = "品牌ID")
+    private Integer brandId;
+
+
+    /**
+     * 机具ID集合
+     */
+    @Schema(description = "机具ID集合")
+    private Object snList;
+
+
+    /**
+     * 划拨创客编号
+     */
+    @Schema(description = "划拨创客编号")
+    private Object userCode;
+
+
+
+
+}

+ 32 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/machine/MachineMachineTransferListDTO.java

@@ -0,0 +1,32 @@
+package com.kxs.product.api.dto.kxsapp.machine;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+/**
+ * 机具-未绑定划拨记录-dto
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:38
+ */
+@Data
+public class MachineMachineTransferListDTO {
+
+    /**
+     * 品牌ID
+     */
+    @Schema(description = "品牌ID")
+    private Integer brandId;
+
+
+    /**
+     * 搜索关键字
+     */
+    @Schema(description = "搜索关键字")
+    private Object keyword;
+
+
+
+
+}

+ 32 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/machine/MachineMachineUnBindListDTO.java

@@ -0,0 +1,32 @@
+package com.kxs.product.api.dto.kxsapp.machine;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+/**
+ * 未绑定机具列表-dto
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:37
+ */
+@Data
+public class MachineMachineUnBindListDTO {
+
+    /**
+     * 品牌ID
+     */
+    @Schema(description = "品牌ID")
+    private Integer brandId;
+
+
+    /**
+     * 搜索关键字
+     */
+    @Schema(description = "搜索关键字")
+    private Object keyword;
+
+
+
+
+}

+ 32 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/machine/MachineMachineUserListDTO.java

@@ -0,0 +1,32 @@
+package com.kxs.product.api.dto.kxsapp.machine;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+/**
+ * 全部机具-dto
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:38
+ */
+@Data
+public class MachineMachineUserListDTO {
+
+    /**
+     * 品牌ID
+     */
+    @Schema(description = "品牌ID")
+    private Integer brandId;
+
+
+    /**
+     * 搜索关键字
+     */
+    @Schema(description = "搜索关键字")
+    private Object keyword;
+
+
+
+
+}

+ 39 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/machine/MachineSearchStoreMachineDTO.java

@@ -0,0 +1,39 @@
+package com.kxs.product.api.dto.kxsapp.machine;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+/**
+ * 机具搜索-dto
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:39
+ */
+@Data
+public class MachineSearchStoreMachineDTO {
+
+    /**
+     * 机具码
+     */
+    @Schema(description = "机具码")
+    private String posSn;
+
+
+    /**
+     * 仓库ID
+     */
+    @Schema(description = "仓库ID")
+    private Integer warehouseId;
+
+
+    /**
+     * 箱码
+     */
+    @Schema(description = "箱码")
+    private String boxSn;
+
+
+
+
+}

+ 32 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/machine/MachineSearchUserMachineDTO.java

@@ -0,0 +1,32 @@
+package com.kxs.product.api.dto.kxsapp.machine;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+/**
+ * 用户机具和箱具码搜索-dto
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:38
+ */
+@Data
+public class MachineSearchUserMachineDTO {
+
+    /**
+     * 机具码
+     */
+    @Schema(description = "机具码")
+    private String posSn;
+
+
+    /**
+     * 箱码
+     */
+    @Schema(description = "箱码")
+    private String boxSn;
+
+
+
+
+}

+ 32 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/machine/MachineToMerchantMakerDTO.java

@@ -0,0 +1,32 @@
+package com.kxs.product.api.dto.kxsapp.machine;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+/**
+ * 已绑定-转商户型创客-dto
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:38
+ */
+@Data
+public class MachineToMerchantMakerDTO {
+
+    /**
+     * 机具码
+     */
+    @Schema(description = "机具码")
+    private String posSn;
+
+
+    /**
+     * 创客编号
+     */
+    @Schema(description = "创客编号")
+    private Object userCode;
+
+
+
+
+}

+ 34 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/machine/MachineUpdatePledgeDTO.java

@@ -0,0 +1,34 @@
+package com.kxs.product.api.dto.kxsapp.machine;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 机具修改活动-dto
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:38
+ */
+@Data
+public class MachineUpdatePledgeDTO {
+
+    /**
+     * 机具押金
+     */
+    @Schema(description = "机具押金")
+    private BigDecimal cashPledge;
+
+
+    /**
+     * sn码集合
+     */
+    @Schema(description = "sn码集合")
+    private Object snList;
+
+
+
+
+}

+ 34 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/merchant/MerchantMachineRatioDTO.java

@@ -0,0 +1,34 @@
+package com.kxs.product.api.dto.kxsapp.merchant;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 费率调整-dto
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:38
+ */
+@Data
+public class MerchantMachineRatioDTO {
+
+    /**
+     * 机具费率
+     */
+    @Schema(description = "机具费率")
+    private BigDecimal machineRatio;
+
+
+    /**
+     * 商户ID
+     */
+    @Schema(description = "商户ID")
+    private Object merchantId;
+
+
+
+
+}

+ 60 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/merchant/MerchantMerchantListDTO.java

@@ -0,0 +1,60 @@
+package com.kxs.product.api.dto.kxsapp.merchant;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+/**
+ * 商户列表-dto
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:38
+ */
+@Data
+public class MerchantMerchantListDTO {
+
+    /**
+     * 品牌ID
+     */
+    @Schema(description = "品牌ID")
+    private Integer brandId;
+
+
+    /**
+     * 搜索关键字
+     */
+    @Schema(description = "搜索关键字")
+    private Object keyword;
+
+
+    /**
+     * 交易额排序amount:交易额排序 time:注册时间排序
+     */
+    @Schema(description = "交易额排序amount:交易额排序 time:注册时间排序")
+    private Object sort;
+
+
+    /**
+     * 金额区间 '-' 隔开
+     */
+    @Schema(description = "金额区间 '-' 隔开")
+    private Object amountSection;
+
+
+    /**
+     * 激活时间 '2023'
+     */
+    @Schema(description = "激活时间 '2023'")
+    private Object actTime;
+
+
+    /**
+     * 激活状态 0未激活 1已激活 全部不传
+     */
+    @Schema(description = "激活状态 0未激活 1已激活 全部不传")
+    private Object actStatus;
+
+
+
+
+}

+ 49 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/shop/GoodsSubmitDTO.java

@@ -0,0 +1,49 @@
+package com.kxs.product.api.dto.kxsapp.shop;
+
+import com.kxs.product.api.model.KxsShopOrder;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 订单提交
+ *
+ * @author Lxq
+ * @date 2023-12-20
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class GoodsSubmitDTO extends KxsShopOrder {
+
+    /**
+     * 商品id
+     */
+    @Schema(description = "商品ID")
+    @NotNull(message = "商品ID不能为空")
+    private Integer goodsId;
+
+    /**
+     * 订单数量
+     */
+    @Schema(description = "订单数量")
+    @NotNull(message = "订单数量不能为空")
+    private Integer number;
+
+    /**
+     * sku id
+     */
+    @Schema(description = "SKU ID")
+    @NotNull(message = "SKU ID不能为空")
+    private Integer skuId;
+
+    /**
+     * 规格参数
+     */
+    @Schema(description = "规格参数")
+    @NotNull(message = "规格参数不能为空")
+    private String specifications;
+
+
+
+}

+ 39 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/ticket/TicketTicketTransferDTO.java

@@ -0,0 +1,39 @@
+package com.kxs.product.api.dto.kxsapp.ticket;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+/**
+ * 兑换券划拨-dto
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:37
+ */
+@Data
+public class TicketTicketTransferDTO {
+
+    /**
+     * 券码类型 0电签 1大pos
+     */
+    @Schema(description = "券码类型 0电签 1大pos")
+    private Integer ticketType;
+
+
+    /**
+     * 兑换券集合
+     */
+    @Schema(description = "兑换券集合")
+    private Object ticketCodes;
+
+
+    /**
+     * 创客编号
+     */
+    @Schema(description = "创客编号")
+    private Object userCode;
+
+
+
+
+}

+ 109 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsBrand.java

@@ -0,0 +1,109 @@
+package com.kxs.product.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客小爽品牌表(KxsBrand)表实体类
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsBrand extends Model<KxsBrand> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记,0未删除,1已删除
+     */
+    @Schema(description = "删除标记,0未删除,1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 品牌名称
+     */
+    @Schema(description = "品牌名称")
+    private String name;
+
+
+    /**
+     * 跳转链接
+     */
+    @Schema(description = "跳转链接")
+    private String linkUrl;
+
+
+    /**
+     * 封面图片
+     */
+    @Schema(description = "封面图片")
+    private String cover;
+
+
+    /**
+     * 类型 0电签 1大pos
+     */
+    @Schema(description = "类型 0电签 1大pos")
+    private Integer brandType;
+
+
+    /**
+     * 排序
+     */
+    @Schema(description = "排序")
+    private Integer sort;
+
+
+
+
+}
+

+ 213 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsMachine.java

@@ -0,0 +1,213 @@
+package com.kxs.product.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客小爽机具表(KxsMachine)表实体类
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsMachine extends Model<KxsMachine> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记,0未删除,1已删除
+     */
+    @Schema(description = "删除标记,0未删除,1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 机具码
+     */
+    @Schema(description = "机具码")
+    private String posSn;
+
+
+    /**
+     * 仓库ID
+     */
+    @Schema(description = "仓库ID")
+    private Integer warehouseId;
+
+
+    /**
+     * 所属创客ID
+     */
+    @Schema(description = "所属创客ID")
+    private Integer userId;
+
+
+    /**
+     * 商户ID
+     */
+    @Schema(description = "商户ID")
+    private Integer merchantId;
+
+
+    /**
+     * 品牌ID
+     */
+    @Schema(description = "品牌ID")
+    private Integer brandId;
+
+
+    /**
+     * 循环状态 0不可循环 1可循环
+     */
+    @Schema(description = "循环状态 0不可循环 1可循环")
+    private Integer recycleStatus;
+
+
+    /**
+     * 循环结束时间
+     */
+    @Schema(description = "循环结束时间")
+    private LocalDateTime recycleEndTime;
+
+
+    /**
+     * 机具类型 0兑换机 1循环机
+     */
+    @Schema(description = "机具类型 0兑换机 1循环机")
+    private Integer machineType;
+
+
+    /**
+     * 机具押金
+     */
+    @Schema(description = "机具押金")
+    private BigDecimal cashPledge;
+
+
+    /**
+     * 机具轨迹路径
+     */
+    @Schema(description = "机具轨迹路径")
+    private String allotPath;
+
+
+    /**
+     * 绑定时间
+     */
+    @Schema(description = "绑定时间")
+    private LocalDateTime bindTime;
+
+
+    /**
+     * 激活时间
+     */
+    @Schema(description = "激活时间")
+    private LocalDateTime actTime;
+
+
+    /**
+     * 出库时间
+     */
+    @Schema(description = "出库时间")
+    private LocalDateTime deliveryTime;
+
+
+    /**
+     * 箱码
+     */
+    @Schema(description = "箱码")
+    private String boxSn;
+
+
+    /**
+     * 机具费率
+     */
+    @Schema(description = "机具费率")
+    private BigDecimal machineRatio;
+
+
+    /**
+     * 是否激活 0未激活 1已激活
+     */
+    @Schema(description = "是否激活 0未激活 1已激活")
+    private Integer isAct;
+
+
+    /**
+     * 绑定状态 0未绑定 1已绑定 2已解绑
+     */
+    @Schema(description = "绑定状态 0未绑定 1已绑定 2已解绑")
+    private Integer bindStatus;
+
+
+    /**
+     * 状态 0在库 1出库 2已退回 3可回收
+     */
+    @Schema(description = "状态 0在库 1出库 2已退回 3可回收")
+    private Integer status;
+
+
+    /**
+     * 是否首台 0否 1是
+     */
+    @Schema(description = "是否首台 0否 1是")
+    private Integer isFirst;
+
+
+    /**
+     * 是否调整费率 0未调 1已调整
+     */
+    @Schema(description = "是否调整费率 0未调 1已调整")
+    private Integer isRatio;
+
+
+
+
+}
+

+ 129 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsMachinePledge.java

@@ -0,0 +1,129 @@
+package com.kxs.product.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客小爽押金调整记录表(KxsMachinePledge)表实体类
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsMachinePledge extends Model<KxsMachinePledge> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记,0未删除,1已删除
+     */
+    @Schema(description = "删除标记,0未删除,1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 用户ID
+     */
+    @Schema(description = "用户ID")
+    private Integer userId;
+
+
+    /**
+     * 机具ID
+     */
+    @Schema(description = "机具ID")
+    private Integer machineId;
+
+
+    /**
+     * 调整前押金
+     */
+    @Schema(description = "调整前押金")
+    private BigDecimal beforePledge;
+
+
+    /**
+     * 调整后押金
+     */
+    @Schema(description = "调整后押金")
+    private BigDecimal afterPledge;
+
+
+    /**
+     * 备注
+     */
+    @Schema(description = "备注")
+    private String remark;
+
+
+    /**
+     * 操作人
+     */
+    @Schema(description = "操作人")
+    private String createBy;
+
+
+    /**
+     * 品牌名
+     */
+    @Schema(description = "品牌名")
+    private String brandName;
+
+
+    /**
+     * 三方返回数据
+     */
+    @Schema(description = "三方返回数据")
+    private String result;
+
+
+
+
+}
+

+ 129 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsMachineRatio.java

@@ -0,0 +1,129 @@
+package com.kxs.product.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客小爽费率调整记录表(KxsMachineRatio)表实体类
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsMachineRatio extends Model<KxsMachineRatio> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记,0未删除,1已删除
+     */
+    @Schema(description = "删除标记,0未删除,1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 用户ID
+     */
+    @Schema(description = "用户ID")
+    private Integer userId;
+
+
+    /**
+     * 机具ID
+     */
+    @Schema(description = "机具ID")
+    private Integer machineId;
+
+
+    /**
+     * 调整前费率
+     */
+    @Schema(description = "调整前费率")
+    private BigDecimal beforeRatio;
+
+
+    /**
+     * 调整后费率
+     */
+    @Schema(description = "调整后费率")
+    private BigDecimal afterRatio;
+
+
+    /**
+     * 备注
+     */
+    @Schema(description = "备注")
+    private String remark;
+
+
+    /**
+     * 操作人
+     */
+    @Schema(description = "操作人")
+    private String createBy;
+
+
+    /**
+     * 品牌名
+     */
+    @Schema(description = "品牌名")
+    private String brandName;
+
+
+    /**
+     * 三方返回数据
+     */
+    @Schema(description = "三方返回数据")
+    private String result;
+
+
+
+
+}
+

+ 115 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsMachineTrack.java

@@ -0,0 +1,115 @@
+package com.kxs.product.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客小爽机具轨迹记录表(KxsMachineTrack)表实体类
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsMachineTrack extends Model<KxsMachineTrack> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记,0未删除,1已删除
+     */
+    @Schema(description = "删除标记,0未删除,1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 变动前所属用户ID
+     */
+    @Schema(description = "变动前所属用户ID")
+    private Integer beforeUserId;
+
+
+    /**
+     * 变动后用户ID
+     */
+    @Schema(description = "变动后用户ID")
+    private Integer afterUserId;
+
+
+    /**
+     * 机具ID
+     */
+    @Schema(description = "机具ID")
+    private Integer machineId;
+
+
+    /**
+     * 品牌ID
+     */
+    @Schema(description = "品牌ID")
+    private Integer brandId;
+
+
+    /**
+     * 轨迹类型
+     */
+    @Schema(description = "轨迹类型")
+    private Integer trackType;
+
+
+    /**
+     * 变动方向 0出库 1入库
+     */
+    @Schema(description = "变动方向 0出库 1入库")
+    private Integer changeType;
+
+
+
+
+}
+

+ 115 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsMachineTransfer.java

@@ -0,0 +1,115 @@
+package com.kxs.product.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客小爽机具划拨表(KxsMachineTransfer)表实体类
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsMachineTransfer extends Model<KxsMachineTransfer> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记,0未删除,1已删除
+     */
+    @Schema(description = "删除标记,0未删除,1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 机具号
+     */
+    @Schema(description = "机具号")
+    private String machineSn;
+
+
+    /**
+     * 拨出用户ID
+     */
+    @Schema(description = "拨出用户ID")
+    private Integer sendUserId;
+
+
+    /**
+     * 品牌ID
+     */
+    @Schema(description = "品牌ID")
+    private Integer brandId;
+
+
+    /**
+     * 拨入用户ID
+     */
+    @Schema(description = "拨入用户ID")
+    private Integer toUserId;
+
+
+    /**
+     * 机具类型 0兑换机 1循环机
+     */
+    @Schema(description = "机具类型 0兑换机 1循环机")
+    private Integer machineType;
+
+
+    /**
+     * 划拨类型 0未绑定划拨 1转商户型创客
+     */
+    @Schema(description = "划拨类型 0未绑定划拨 1转商户型创客")
+    private Integer transferType;
+
+
+
+
+}
+

+ 164 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsMerchant.java

@@ -0,0 +1,164 @@
+package com.kxs.product.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客小爽商户表(KxsMerchant)表实体类
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsMerchant extends Model<KxsMerchant> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记,0未删除,1已删除
+     */
+    @Schema(description = "删除标记,0未删除,1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 商户编号
+     */
+    @Schema(description = "商户编号")
+    private String merchantNo;
+
+
+    /**
+     * 商户名称
+     */
+    @Schema(description = "商户名称")
+    private String merchantName;
+
+
+    /**
+     * 身份证号
+     */
+    @Schema(description = "身份证号")
+    private String merchantCard;
+
+
+    /**
+     * 机具ID
+     */
+    @Schema(description = "机具ID")
+    private Integer machineId;
+
+
+    /**
+     * 所属创客ID
+     */
+    @Schema(description = "所属创客ID")
+    private Integer userId;
+
+
+    /**
+     * 商户电话
+     */
+    @Schema(description = "商户电话")
+    private String merchantPhone;
+
+
+    /**
+     * 品牌ID
+     */
+    @Schema(description = "品牌ID")
+    private Integer brandId;
+
+
+    /**
+     * 商户等级 0扶持期 1稳定期 2盈利期
+     */
+    @Schema(description = "商户等级 0扶持期 1稳定期 2盈利期")
+    private Integer merchantLevel;
+
+
+    /**
+     * 商户状态 0关闭 1正常 2冻结
+     */
+    @Schema(description = "商户状态 0关闭 1正常 2冻结")
+    private Integer status;
+
+
+    /**
+     * 商户地址
+     */
+    @Schema(description = "商户地址")
+    private String address;
+
+
+    /**
+     * 商户总交易额
+     */
+    @Schema(description = "商户总交易额")
+    private BigDecimal tradeTotal;
+
+
+    /**
+     * 是否商户型创客 0否 1是
+     */
+    @Schema(description = "是否商户型创客 0否 1是")
+    private Integer isMaker;
+
+
+    /**
+     * 商户型创客的用户ID
+     */
+    @Schema(description = "商户型创客的用户ID")
+    private Integer makerUserId;
+
+
+
+
+}
+

+ 122 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsShopCate.java

@@ -0,0 +1,122 @@
+package com.kxs.product.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 商城分类表(KxsShopCate)表实体类
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsShopCate extends Model<KxsShopCate> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记,0未删除,1已删除
+     */
+    @Schema(description = "删除标记,0未删除,1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 分类名称
+     */
+    @Schema(description = "分类名称")
+    private String name;
+
+
+    /**
+     * 上级ID
+     */
+    @Schema(description = "上级ID")
+    private Integer pid;
+
+
+    /**
+     * 分类层级
+     */
+    @Schema(description = "分类层级")
+    private Integer level;
+
+
+    /**
+     * 图标
+     */
+    @Schema(description = "图标")
+    private String iconUrl;
+
+
+    /**
+     * 状态 0禁用 1启用
+     */
+    @Schema(description = "状态 0禁用 1启用")
+    private Integer status;
+
+
+    /**
+     * 排序
+     */
+    @Schema(description = "排序")
+    private Integer sort;
+
+
+    /**
+     * 是否展示在商城 0否 1是
+     */
+    @Schema(description = "是否展示在商城 0否 1是")
+    private Integer isShow;
+
+
+
+
+}
+

+ 157 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsShopGoods.java

@@ -0,0 +1,157 @@
+package com.kxs.product.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 商城商品表(KxsShopGoods)表实体类
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsShopGoods extends Model<KxsShopGoods> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记,0未删除,1已删除
+     */
+    @Schema(description = "删除标记,0未删除,1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 封面图
+     */
+    @Schema(description = "封面图")
+    private String picUrl;
+
+
+    /**
+     * 商品名称
+     */
+    @Schema(description = "商品名称")
+    private String goodsName;
+
+
+    /**
+     * 价格
+     */
+    @Schema(description = "价格")
+    private BigDecimal price;
+
+
+    /**
+     * 子标题
+     */
+    @Schema(description = "子标题")
+    private String subtitle;
+
+
+    /**
+     * 详情
+     */
+    @Schema(description = "详情")
+    private String details;
+
+
+    /**
+     * 状态 0下架 1上架
+     */
+    @Schema(description = "状态 0下架 1上架")
+    private Integer status;
+
+
+    /**
+     * 分类ID
+     */
+    @Schema(description = "分类ID")
+    private Integer colId;
+
+
+    /**
+     * 限购数量
+     */
+    @Schema(description = "限购数量")
+    private Integer limitCount;
+
+
+    /**
+     * 起购数量
+     */
+    @Schema(description = "起购数量")
+    private Integer startByCount;
+
+
+    /**
+     * 商品类型 0实物商品 1虚拟物品
+     */
+    @Schema(description = "商品类型 0实物商品 1虚拟物品")
+    private Integer goodsType;
+
+
+    /**
+     * 上架时间
+     */
+    @Schema(description = "上架时间")
+    private LocalDateTime upTime;
+
+
+    /**
+     * 下架时间
+     */
+    @Schema(description = "下架时间")
+    private LocalDateTime downTime;
+
+
+
+
+}
+

+ 94 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsShopGoodsPic.java

@@ -0,0 +1,94 @@
+package com.kxs.product.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 商城商品图片表(KxsShopGoodsPic)表实体类
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:36
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsShopGoodsPic extends Model<KxsShopGoodsPic> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记,0未删除,1已删除
+     */
+    @Schema(description = "删除标记,0未删除,1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 商品ID
+     */
+    @Schema(description = "商品ID")
+    private Integer goodsId;
+
+
+    /**
+     * 排序
+     */
+    @Schema(description = "排序")
+    private Integer sort;
+
+
+    /**
+     * 图片地址
+     */
+    @Schema(description = "图片地址")
+    private String url;
+
+
+
+
+}
+

+ 129 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsShopGoodsSku.java

@@ -0,0 +1,129 @@
+package com.kxs.product.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 商城商品SKU表(KxsShopGoodsSku)表实体类
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:36
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsShopGoodsSku extends Model<KxsShopGoodsSku> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记,0未删除,1已删除
+     */
+    @Schema(description = "删除标记,0未删除,1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 商品ID
+     */
+    @Schema(description = "商品ID")
+    private Integer goodId;
+
+
+    /**
+     * 限购数量
+     */
+    @Schema(description = "限购数量")
+    private Integer limitCount;
+
+
+    /**
+     * 起购数量
+     */
+    @Schema(description = "起购数量")
+    private Integer startByCount;
+
+
+    /**
+     * 售价
+     */
+    @Schema(description = "售价")
+    private BigDecimal price;
+
+
+    /**
+     * 库存数量
+     */
+    @Schema(description = "库存数量")
+    private Integer stockNum;
+
+
+    /**
+     * 销量
+     */
+    @Schema(description = "销量")
+    private Integer sales;
+
+
+    /**
+     * sku图片
+     */
+    @Schema(description = "sku图片")
+    private String image;
+
+
+    /**
+     * 商品规格值列表,采用JSON数组格式
+     */
+    @Schema(description = "商品规格值列表,采用JSON数组格式")
+    private String specifications;
+
+
+
+
+}
+

+ 101 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsShopGoodsSpec.java

@@ -0,0 +1,101 @@
+package com.kxs.product.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 商城商品SKU记录表(KxsShopGoodsSpec)表实体类
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:36
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsShopGoodsSpec extends Model<KxsShopGoodsSpec> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记,0未删除,1已删除
+     */
+    @Schema(description = "删除标记,0未删除,1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 商品规格名称
+     */
+    @Schema(description = "商品规格名称")
+    private String specification;
+
+
+    /**
+     * 商品规格值
+     */
+    @Schema(description = "商品规格值")
+    private String value;
+
+
+    /**
+     * 商品ID
+     */
+    @Schema(description = "商品ID")
+    private Integer goodsId;
+
+
+    /**
+     * 排序
+     */
+    @Schema(description = "排序")
+    private Integer sort;
+
+
+
+
+}
+

+ 213 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsShopOrder.java

@@ -0,0 +1,213 @@
+package com.kxs.product.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 商城订单表(KxsShopOrder)表实体类
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsShopOrder extends Model<KxsShopOrder> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记,0未删除,1已删除
+     */
+    @Schema(description = "删除标记,0未删除,1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 订单号
+     */
+    @Schema(description = "订单号")
+    private String orderSn;
+
+
+    /**
+     * 用户ID
+     */
+    @Schema(description = "用户ID")
+    private Long userId;
+
+
+    /**
+     * 提货方式 0自提 1邮寄
+     */
+    @Schema(description = "提货方式 0自提 1邮寄")
+    private Integer getMode;
+
+
+    /**
+     * 支付渠道 0余额 1支付宝 2微信 3盟主储蓄金
+     */
+    @Schema(description = "支付渠道 0余额 1支付宝 2微信 3盟主储蓄金")
+    private Integer payType;
+
+
+    /**
+     * 支付时间
+     */
+    @Schema(description = "支付时间")
+    private LocalDateTime payTime;
+
+
+    /**
+     * 发货时间
+     */
+    @Schema(description = "发货时间")
+    private LocalDateTime sendTime;
+
+
+    /**
+     * 备注
+     */
+    @Schema(description = "备注")
+    private String remark;
+
+
+    /**
+     * 收货人
+     */
+    @Schema(description = "收货人")
+    private String consignee;
+
+
+    /**
+     * 收货电话
+     */
+    @Schema(description = "收货电话")
+    private String phone;
+
+
+    /**
+     * 收货地址
+     */
+    @Schema(description = "收货地址")
+    private String address;
+
+
+    /**
+     * 快递单号
+     */
+    @Schema(description = "快递单号")
+    private String expressageSn;
+
+
+    /**
+     * 快递公司
+     */
+    @Schema(description = "快递公司")
+    private String expressageName;
+
+
+    /**
+     * 状态 0未支付 1已支付 2已发货 3已完成 4已取消
+     */
+    @Schema(description = "状态 0未支付 1已支付 2已发货 3已完成 4已取消")
+    private Integer status;
+
+
+    /**
+     * 退款状态 0未申请 1已申请 2申请通过 3申请驳回
+     */
+    @Schema(description = "退款状态 0未申请 1已申请 2申请通过 3申请驳回")
+    private Integer returnStatus;
+
+
+    /**
+     * 申请退款时间
+     */
+    @Schema(description = "申请退款时间")
+    private LocalDateTime returnTime;
+
+
+    /**
+     * 订单金额
+     */
+    @Schema(description = "订单金额")
+    private BigDecimal totalPrice;
+
+
+    /**
+     * 支付金额
+     */
+    @Schema(description = "支付金额")
+    private BigDecimal payPrice;
+
+
+    /**
+     * 交易流水号
+     */
+    @Schema(description = "交易流水号")
+    private String tradeNo;
+
+
+    /**
+     * 自提仓库ID
+     */
+    @Schema(description = "自提仓库ID")
+    private Integer warehouseId;
+
+
+    /**
+     * 订单类型 0商城订单 1分仓额度 2小分仓额度 3小盟主订单 4大盟主订单
+     */
+    @Schema(description = "订单类型 0商城订单 1分仓额度 2小分仓额度 3小盟主订单 4大盟主订单")
+    private Integer orderType;
+
+
+
+
+}
+

+ 129 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsShopOrderInfo.java

@@ -0,0 +1,129 @@
+package com.kxs.product.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 商城订单详情表(KxsShopOrderInfo)表实体类
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:36
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsShopOrderInfo extends Model<KxsShopOrderInfo> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记,0未删除,1已删除
+     */
+    @Schema(description = "删除标记,0未删除,1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 商品ID
+     */
+    @Schema(description = "商品ID")
+    private Integer goodsId;
+
+
+    /**
+     * 商品数量
+     */
+    @Schema(description = "商品数量")
+    private Integer number;
+
+
+    /**
+     * 商品单价
+     */
+    @Schema(description = "商品单价")
+    private BigDecimal goodsPrice;
+
+
+    /**
+     * 封面图
+     */
+    @Schema(description = "封面图")
+    private String picUrl;
+
+
+    /**
+     * 商品名称
+     */
+    @Schema(description = "商品名称")
+    private String goodsName;
+
+
+    /**
+     * 订单ID
+     */
+    @Schema(description = "订单ID")
+    private Integer orderId;
+
+
+    /**
+     * 商品skuId
+     */
+    @Schema(description = "商品skuId")
+    private Integer skuId;
+
+
+    /**
+     * 商品货品的规格列表
+     */
+    @Schema(description = "商品货品的规格列表")
+    private String specifications;
+
+
+
+
+}
+

+ 115 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsTicket.java

@@ -0,0 +1,115 @@
+package com.kxs.product.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客小爽券码表(KxsTicket)表实体类
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsTicket extends Model<KxsTicket> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记,0未删除,1已删除
+     */
+    @Schema(description = "删除标记,0未删除,1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 用户ID
+     */
+    @Schema(description = "用户ID")
+    private Integer userId;
+
+
+    /**
+     * 券码
+     */
+    @Schema(description = "券码")
+    private String ticketCode;
+
+
+    /**
+     * 券码类型 0电签 1大pos
+     */
+    @Schema(description = "券码类型 0电签 1大pos")
+    private Integer ticketType;
+
+
+    /**
+     * 机具卷轨迹记录
+     */
+    @Schema(description = "机具卷轨迹记录")
+    private String ticketAllotPath;
+
+
+    /**
+     * 购买订单ID
+     */
+    @Schema(description = "购买订单ID")
+    private Integer orderId;
+
+
+    /**
+     * 大盟主标记 0否 1是
+     */
+    @Schema(description = "大盟主标记 0否 1是")
+    private Integer isLeader;
+
+
+
+
+}
+

+ 108 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsTicketTransfer.java

@@ -0,0 +1,108 @@
+package com.kxs.product.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客小爽券码划拨记录表(KxsTicketTransfer)表实体类
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsTicketTransfer extends Model<KxsTicketTransfer> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记,0未删除,1已删除
+     */
+    @Schema(description = "删除标记,0未删除,1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 券码集合
+     */
+    @Schema(description = "券码集合")
+    private String ticketCodes;
+
+
+    /**
+     * 拨出用户ID
+     */
+    @Schema(description = "拨出用户ID")
+    private Integer sendUserId;
+
+
+    /**
+     * 拨入用户ID
+     */
+    @Schema(description = "拨入用户ID")
+    private Integer toUserId;
+
+
+    /**
+     * 数量
+     */
+    @Schema(description = "数量")
+    private Integer transferNum;
+
+
+    /**
+     * 券码类型 0电签 1大pos
+     */
+    @Schema(description = "券码类型 0电签 1大pos")
+    private Integer ticketType;
+
+
+
+
+}
+

+ 73 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/brand/BrandListVO.java

@@ -0,0 +1,73 @@
+package com.kxs.product.api.vo.kxsapp.brand;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 品牌列表vo
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:36
+ */
+@Data
+@Schema(description = "品牌列表返回实体")
+public class BrandListVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+
+    /**
+     * 品牌名称
+     */
+    @Schema(description = "品牌名称")
+    private String name;
+
+
+    /**
+     * 跳转链接
+     */
+    @Schema(description = "跳转链接")
+    private String linkUrl;
+
+
+    /**
+     * 封面图片
+     */
+    @Schema(description = "封面图片")
+    private String cover;
+
+
+    /**
+     * 类型 0电签 1大pos
+     */
+    @Schema(description = "类型 0电签 1大pos")
+    private Integer brandType;
+
+
+    /**
+     * 排序
+     */
+    @Schema(description = "排序")
+    private Integer sort;
+
+
+
+
+
+	
+
+}

+ 59 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/machine/MachineApplyRemarkVO.java

@@ -0,0 +1,59 @@
+package com.kxs.product.api.vo.kxsapp.machine;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 申请机具说明vo
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:37
+ */
+@Data
+@Schema(description = "申请机具说明返回实体")
+public class MachineApplyRemarkVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 激活台数
+     */
+    @Schema(description = "激活台数")
+    private Object actCount;
+
+
+    /**
+     * 过期台数
+     */
+    @Schema(description = "过期台数")
+    private Object pastCount;
+
+
+    /**
+     * 最多领取台数
+     */
+    @Schema(description = "最多领取台数")
+    private Object maxCount;
+
+
+    /**
+     * 最少领取台数
+     */
+    @Schema(description = "最少领取台数")
+    private Object minCount;
+
+
+
+
+
+	
+
+}

+ 60 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/machine/MachineMachineBindListVO.java

@@ -0,0 +1,60 @@
+package com.kxs.product.api.vo.kxsapp.machine;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 已绑定列表vo
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:38
+ */
+@Data
+@Schema(description = "已绑定列表返回实体")
+public class MachineMachineBindListVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 机具码
+     */
+    @Schema(description = "机具码")
+    private String posSn;
+
+
+    /**
+     * 机具类型 0兑换机 1循环机
+     */
+    @Schema(description = "机具类型 0兑换机 1循环机")
+    private Integer machineType;
+
+
+    /**
+     * 机具押金
+     */
+    @Schema(description = "机具押金")
+    private BigDecimal cashPledge;
+
+
+    /**
+     * 是否激活 0未激活 1已激活
+     */
+    @Schema(description = "是否激活 0未激活 1已激活")
+    private Integer isAct;
+
+
+
+
+
+	
+
+}

+ 45 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/machine/MachineMachineStoreListVO.java

@@ -0,0 +1,45 @@
+package com.kxs.product.api.vo.kxsapp.machine;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 仓库库存机具列表vo
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:39
+ */
+@Data
+@Schema(description = "仓库库存机具列表返回实体")
+public class MachineMachineStoreListVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 新增时间
+     */
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 机具码
+     */
+    @Schema(description = "机具码")
+    private String posSn;
+
+
+
+
+
+	
+
+}

+ 66 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/machine/MachineMachineTransferListVO.java

@@ -0,0 +1,66 @@
+package com.kxs.product.api.vo.kxsapp.machine;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 机具-未绑定划拨记录vo
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:38
+ */
+@Data
+@Schema(description = "机具-未绑定划拨记录返回实体")
+public class MachineMachineTransferListVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+
+    /**
+     * 机具号
+     */
+    @Schema(description = "机具号")
+    private String machineSn;
+
+
+    /**
+     * 机具类型 0兑换机 1循环机
+     */
+    @Schema(description = "机具类型 0兑换机 1循环机")
+    private Integer machineType;
+
+
+    /**
+     * 划拨的用户
+     */
+    @Schema(description = "划拨的用户")
+    private Object toUserName;
+
+
+    /**
+     * 划拨的用户码
+     */
+    @Schema(description = "划拨的用户码")
+    private Object toUserCode;
+
+
+
+
+
+	
+
+}

+ 60 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/machine/MachineMachineUnBindListVO.java

@@ -0,0 +1,60 @@
+package com.kxs.product.api.vo.kxsapp.machine;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 未绑定机具列表vo
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:38
+ */
+@Data
+@Schema(description = "未绑定机具列表返回实体")
+public class MachineMachineUnBindListVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 机具码
+     */
+    @Schema(description = "机具码")
+    private String posSn;
+
+
+    /**
+     * 循环结束时间
+     */
+    @Schema(description = "循环结束时间")
+    private LocalDateTime recycleEndTime;
+
+
+    /**
+     * 机具类型 0兑换机 1循环机
+     */
+    @Schema(description = "机具类型 0兑换机 1循环机")
+    private Integer machineType;
+
+
+    /**
+     * 机具押金
+     */
+    @Schema(description = "机具押金")
+    private BigDecimal cashPledge;
+
+
+
+
+
+	
+
+}

+ 74 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/machine/MachineMachineUserListVO.java

@@ -0,0 +1,74 @@
+package com.kxs.product.api.vo.kxsapp.machine;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 全部机具vo
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:38
+ */
+@Data
+@Schema(description = "全部机具返回实体")
+public class MachineMachineUserListVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 机具码
+     */
+    @Schema(description = "机具码")
+    private String posSn;
+
+
+    /**
+     * 机具类型 0兑换机 1循环机
+     */
+    @Schema(description = "机具类型 0兑换机 1循环机")
+    private Integer machineType;
+
+
+    /**
+     * 机具押金
+     */
+    @Schema(description = "机具押金")
+    private BigDecimal cashPledge;
+
+
+    /**
+     * 出库时间
+     */
+    @Schema(description = "出库时间")
+    private LocalDateTime deliveryTime;
+
+
+    /**
+     * 所属仓库
+     */
+    @Schema(description = "所属仓库")
+    private Object warehouseName;
+
+
+    /**
+     * 品牌
+     */
+    @Schema(description = "品牌")
+    private Object brand;
+
+
+
+
+
+	
+
+}

+ 45 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/machine/MachineRecycleListVO.java

@@ -0,0 +1,45 @@
+package com.kxs.product.api.vo.kxsapp.machine;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 机具可回收列表vo
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:39
+ */
+@Data
+@Schema(description = "机具可回收列表返回实体")
+public class MachineRecycleListVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 机具码
+     */
+    @Schema(description = "机具码")
+    private String posSn;
+
+
+    /**
+     * 循环结束时间
+     */
+    @Schema(description = "循环结束时间")
+    private LocalDateTime recycleEndTime;
+
+
+
+
+
+	
+
+}

+ 45 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/machine/MachineRecycleMachinesVO.java

@@ -0,0 +1,45 @@
+package com.kxs.product.api.vo.kxsapp.machine;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 可循环机列表vo
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:37
+ */
+@Data
+@Schema(description = "可循环机列表返回实体")
+public class MachineRecycleMachinesVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 机具码
+     */
+    @Schema(description = "机具码")
+    private String posSn;
+
+
+    /**
+     * 机具类型 0兑换机 1循环机
+     */
+    @Schema(description = "机具类型 0兑换机 1循环机")
+    private Integer machineType;
+
+
+
+
+
+	
+
+}

+ 45 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/machine/MachineSearchStoreMachineVO.java

@@ -0,0 +1,45 @@
+package com.kxs.product.api.vo.kxsapp.machine;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 机具搜索vo
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:39
+ */
+@Data
+@Schema(description = "机具搜索返回实体")
+public class MachineSearchStoreMachineVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 新增时间
+     */
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 机具码
+     */
+    @Schema(description = "机具码")
+    private String posSn;
+
+
+
+
+
+	
+
+}

+ 45 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/machine/MachineSearchUserMachineVO.java

@@ -0,0 +1,45 @@
+package com.kxs.product.api.vo.kxsapp.machine;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 用户机具和箱具码搜索vo
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:38
+ */
+@Data
+@Schema(description = "用户机具和箱具码搜索返回实体")
+public class MachineSearchUserMachineVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 新增时间
+     */
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 机具码
+     */
+    @Schema(description = "机具码")
+    private String posSn;
+
+
+
+
+
+	
+
+}

+ 123 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/merchant/MerchantMerchantDetailVO.java

@@ -0,0 +1,123 @@
+package com.kxs.product.api.vo.kxsapp.merchant;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 商户详情vo
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:38
+ */
+@Data
+@Schema(description = "商户详情返回实体")
+public class MerchantMerchantDetailVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 商户编号
+     */
+    @Schema(description = "商户编号")
+    private String merchantNo;
+
+
+    /**
+     * 商户名称
+     */
+    @Schema(description = "商户名称")
+    private String merchantName;
+
+
+    /**
+     * 身份证号
+     */
+    @Schema(description = "身份证号")
+    private String merchantCard;
+
+
+    /**
+     * 机具ID
+     */
+    @Schema(description = "机具ID")
+    private Integer machineId;
+
+
+    /**
+     * 商户电话
+     */
+    @Schema(description = "商户电话")
+    private String merchantPhone;
+
+
+    /**
+     * 商户等级 0扶持期 1稳定期 2盈利期
+     */
+    @Schema(description = "商户等级 0扶持期 1稳定期 2盈利期")
+    private Integer merchantLevel;
+
+
+    /**
+     * 商户总交易额
+     */
+    @Schema(description = "商户总交易额")
+    private BigDecimal tradeTotal;
+
+
+    /**
+     * 是否商户型创客 0否 1是
+     */
+    @Schema(description = "是否商户型创客 0否 1是")
+    private Integer isMaker;
+
+
+    /**
+     * 激活时间
+     */
+    @Schema(description = "激活时间")
+    private Object actTime;
+
+
+    /**
+     * 机具号
+     */
+    @Schema(description = "机具号")
+    private Object posSn;
+
+
+    /**
+     * 机具品牌
+     */
+    @Schema(description = "机具品牌")
+    private Object brand;
+
+
+
+
+
+	
+
+}

+ 52 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/merchant/MerchantMerchantListVO.java

@@ -0,0 +1,52 @@
+package com.kxs.product.api.vo.kxsapp.merchant;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 商户列表vo
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:38
+ */
+@Data
+@Schema(description = "商户列表返回实体")
+public class MerchantMerchantListVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 新增时间
+     */
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 商户名称
+     */
+    @Schema(description = "商户名称")
+    private String merchantName;
+
+
+    /**
+     * 当月交易额
+     */
+    @Schema(description = "当月交易额")
+    private Object thisMonthTrade;
+
+
+
+
+
+	
+
+}

+ 66 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/merchant/MerchantMerchantTotalVO.java

@@ -0,0 +1,66 @@
+package com.kxs.product.api.vo.kxsapp.merchant;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 汇总数据激活等vo
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:38
+ */
+@Data
+@Schema(description = "汇总数据激活等返回实体")
+public class MerchantMerchantTotalVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 总商户数
+     */
+    @Schema(description = "总商户数")
+    private Object totalCount;
+
+
+    /**
+     * 今日激活商户数
+     */
+    @Schema(description = "今日激活商户数")
+    private Object actCount ;
+
+
+    /**
+     * 品牌总商户数
+     */
+    @Schema(description = "品牌总商户数")
+    private Object brandCount;
+
+
+    /**
+     * 品牌已激活
+     */
+    @Schema(description = "品牌已激活")
+    private Object brandActCount;
+
+
+    /**
+     * 品牌未激活
+     */
+    @Schema(description = "品牌未激活")
+    private Object brandUnActCount;
+
+
+
+
+
+	
+
+}

+ 65 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/shop/OrderInfoListVO.java

@@ -0,0 +1,65 @@
+package com.kxs.product.api.vo.kxsapp.shop;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 商城订单详情表vo
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:37
+ */
+@Data
+@Schema(description = "订单详情表返回实体")
+public class OrderInfoListVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 商品数量
+     */
+    @Schema(description = "商品数量")
+    private Integer number;
+
+
+    /**
+     * 商品单价
+     */
+    @Schema(description = "商品单价")
+    private BigDecimal goodsPrice;
+
+
+    /**
+     * 封面图
+     */
+    @Schema(description = "封面图")
+    private String picUrl;
+
+
+    /**
+     * 商品名称
+     */
+    @Schema(description = "商品名称")
+    private String goodsName;
+
+
+    /**
+     * 商品货品的规格列表
+     */
+    @Schema(description = "商品货品的规格列表")
+    private String specifications;
+
+
+
+
+
+	
+
+}

+ 52 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/shop/ShopCategoriesVO.java

@@ -0,0 +1,52 @@
+package com.kxs.product.api.vo.kxsapp.shop;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 分类列表vo
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:36
+ */
+@Data
+@Schema(description = "分类列表返回实体")
+public class ShopCategoriesVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+
+    /**
+     * 分类名称
+     */
+    @Schema(description = "分类名称")
+    private String name;
+
+
+    /**
+     * 图标
+     */
+    @Schema(description = "图标")
+    private String iconUrl;
+
+
+
+
+
+	
+
+}

+ 108 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/shop/ShopGoodsDetailVO.java

@@ -0,0 +1,108 @@
+package com.kxs.product.api.vo.kxsapp.shop;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 商品详情vo
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:36
+ */
+@Data
+@Schema(description = "商品详情返回实体")
+public class ShopGoodsDetailVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+
+    /**
+     * 封面图
+     */
+    @Schema(description = "封面图")
+    private String picUrl;
+
+
+    /**
+     * 商品名称
+     */
+    @Schema(description = "商品名称")
+    private String goodsName;
+
+
+    /**
+     * 价格
+     */
+    @Schema(description = "价格")
+    private BigDecimal price;
+
+
+    /**
+     * 子标题
+     */
+    @Schema(description = "子标题")
+    private String subtitle;
+
+
+    /**
+     * 详情
+     */
+    @Schema(description = "详情")
+    private String details;
+
+
+    /**
+     * 限购数量
+     */
+    @Schema(description = "限购数量")
+    private Integer limitCount;
+
+
+    /**
+     * 起购数量
+     */
+    @Schema(description = "起购数量")
+    private Integer startByCount;
+
+
+    /**
+     * 商城商品SKU记录表
+     */
+    @Schema(description = "商城商品SKU记录表")
+    private List<ShopGoodsSpecVO> specList;
+
+
+    /**
+     * 商城商品SKU表
+     */
+    @Schema(description = "商城商品SKU表")
+    private List<ShopGoodsSkuVO> skuList;
+
+
+    /**
+     * 商城商品图片表
+     */
+    @Schema(description = "商城商品图片表")
+    private List<String> picList;
+
+
+
+
+
+	
+
+}

+ 60 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/shop/ShopGoodsListVO.java

@@ -0,0 +1,60 @@
+package com.kxs.product.api.vo.kxsapp.shop;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 商品列表vo
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:36
+ */
+@Data
+@Schema(description = "商品列表返回实体")
+public class ShopGoodsListVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+
+    /**
+     * 封面图
+     */
+    @Schema(description = "封面图")
+    private String picUrl;
+
+
+    /**
+     * 商品名称
+     */
+    @Schema(description = "商品名称")
+    private String goodsName;
+
+
+    /**
+     * 价格
+     */
+    @Schema(description = "价格")
+    private BigDecimal price;
+
+
+
+
+
+	
+
+}

+ 69 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/shop/ShopGoodsSkuVO.java

@@ -0,0 +1,69 @@
+package com.kxs.product.api.vo.kxsapp.shop;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 商品sku VO
+ *
+ * @author Lxq
+ * @date 2023-12-20
+ */
+@Data
+@Schema(description = "商品sku返回实体")
+public class ShopGoodsSkuVO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+    /**
+     * 限购数量
+     */
+    @Schema(description = "限购数量")
+    private Integer limitCount;
+
+
+    /**
+     * 起购数量
+     */
+    @Schema(description = "起购数量")
+    private Integer startByCount;
+
+
+    /**
+     * 售价
+     */
+    @Schema(description = "售价")
+    private BigDecimal price;
+
+
+    /**
+     * 库存数量
+     */
+    @Schema(description = "库存数量")
+    private Integer stockNum;
+
+    /**
+     * sku图片
+     */
+    @Schema(description = "sku图片")
+    private String image;
+
+
+    /**
+     * 商品规格值列表,采用JSON数组格式
+     */
+    @Schema(description = "商品规格值列表,采用JSON数组格式")
+    private String specifications;
+
+}

+ 48 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/shop/ShopGoodsSpecVO.java

@@ -0,0 +1,48 @@
+package com.kxs.product.api.vo.kxsapp.shop;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 商品spec VO
+ *
+ * @author Lxq
+ * @date 2023-12-20
+ */
+@Data
+@Schema(description = "商品spec返回实体")
+public class ShopGoodsSpecVO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+    /**
+     * 商品规格名称
+     */
+    @Schema(description = "商品规格名称")
+    private String specifications;
+
+    /**
+     * 商品规格值
+     */
+    @Schema(description = "商品规格值")
+    private String value;
+
+    /**
+     * 商品规格排序
+     */
+    @Schema(description = "排序")
+    private Integer sort;
+
+}

+ 158 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/shop/ShopOrderDetailVO.java

@@ -0,0 +1,158 @@
+package com.kxs.product.api.vo.kxsapp.shop;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 订单详情vo
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:36
+ */
+@Data
+@Schema(description = "订单详情返回实体")
+public class ShopOrderDetailVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+
+    /**
+     * 订单号
+     */
+    @Schema(description = "订单号")
+    private String orderSn;
+
+
+    /**
+     * 提货方式 0自提 1邮寄
+     */
+    @Schema(description = "提货方式 0自提 1邮寄")
+    private Integer getMode;
+
+
+    /**
+     * 支付渠道 0余额 1支付宝 2微信 3盟主储蓄金
+     */
+    @Schema(description = "支付渠道 0余额 1支付宝 2微信 3盟主储蓄金")
+    private Integer payType;
+
+
+    /**
+     * 支付时间
+     */
+    @Schema(description = "支付时间")
+    private LocalDateTime payTime;
+
+
+    /**
+     * 发货时间
+     */
+    @Schema(description = "发货时间")
+    private LocalDateTime sendTime;
+
+
+    /**
+     * 备注
+     */
+    @Schema(description = "备注")
+    private String remark;
+
+
+    /**
+     * 收货人
+     */
+    @Schema(description = "收货人")
+    private String consignee;
+
+
+    /**
+     * 收货电话
+     */
+    @Schema(description = "收货电话")
+    private String phone;
+
+
+    /**
+     * 收货地址
+     */
+    @Schema(description = "收货地址")
+    private String address;
+
+
+    /**
+     * 快递单号
+     */
+    @Schema(description = "快递单号")
+    private String expressageSn;
+
+
+    /**
+     * 快递公司
+     */
+    @Schema(description = "快递公司")
+    private String expressageName;
+
+
+    /**
+     * 状态 0未支付 1已支付 2已发货 3已完成 4已取消
+     */
+    @Schema(description = "状态 0未支付 1已支付 2已发货 3已完成 4已取消")
+    private Integer status;
+
+
+    /**
+     * 退款状态 0未申请 1已申请 2申请通过 3申请驳回
+     */
+    @Schema(description = "退款状态 0未申请 1已申请 2申请通过 3申请驳回")
+    private Integer returnStatus;
+
+
+    /**
+     * 订单金额
+     */
+    @Schema(description = "订单金额")
+    private BigDecimal totalPrice;
+
+
+    /**
+     * 支付金额
+     */
+    @Schema(description = "支付金额")
+    private BigDecimal payPrice;
+
+
+    /**
+     * 交易流水号
+     */
+    @Schema(description = "交易流水号")
+    private String tradeNo;
+
+
+    /**
+     * 商城订单详情表
+     */
+    @Schema(description = "商城订单详情表")
+    private List<OrderInfoListVO> goodsList;
+
+
+
+
+
+	
+
+}

+ 59 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/ticket/TicketListVO.java

@@ -0,0 +1,59 @@
+package com.kxs.product.api.vo.kxsapp.ticket;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 兑换券列表vo
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:37
+ */
+@Data
+@Schema(description = "兑换券列表返回实体")
+public class TicketListVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+
+    /**
+     * 券码
+     */
+    @Schema(description = "券码")
+    private String ticketCode;
+
+
+    /**
+     * 券码类型 0电签 1大pos
+     */
+    @Schema(description = "券码类型 0电签 1大pos")
+    private Integer ticketType;
+
+
+    /**
+     * 可用品牌ID集合
+     */
+    @Schema(description = "可用品牌ID集合")
+    private Object brandList;
+
+
+
+
+
+	
+
+}

+ 94 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/ticket/TicketTicketTransferDetailVO.java

@@ -0,0 +1,94 @@
+package com.kxs.product.api.vo.kxsapp.ticket;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 兑换券划拨详情vo
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:37
+ */
+@Data
+@Schema(description = "兑换券划拨详情返回实体")
+public class TicketTicketTransferDetailVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 券码集合
+     */
+    @Schema(description = "券码集合")
+    private String ticketCodes;
+
+
+    /**
+     * 拨出用户ID
+     */
+    @Schema(description = "拨出用户ID")
+    private Integer sendUserId;
+
+
+    /**
+     * 拨入用户ID
+     */
+    @Schema(description = "拨入用户ID")
+    private Integer toUserId;
+
+
+    /**
+     * 数量
+     */
+    @Schema(description = "数量")
+    private Integer transferNum;
+
+
+    /**
+     * 创客姓名
+     */
+    @Schema(description = "创客姓名")
+    private Object realName;
+
+
+    /**
+     * 创客编号
+     */
+    @Schema(description = "创客编号")
+    private Object userCode;
+
+
+    /**
+     * 创客电话
+     */
+    @Schema(description = "创客电话")
+    private Object phone;
+
+
+
+
+
+	
+
+}

+ 66 - 0
kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/ticket/TicketTicketTransferListVO.java

@@ -0,0 +1,66 @@
+package com.kxs.product.api.vo.kxsapp.ticket;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 兑换券划拨记录vo
+ *
+ * @author 系统
+ * @date 2023-12-20 10:09:37
+ */
+@Data
+@Schema(description = "兑换券划拨记录返回实体")
+public class TicketTicketTransferListVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 数量
+     */
+    @Schema(description = "数量")
+    private Integer transferNum;
+
+
+    /**
+     * 创客姓名
+     */
+    @Schema(description = "创客姓名")
+    private Object realName;
+
+
+    /**
+     * 创客编号
+     */
+    @Schema(description = "创客编号")
+    private Object userCode;
+
+
+
+
+
+	
+
+}

+ 20 - 0
kxs-product/kxs-product-biz/pom.xml

@@ -10,6 +10,16 @@
     <packaging>jar</packaging>
 
     <dependencies>
+        <!--注册中心客户端-->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+        <!--配置中心客户端-->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
         <!--undertow容器-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -47,6 +57,16 @@
             <groupId>com.mysql</groupId>
             <artifactId>mysql-connector-j</artifactId>
         </dependency>
+        <!--多数据源-->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
+        </dependency>
+        <!--接口文档-->
+        <dependency>
+            <groupId>com.kxs</groupId>
+            <artifactId>kxs-common-swagger</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

+ 24 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/KxsProductApplication.java

@@ -0,0 +1,24 @@
+package com.kxs.product.biz;
+
+import com.kxs.common.security.annotation.EnableAuthResourceServer;
+import com.kxs.common.swagger.annotation.EnableKxsDoc;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+
+/**
+ * KXS产品模块
+ *
+ * @author Lxq
+ * @date 2023-12-20
+ */
+@SpringBootApplication
+@EnableAuthResourceServer
+@EnableKxsDoc(value = "product")
+public class KxsProductApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(KxsProductApplication.class, args);
+	}
+
+}

+ 13 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/constant/ProductConstants.java

@@ -0,0 +1,13 @@
+
+package com.kxs.product.biz.constant;
+
+/**
+ * 公共常量
+ *
+ * @author 没秃顶的码农
+ * @date 2023/10/29
+ */
+public interface ProductConstants {
+
+
+}

+ 43 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/constant/enums/KxsShopEnum.java

@@ -0,0 +1,43 @@
+package com.kxs.product.biz.constant.enums;
+
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 商城相关枚举类
+ *
+ * @author Lxq
+ * @date 2023-12-20
+ */
+@Getter
+@RequiredArgsConstructor
+public enum KxsShopEnum {
+
+    /**
+     * 订单状态
+     */
+    ORDER_NO_PAY(0, "未支付"),
+    ORDER_NO_SEND(1, "待发货"),
+    ORDER_NO_TAKE(2, "待收货"),
+    ORDER_CONFIRM(3, "已完成"),
+    ORDER_CANCEL(4, "已取消"),
+
+    /**
+     * 支付方式
+     */
+    YUE_PAY(0, "余额支付"),
+    ALI_PAY(1, "支付宝支付"),
+    WECHAT_PAY(2, "微信支付"),
+    LEADER_PAY(3, "盟主储蓄金");
+
+    /**
+     * 类型
+     */
+    private final Integer type;
+
+    /**
+     * 描述
+     */
+    private final String description;
+}

+ 25 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/constant/enums/ProductErrorTypeEnum.java

@@ -0,0 +1,25 @@
+package com.kxs.product.biz.constant.enums;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 错误类型枚举
+ *
+ * @author 没秃顶的码农
+ * @date 2023/10/29
+ */
+@Getter
+@RequiredArgsConstructor
+public enum ProductErrorTypeEnum {
+
+	ORDER_EMPTY(-1, "订单不存在"),
+	ORDER_NO_CANCEL(-1, "订单已不能取消"),
+	ORDER_NO_CONFIRM(-1, "订单已不能收货"),
+	SYS_USER_UPDATE_PASSWORD_ERROR(-1, "用户原密码错误"), SYS_DICT_UPDATE_SYSTEM(-1, "系统内置字典不能修改");
+
+	private final int code;
+
+	private final String description;
+
+}

+ 54 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/BrandController.java

@@ -0,0 +1,54 @@
+package com.kxs.product.biz.controller;
+
+import com.kxs.common.core.util.R;
+import com.kxs.product.biz.service.KxsBrandService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 产品模块(品牌管理)控制层
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:39
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("brand")
+public class BrandController {
+
+    /**
+     * 服务对象
+     */
+    private final KxsBrandService kxsBrandService;
+
+
+
+    /**
+     * 品牌列表
+     *
+     * @return 品牌列表
+     */
+    @GetMapping("/list")
+    public R list() {
+
+        return R.ok(kxsBrandService.getSortByList());
+    }
+
+
+    /**
+     * 品牌排序
+     *
+     * @param sorts 实体对象
+     * @return 品牌排序
+     */
+    @PutMapping("/sort")
+    public R sort(@RequestBody Long[] sorts) {
+        return R.ok(kxsBrandService.sortByList(sorts));
+    }
+
+
+
+
+
+}
+

+ 138 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/ShopController.java

@@ -0,0 +1,138 @@
+package com.kxs.product.biz.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kxs.common.core.util.R;
+import com.kxs.product.api.model.KxsShopOrder;
+import com.kxs.product.api.dto.kxsapp.shop.GoodsSubmitDTO;
+import com.kxs.product.api.vo.kxsapp.shop.ShopGoodsListVO;
+import com.kxs.product.biz.service.KxsShopCateService;
+import com.kxs.product.biz.service.KxsShopGoodsService;
+import com.kxs.product.biz.service.KxsShopOrderService;
+import lombok.RequiredArgsConstructor;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 商城(Shop)控制层
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:39
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("shop")
+public class ShopController {
+
+    /**
+     * 服务对象
+     */
+    private final KxsShopCateService kxsShopCateService;
+    private final KxsShopGoodsService kxsShopGoodsService;
+    private final KxsShopOrderService kxsShopOrderService;
+
+
+
+    /**
+     * 分类列表
+     *
+     * @return 分类列表
+     */
+    @GetMapping("/categories")
+    public R categories() {
+        return R.ok(kxsShopCateService.getByList());
+    }
+
+
+    /**
+     * 商品列表
+     *
+     * @param page 分页对象
+     * @param colId 分类ID
+     * @return 商品列表
+     */
+    @GetMapping("/goodsList")
+    public R goodsList(@ParameterObject Page<ShopGoodsListVO> page, @RequestParam("colId") Integer colId) {
+        return R.ok(kxsShopGoodsService.getByPage(page, colId));
+    }
+
+
+    /**
+     * 商品详情
+     *
+     * @param id 主键ID
+     * @return 商品详情
+     */
+    @GetMapping("/goodsDetail")
+    public R goodsDetail(@RequestParam("id") Integer id) {
+        return R.ok(kxsShopGoodsService.getByGoodsDetail(id));
+    }
+
+
+    /**
+     * 提交订单
+     *
+     * @param param 实体对象
+     * @return 提交订单
+     */
+    @PostMapping("/goodsSubmit")
+    public R goodsSubmit(@RequestBody GoodsSubmitDTO param) {
+        return kxsShopOrderService.submitOrder(param);
+    }
+
+
+    /**
+     * 订单详情
+     *
+     * @param id 订单ID
+     * @return 订单详情
+     */
+    @GetMapping("/orderDetail")
+    public R orderDetail(@RequestParam("id") Integer id) {
+        return R.ok(kxsShopOrderService.getByOrderId(id));
+    }
+
+
+    /**
+     * 发起支付
+     *
+     * @param param 订单实体
+     * @return 发起支付
+     */
+    @PostMapping("/orderPay")
+    public R orderPay(@RequestBody KxsShopOrder param) {
+
+        return kxsShopOrderService.payOrder(param);
+    }
+
+
+    /**
+     * 取消订单
+     *
+     * @param param 实体对象
+     * @return 取消订单
+     */
+    @PutMapping("/orderCancel")
+    public R orderCancel(@RequestBody KxsShopOrder param) {
+
+        return kxsShopOrderService.cancelOrder(param);
+    }
+
+
+    /**
+     * 确认收货
+     *
+     * @param param 实体对象
+     * @return 确认收货
+     */
+    @PutMapping("/orderConfirm")
+    public R orderConfirm(@RequestBody KxsShopOrder param) {
+
+        return R.ok(kxsShopOrderService.confirmOrder(param));
+    }
+
+
+
+
+
+}
+

+ 22 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsBrandMapper.java

@@ -0,0 +1,22 @@
+package com.kxs.product.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.product.api.model.KxsBrand;
+import com.kxs.product.api.vo.kxsapp.brand.BrandListVO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 客小爽品牌表(KxsBrand)表数据库访问层
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:34
+ */
+@Mapper
+public interface KxsBrandMapper extends BaseMapper<KxsBrand> {
+
+    List<BrandListVO> getSortByList();
+
+}
+

+ 17 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsMachineMapper.java

@@ -0,0 +1,17 @@
+package com.kxs.product.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.product.api.model.KxsMachine;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 客小爽机具表(KxsMachine)表数据库访问层
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+@Mapper
+public interface KxsMachineMapper extends BaseMapper<KxsMachine> {
+
+}
+

+ 17 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsMachinePledgeMapper.java

@@ -0,0 +1,17 @@
+package com.kxs.product.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.product.api.model.KxsMachinePledge;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 客小爽押金调整记录表(KxsMachinePledge)表数据库访问层
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+@Mapper
+public interface KxsMachinePledgeMapper extends BaseMapper<KxsMachinePledge> {
+
+}
+

+ 17 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsMachineRatioMapper.java

@@ -0,0 +1,17 @@
+package com.kxs.product.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.product.api.model.KxsMachineRatio;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 客小爽费率调整记录表(KxsMachineRatio)表数据库访问层
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+@Mapper
+public interface KxsMachineRatioMapper extends BaseMapper<KxsMachineRatio> {
+
+}
+

+ 17 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsMachineTrackMapper.java

@@ -0,0 +1,17 @@
+package com.kxs.product.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.product.api.model.KxsMachineTrack;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 客小爽机具轨迹记录表(KxsMachineTrack)表数据库访问层
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+@Mapper
+public interface KxsMachineTrackMapper extends BaseMapper<KxsMachineTrack> {
+
+}
+

+ 17 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsMachineTransferMapper.java

@@ -0,0 +1,17 @@
+package com.kxs.product.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.product.api.model.KxsMachineTransfer;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 客小爽机具划拨表(KxsMachineTransfer)表数据库访问层
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+@Mapper
+public interface KxsMachineTransferMapper extends BaseMapper<KxsMachineTransfer> {
+
+}
+

+ 17 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsMerchantMapper.java

@@ -0,0 +1,17 @@
+package com.kxs.product.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.product.api.model.KxsMerchant;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 客小爽商户表(KxsMerchant)表数据库访问层
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+@Mapper
+public interface KxsMerchantMapper extends BaseMapper<KxsMerchant> {
+
+}
+

+ 21 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsShopCateMapper.java

@@ -0,0 +1,21 @@
+package com.kxs.product.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.product.api.model.KxsShopCate;
+import com.kxs.product.api.vo.kxsapp.shop.ShopCategoriesVO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 商城分类表(KxsShopCate)表数据库访问层
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+@Mapper
+public interface KxsShopCateMapper extends BaseMapper<KxsShopCate> {
+
+    List<ShopCategoriesVO> getByList();
+}
+

+ 29 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsShopGoodsMapper.java

@@ -0,0 +1,29 @@
+package com.kxs.product.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kxs.product.api.model.KxsShopGoods;
+import com.kxs.product.api.vo.kxsapp.shop.ShopGoodsListVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 商城商品表(KxsShopGoods)表数据库访问层
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+@Mapper
+public interface KxsShopGoodsMapper extends BaseMapper<KxsShopGoods> {
+
+    /**
+     * kxs app 按页获取商品列表
+     *
+     * @param page  页面
+     * @param colId 分类ID
+     * @return {@link IPage}<{@link ShopGoodsListVO}>
+     */
+    IPage<ShopGoodsListVO> getByPage(Page<ShopGoodsListVO> page, @Param("colId") Integer colId);
+}
+

+ 17 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsShopGoodsPicMapper.java

@@ -0,0 +1,17 @@
+package com.kxs.product.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.product.api.model.KxsShopGoodsPic;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 商城商品图片表(KxsShopGoodsPic)表数据库访问层
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:36
+ */
+@Mapper
+public interface KxsShopGoodsPicMapper extends BaseMapper<KxsShopGoodsPic> {
+
+}
+

+ 27 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsShopGoodsSkuMapper.java

@@ -0,0 +1,27 @@
+package com.kxs.product.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.product.api.model.KxsShopGoodsSku;
+import com.kxs.product.api.vo.kxsapp.shop.ShopGoodsSkuVO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 商城商品SKU表(KxsShopGoodsSku)表数据库访问层
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:36
+ */
+@Mapper
+public interface KxsShopGoodsSkuMapper extends BaseMapper<KxsShopGoodsSku> {
+
+    /**
+     * 按商品id 查询sku列表
+     *
+     * @param goodsId 商品id
+     * @return {@link List}<{@link ShopGoodsSkuVO}>
+     */
+    List<ShopGoodsSkuVO> getByGoodsSkuList(Integer goodsId);
+}
+

+ 27 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsShopGoodsSpecMapper.java

@@ -0,0 +1,27 @@
+package com.kxs.product.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.product.api.model.KxsShopGoodsSpec;
+import com.kxs.product.api.vo.kxsapp.shop.ShopGoodsSpecVO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 商城商品SKU记录表(KxsShopGoodsSpec)表数据库访问层
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:36
+ */
+@Mapper
+public interface KxsShopGoodsSpecMapper extends BaseMapper<KxsShopGoodsSpec> {
+
+    /**
+     * 根据商品ID 获取规格值列表
+     *
+     * @param goodsId 商品id
+     * @return {@link List}<{@link ShopGoodsSpecVO}>
+     */
+    List<ShopGoodsSpecVO> getGoodsSpecList(Integer goodsId);
+}
+

+ 17 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsShopOrderInfoMapper.java

@@ -0,0 +1,17 @@
+package com.kxs.product.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.product.api.model.KxsShopOrderInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 商城订单详情表(KxsShopOrderInfo)表数据库访问层
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+@Mapper
+public interface KxsShopOrderInfoMapper extends BaseMapper<KxsShopOrderInfo> {
+
+}
+

+ 17 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsShopOrderMapper.java

@@ -0,0 +1,17 @@
+package com.kxs.product.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.product.api.model.KxsShopOrder;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 商城订单表(KxsShopOrder)表数据库访问层
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+@Mapper
+public interface KxsShopOrderMapper extends BaseMapper<KxsShopOrder> {
+
+}
+

+ 17 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsTicketMapper.java

@@ -0,0 +1,17 @@
+package com.kxs.product.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.product.api.model.KxsTicket;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 客小爽券码表(KxsTicket)表数据库访问层
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+@Mapper
+public interface KxsTicketMapper extends BaseMapper<KxsTicket> {
+
+}
+

+ 17 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsTicketTransferMapper.java

@@ -0,0 +1,17 @@
+package com.kxs.product.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.product.api.model.KxsTicketTransfer;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 客小爽券码划拨记录表(KxsTicketTransfer)表数据库访问层
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+@Mapper
+public interface KxsTicketTransferMapper extends BaseMapper<KxsTicketTransfer> {
+
+}
+

+ 32 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsBrandService.java

@@ -0,0 +1,32 @@
+package com.kxs.product.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.product.api.model.KxsBrand;
+import com.kxs.product.api.vo.kxsapp.brand.BrandListVO;
+
+import java.util.List;
+
+/**
+ * 客小爽品牌表(KxsBrand)表服务接口
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+public interface KxsBrandService extends IService<KxsBrand> {
+
+    /**
+     * 按列表排序
+     *
+     * @param sorts 排序
+     * @return {@link Boolean}
+     */
+    Boolean sortByList(Long[] sorts);
+
+    /**
+     * 按照排序字段查询品牌列表
+     *
+     * @return {@link List}<{@link BrandListVO}>
+     */
+    List<BrandListVO> getSortByList();
+}
+

+ 15 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsMachinePledgeService.java

@@ -0,0 +1,15 @@
+package com.kxs.product.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.product.api.model.KxsMachinePledge;
+
+/**
+ * 客小爽押金调整记录表(KxsMachinePledge)表服务接口
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+public interface KxsMachinePledgeService extends IService<KxsMachinePledge> {
+
+}
+

+ 15 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsMachineRatioService.java

@@ -0,0 +1,15 @@
+package com.kxs.product.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.product.api.model.KxsMachineRatio;
+
+/**
+ * 客小爽费率调整记录表(KxsMachineRatio)表服务接口
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+public interface KxsMachineRatioService extends IService<KxsMachineRatio> {
+
+}
+

+ 15 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsMachineService.java

@@ -0,0 +1,15 @@
+package com.kxs.product.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.product.api.model.KxsMachine;
+
+/**
+ * 客小爽机具表(KxsMachine)表服务接口
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+public interface KxsMachineService extends IService<KxsMachine> {
+
+}
+

+ 15 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsMachineTrackService.java

@@ -0,0 +1,15 @@
+package com.kxs.product.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.product.api.model.KxsMachineTrack;
+
+/**
+ * 客小爽机具轨迹记录表(KxsMachineTrack)表服务接口
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+public interface KxsMachineTrackService extends IService<KxsMachineTrack> {
+
+}
+

+ 15 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsMachineTransferService.java

@@ -0,0 +1,15 @@
+package com.kxs.product.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.product.api.model.KxsMachineTransfer;
+
+/**
+ * 客小爽机具划拨表(KxsMachineTransfer)表服务接口
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+public interface KxsMachineTransferService extends IService<KxsMachineTransfer> {
+
+}
+

+ 15 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsMerchantService.java

@@ -0,0 +1,15 @@
+package com.kxs.product.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.product.api.model.KxsMerchant;
+
+/**
+ * 客小爽商户表(KxsMerchant)表服务接口
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+public interface KxsMerchantService extends IService<KxsMerchant> {
+
+}
+

+ 19 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsShopCateService.java

@@ -0,0 +1,19 @@
+package com.kxs.product.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.product.api.model.KxsShopCate;
+import com.kxs.product.api.vo.kxsapp.shop.ShopCategoriesVO;
+
+import java.util.List;
+
+/**
+ * 商城分类表(KxsShopCate)表服务接口
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+public interface KxsShopCateService extends IService<KxsShopCate> {
+
+    List<ShopCategoriesVO> getByList();
+}
+

+ 15 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsShopGoodsPicService.java

@@ -0,0 +1,15 @@
+package com.kxs.product.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.product.api.model.KxsShopGoodsPic;
+
+/**
+ * 商城商品图片表(KxsShopGoodsPic)表服务接口
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:36
+ */
+public interface KxsShopGoodsPicService extends IService<KxsShopGoodsPic> {
+
+}
+

+ 35 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsShopGoodsService.java

@@ -0,0 +1,35 @@
+package com.kxs.product.biz.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.product.api.model.KxsShopGoods;
+import com.kxs.product.api.vo.kxsapp.shop.ShopGoodsDetailVO;
+import com.kxs.product.api.vo.kxsapp.shop.ShopGoodsListVO;
+
+/**
+ * 商城商品表(KxsShopGoods)表服务接口
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+public interface KxsShopGoodsService extends IService<KxsShopGoods> {
+
+    /**
+     * kxs app 按页获取商品列表
+     *
+     * @param page  页面
+     * @param colId 分类ID
+     * @return {@link IPage}<{@link ShopGoodsListVO}>
+     */
+    IPage<ShopGoodsListVO> getByPage(Page<ShopGoodsListVO> page, Integer colId);
+
+    /**
+     * kxs app 获取商品详情
+     *
+     * @param id id
+     * @return {@link ShopGoodsDetailVO}
+     */
+    ShopGoodsDetailVO getByGoodsDetail(Integer id);
+}
+

+ 15 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsShopGoodsSkuService.java

@@ -0,0 +1,15 @@
+package com.kxs.product.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.product.api.model.KxsShopGoodsSku;
+
+/**
+ * 商城商品SKU表(KxsShopGoodsSku)表服务接口
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:36
+ */
+public interface KxsShopGoodsSkuService extends IService<KxsShopGoodsSku> {
+
+}
+

+ 15 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsShopGoodsSpecService.java

@@ -0,0 +1,15 @@
+package com.kxs.product.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.product.api.model.KxsShopGoodsSpec;
+
+/**
+ * 商城商品SKU记录表(KxsShopGoodsSpec)表服务接口
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:36
+ */
+public interface KxsShopGoodsSpecService extends IService<KxsShopGoodsSpec> {
+
+}
+

+ 15 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsShopOrderInfoService.java

@@ -0,0 +1,15 @@
+package com.kxs.product.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.product.api.model.KxsShopOrderInfo;
+
+/**
+ * 商城订单详情表(KxsShopOrderInfo)表服务接口
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:36
+ */
+public interface KxsShopOrderInfoService extends IService<KxsShopOrderInfo> {
+
+}
+

+ 57 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsShopOrderService.java

@@ -0,0 +1,57 @@
+package com.kxs.product.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.common.core.util.R;
+import com.kxs.product.api.model.KxsShopOrder;
+import com.kxs.product.api.dto.kxsapp.shop.GoodsSubmitDTO;
+import com.kxs.product.api.vo.kxsapp.shop.ShopOrderDetailVO;
+
+/**
+ * 商城订单表(KxsShopOrder)表服务接口
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+public interface KxsShopOrderService extends IService<KxsShopOrder> {
+
+    /**
+     * kxs app 提交订单
+     *
+     * @param param 参数
+     * @return {@link R}
+     */
+    R submitOrder(GoodsSubmitDTO param);
+
+    /**
+     * kxs app 订单详情
+     *
+     * @param orderId 订单id
+     * @return {@link ShopOrderDetailVO}
+     */
+    ShopOrderDetailVO getByOrderId(Integer orderId);
+
+    /**
+     * kxs app 支付订单
+     *
+     * @param param 参数
+     * @return {@link R}
+     */
+    R payOrder(KxsShopOrder param);
+
+    /**
+     * kxs app 取消订单
+     *
+     * @param param 参数
+     * @return {@link R}
+     */
+    R cancelOrder(KxsShopOrder param);
+
+    /**
+     * kxs app 确认收货
+     *
+     * @param param 参数
+     * @return {@link R}
+     */
+    R confirmOrder(KxsShopOrder param);
+}
+

+ 15 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsTicketService.java

@@ -0,0 +1,15 @@
+package com.kxs.product.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.product.api.model.KxsTicket;
+
+/**
+ * 客小爽券码表(KxsTicket)表服务接口
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+public interface KxsTicketService extends IService<KxsTicket> {
+
+}
+

+ 15 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsTicketTransferService.java

@@ -0,0 +1,15 @@
+package com.kxs.product.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.product.api.model.KxsTicketTransfer;
+
+/**
+ * 客小爽券码划拨记录表(KxsTicketTransfer)表服务接口
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+public interface KxsTicketTransferService extends IService<KxsTicketTransfer> {
+
+}
+

+ 49 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsBrandServiceImpl.java

@@ -0,0 +1,49 @@
+package com.kxs.product.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.product.api.model.KxsBrand;
+import com.kxs.product.api.vo.kxsapp.brand.BrandListVO;
+import com.kxs.product.biz.mapper.KxsBrandMapper;
+import com.kxs.product.biz.service.KxsBrandService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 客小爽品牌表(KxsBrand)表服务实现类
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+@Service("kxsBrandService")
+public class KxsBrandServiceImpl extends ServiceImpl<KxsBrandMapper, KxsBrand> implements KxsBrandService {
+
+    @Override
+    public Boolean sortByList(Long[] sorts) {
+
+        for (int i = 0; i < sorts.length; i++) {
+
+            LambdaUpdateWrapper<KxsBrand> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.eq(KxsBrand::getId, sorts[i]).set(KxsBrand::getSort, i);
+
+            baseMapper.update(null, updateWrapper);
+        }
+        return Boolean.TRUE;
+    }
+
+    @Override
+    public List<BrandListVO> getSortByList() {
+
+        return baseMapper.getSortByList();
+    }
+
+
+
+
+
+
+
+
+}
+

+ 19 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsMachinePledgeServiceImpl.java

@@ -0,0 +1,19 @@
+package com.kxs.product.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.product.biz.mapper.KxsMachinePledgeMapper;
+import com.kxs.product.api.model.KxsMachinePledge;
+import com.kxs.product.biz.service.KxsMachinePledgeService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 客小爽押金调整记录表(KxsMachinePledge)表服务实现类
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+@Service("kxsMachinePledgeService")
+public class KxsMachinePledgeServiceImpl extends ServiceImpl<KxsMachinePledgeMapper, KxsMachinePledge> implements KxsMachinePledgeService {
+
+}
+

+ 19 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsMachineRatioServiceImpl.java

@@ -0,0 +1,19 @@
+package com.kxs.product.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.product.biz.mapper.KxsMachineRatioMapper;
+import com.kxs.product.api.model.KxsMachineRatio;
+import com.kxs.product.biz.service.KxsMachineRatioService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 客小爽费率调整记录表(KxsMachineRatio)表服务实现类
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+@Service("kxsMachineRatioService")
+public class KxsMachineRatioServiceImpl extends ServiceImpl<KxsMachineRatioMapper, KxsMachineRatio> implements KxsMachineRatioService {
+
+}
+

+ 19 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsMachineServiceImpl.java

@@ -0,0 +1,19 @@
+package com.kxs.product.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.product.biz.mapper.KxsMachineMapper;
+import com.kxs.product.api.model.KxsMachine;
+import com.kxs.product.biz.service.KxsMachineService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 客小爽机具表(KxsMachine)表服务实现类
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+@Service("kxsMachineService")
+public class KxsMachineServiceImpl extends ServiceImpl<KxsMachineMapper, KxsMachine> implements KxsMachineService {
+
+}
+

+ 19 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsMachineTrackServiceImpl.java

@@ -0,0 +1,19 @@
+package com.kxs.product.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.product.biz.mapper.KxsMachineTrackMapper;
+import com.kxs.product.api.model.KxsMachineTrack;
+import com.kxs.product.biz.service.KxsMachineTrackService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 客小爽机具轨迹记录表(KxsMachineTrack)表服务实现类
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+@Service("kxsMachineTrackService")
+public class KxsMachineTrackServiceImpl extends ServiceImpl<KxsMachineTrackMapper, KxsMachineTrack> implements KxsMachineTrackService {
+
+}
+

+ 19 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsMachineTransferServiceImpl.java

@@ -0,0 +1,19 @@
+package com.kxs.product.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.product.biz.mapper.KxsMachineTransferMapper;
+import com.kxs.product.api.model.KxsMachineTransfer;
+import com.kxs.product.biz.service.KxsMachineTransferService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 客小爽机具划拨表(KxsMachineTransfer)表服务实现类
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+@Service("kxsMachineTransferService")
+public class KxsMachineTransferServiceImpl extends ServiceImpl<KxsMachineTransferMapper, KxsMachineTransfer> implements KxsMachineTransferService {
+
+}
+

+ 19 - 0
kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsMerchantServiceImpl.java

@@ -0,0 +1,19 @@
+package com.kxs.product.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.product.biz.mapper.KxsMerchantMapper;
+import com.kxs.product.api.model.KxsMerchant;
+import com.kxs.product.biz.service.KxsMerchantService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 客小爽商户表(KxsMerchant)表服务实现类
+ *
+ * @author 系统
+ * @since 2023-12-20 10:09:35
+ */
+@Service("kxsMerchantService")
+public class KxsMerchantServiceImpl extends ServiceImpl<KxsMerchantMapper, KxsMerchant> implements KxsMerchantService {
+
+}
+

Some files were not shown because too many files changed in this diff