王董 1 жил өмнө
parent
commit
6c3fb9bb57
50 өөрчлөгдсөн 2031 нэмэгдсэн , 0 устгасан
  1. 4 0
      sd-business/pom.xml
  2. 0 0
      sd-business/src/main/java/com/sd/business/a-json/ApplyBuyApi.json
  3. 0 0
      sd-business/src/main/java/com/sd/business/a-json/OrderApi.json
  4. 0 0
      sd-business/src/main/java/com/sd/business/a-json/SkuApi.json
  5. 0 0
      sd-business/src/main/java/com/sd/business/a-json/SkuClassifyApi.json
  6. 0 0
      sd-business/src/main/java/com/sd/business/a-json/SupplierApi.json
  7. 77 0
      sd-business/src/main/java/com/sd/business/controller/order/OrderController.java
  8. 77 0
      sd-business/src/main/java/com/sd/business/controller/sku/SkuClassifyController.java
  9. 68 0
      sd-business/src/main/java/com/sd/business/controller/sku/SkuController.java
  10. 68 0
      sd-business/src/main/java/com/sd/business/controller/supplier/SupplierController.java
  11. 17 0
      sd-business/src/main/java/com/sd/business/entity/order/dto/OrderDto.java
  12. 17 0
      sd-business/src/main/java/com/sd/business/entity/order/dto/OrderSelectDto.java
  13. 153 0
      sd-business/src/main/java/com/sd/business/entity/order/po/Order.java
  14. 17 0
      sd-business/src/main/java/com/sd/business/entity/order/vo/OrderVo.java
  15. 17 0
      sd-business/src/main/java/com/sd/business/entity/sku/dto/SkuClassifyDto.java
  16. 17 0
      sd-business/src/main/java/com/sd/business/entity/sku/dto/SkuClassifySelectDto.java
  17. 17 0
      sd-business/src/main/java/com/sd/business/entity/sku/dto/SkuDto.java
  18. 17 0
      sd-business/src/main/java/com/sd/business/entity/sku/dto/SkuSelectDto.java
  19. 82 0
      sd-business/src/main/java/com/sd/business/entity/sku/po/Sku.java
  20. 42 0
      sd-business/src/main/java/com/sd/business/entity/sku/po/SkuClassify.java
  21. 18 0
      sd-business/src/main/java/com/sd/business/entity/sku/po/SkuClassifyParam.java
  22. 17 0
      sd-business/src/main/java/com/sd/business/entity/sku/vo/SkuClassifyVo.java
  23. 17 0
      sd-business/src/main/java/com/sd/business/entity/sku/vo/SkuVo.java
  24. 17 0
      sd-business/src/main/java/com/sd/business/entity/supplier/dto/SupplierDto.java
  25. 17 0
      sd-business/src/main/java/com/sd/business/entity/supplier/dto/SupplierSelectDto.java
  26. 119 0
      sd-business/src/main/java/com/sd/business/entity/supplier/po/Supplier.java
  27. 17 0
      sd-business/src/main/java/com/sd/business/entity/supplier/vo/SupplierVo.java
  28. 32 0
      sd-business/src/main/java/com/sd/business/mapper/order/OrderMapper.java
  29. 32 0
      sd-business/src/main/java/com/sd/business/mapper/sku/SkuClassifyMapper.java
  30. 26 0
      sd-business/src/main/java/com/sd/business/mapper/sku/SkuMapper.java
  31. 26 0
      sd-business/src/main/java/com/sd/business/mapper/supplier/SupplierMapper.java
  32. 52 0
      sd-business/src/main/java/com/sd/business/service/order/OrderService.java
  33. 66 0
      sd-business/src/main/java/com/sd/business/service/order/impl/OrderServiceImpl.java
  34. 52 0
      sd-business/src/main/java/com/sd/business/service/sku/SkuClassifyService.java
  35. 46 0
      sd-business/src/main/java/com/sd/business/service/sku/SkuService.java
  36. 66 0
      sd-business/src/main/java/com/sd/business/service/sku/impl/SkuClassifyServiceImpl.java
  37. 57 0
      sd-business/src/main/java/com/sd/business/service/sku/impl/SkuServiceImpl.java
  38. 46 0
      sd-business/src/main/java/com/sd/business/service/supplier/SupplierService.java
  39. 57 0
      sd-business/src/main/java/com/sd/business/service/supplier/impl/SupplierServiceImpl.java
  40. 78 0
      sd-business/src/main/resources/mapper/order/OrderMapper.xml
  41. 32 0
      sd-business/src/main/resources/mapper/sku/SkuClassifyMapper.xml
  42. 27 0
      sd-business/src/main/resources/mapper/sku/SkuMapper.xml
  43. 34 0
      sd-business/src/main/resources/mapper/supplier/SupplierMapper.xml
  44. 105 0
      sd-wln/src/main/java/com/sd/wln/api/Signature.java
  45. 122 0
      sd-wln/src/main/java/com/sd/wln/api/WanliAPIConstant.java
  46. 30 0
      sd-wln/src/main/java/com/sd/wln/controller/WanliController.java
  47. 7 0
      sd-wln/src/main/java/com/sd/wln/service/WanliService.java
  48. 8 0
      sd-wln/src/main/java/com/sd/wln/service/WanliSkuService.java
  49. 92 0
      sd-wln/src/main/java/com/sd/wln/service/impl/WanliServiceImpl.java
  50. 26 0
      sd-wln/src/main/java/com/sd/wln/service/impl/WanliSkuServiceImpl.java

+ 4 - 0
sd-business/pom.xml

@@ -24,6 +24,10 @@
             <artifactId>sd-framework</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.sd</groupId>
+            <artifactId>sd-wln</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
sd-business/src/main/java/com/sd/business/a-json/ApplyBuyApi.json


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
sd-business/src/main/java/com/sd/business/a-json/OrderApi.json


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
sd-business/src/main/java/com/sd/business/a-json/SkuApi.json


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
sd-business/src/main/java/com/sd/business/a-json/SkuClassifyApi.json


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
sd-business/src/main/java/com/sd/business/a-json/SupplierApi.json


+ 77 - 0
sd-business/src/main/java/com/sd/business/controller/order/OrderController.java

@@ -0,0 +1,77 @@
+package com.sd.business.controller.order;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sd.business.entity.order.vo.OrderVo;
+import com.sd.business.entity.order.dto.OrderSelectDto;
+import com.sd.business.entity.order.dto.OrderDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.sd.business.service.order.OrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 订单 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-06-30
+ */
+@RestController
+@RequestMapping("/order")
+public class OrderController {
+
+    @Autowired
+    private OrderService orderService;
+
+    /**
+     * 订单列表
+     */
+    @PostMapping("/list")
+    public List<OrderVo> list(@RequestBody OrderSelectDto dto) {
+        return orderService.getList(dto);
+    }
+
+    /**
+     * 订单分页
+     */
+    @PostMapping("/page")
+    public Page<OrderVo> page(@RequestBody OrderSelectDto dto) {
+        return orderService.getPage(dto);
+    }
+
+    /**
+     * 订单明细
+     */
+    @PostMapping("/detail")
+    public OrderVo detail(@RequestBody BaseSelectDto dto) {
+        return orderService.detail(dto.getId());
+    }
+
+    /**
+     * 订单新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody OrderDto orderDto) {
+        orderService.add(orderDto);
+    }
+
+    /**
+     * 订单编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody OrderDto orderDto) {
+        orderService.edit(orderDto);
+    }
+
+    /**
+     * 订单删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        orderService.delete(dto.getId());
+    }
+
+}

+ 77 - 0
sd-business/src/main/java/com/sd/business/controller/sku/SkuClassifyController.java

@@ -0,0 +1,77 @@
+package com.sd.business.controller.sku;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sd.business.entity.sku.vo.SkuClassifyVo;
+import com.sd.business.entity.sku.dto.SkuClassifySelectDto;
+import com.sd.business.entity.sku.dto.SkuClassifyDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.sd.business.service.sku.SkuClassifyService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+/**
+ * <p>
+ * sku分类 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-03
+ */
+@RestController
+@RequestMapping("/skuClassify")
+public class SkuClassifyController {
+
+    @Autowired
+    private SkuClassifyService skuClassifyService;
+
+    /**
+     * sku分类列表
+     */
+    @PostMapping("/list")
+    public List<SkuClassifyVo> list() {
+        return skuClassifyService.getList();
+    }
+
+    /**
+     * sku分类分页
+     */
+    @PostMapping("/page")
+    public Page<SkuClassifyVo> page(@RequestBody SkuClassifySelectDto dto) {
+        return skuClassifyService.getPage(dto);
+    }
+
+    /**
+     * sku分类明细
+     */
+    @PostMapping("/detail")
+    public SkuClassifyVo detail(@RequestBody BaseSelectDto dto) {
+        return skuClassifyService.detail(dto.getId());
+    }
+
+    /**
+     * sku分类新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody SkuClassifyDto skuClassifyDto) {
+        skuClassifyService.add(skuClassifyDto);
+    }
+
+    /**
+     * sku分类编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody SkuClassifyDto skuClassifyDto) {
+        skuClassifyService.edit(skuClassifyDto);
+    }
+
+    /**
+     * sku分类删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        skuClassifyService.delete(dto.getId());
+    }
+
+}

+ 68 - 0
sd-business/src/main/java/com/sd/business/controller/sku/SkuController.java

@@ -0,0 +1,68 @@
+package com.sd.business.controller.sku;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sd.business.entity.sku.vo.SkuVo;
+import com.sd.business.entity.sku.dto.SkuSelectDto;
+import com.sd.business.entity.sku.dto.SkuDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.sd.business.service.sku.SkuService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * sku 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-03
+ */
+@RestController
+@RequestMapping("/sku")
+public class SkuController {
+
+    @Autowired
+    private SkuService skuService;
+
+    /**
+     * sku分页
+     */
+    @PostMapping("/page")
+    public Page<SkuVo> page(@RequestBody SkuSelectDto dto) {
+        return skuService.getPage(dto);
+    }
+
+    /**
+     * sku明细
+     */
+    @PostMapping("/detail")
+    public SkuVo detail(@RequestBody BaseSelectDto dto) {
+        return skuService.detail(dto.getId());
+    }
+
+    /**
+     * sku新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody SkuDto skuDto) {
+        skuService.add(skuDto);
+    }
+
+    /**
+     * sku编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody SkuDto skuDto) {
+        skuService.edit(skuDto);
+    }
+
+    /**
+     * sku删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        skuService.delete(dto.getId());
+    }
+
+}

+ 68 - 0
sd-business/src/main/java/com/sd/business/controller/supplier/SupplierController.java

@@ -0,0 +1,68 @@
+package com.sd.business.controller.supplier;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sd.business.entity.supplier.vo.SupplierVo;
+import com.sd.business.entity.supplier.dto.SupplierSelectDto;
+import com.sd.business.entity.supplier.dto.SupplierDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.sd.business.service.supplier.SupplierService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * 供应商 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-01
+ */
+@RestController
+@RequestMapping("/supplier")
+public class SupplierController {
+
+    @Autowired
+    private SupplierService supplierService;
+
+    /**
+     * 供应商分页
+     */
+    @PostMapping("/page")
+    public Page<SupplierVo> page(@RequestBody SupplierSelectDto dto) {
+        return supplierService.getPage(dto);
+    }
+
+    /**
+     * 供应商明细
+     */
+    @PostMapping("/detail")
+    public SupplierVo detail(@RequestBody BaseSelectDto dto) {
+        return supplierService.detail(dto.getId());
+    }
+
+    /**
+     * 供应商新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody SupplierDto supplierDto) {
+        supplierService.add(supplierDto);
+    }
+
+    /**
+     * 供应商编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody SupplierDto supplierDto) {
+        supplierService.edit(supplierDto);
+    }
+
+    /**
+     * 供应商删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        supplierService.delete(dto.getId());
+    }
+
+}

+ 17 - 0
sd-business/src/main/java/com/sd/business/entity/order/dto/OrderDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.order.dto;
+
+import com.sd.business.entity.order.po.Order;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 订单新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+public class OrderDto extends Order {
+
+}

+ 17 - 0
sd-business/src/main/java/com/sd/business/entity/order/dto/OrderSelectDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.order.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 订单列表查询入参实体
+ *
+ * @author 
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+public class OrderSelectDto extends BaseSelectDto {
+
+}

+ 153 - 0
sd-business/src/main/java/com/sd/business/entity/order/po/Order.java

@@ -0,0 +1,153 @@
+package com.sd.business.entity.order.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 订单
+ * </p>
+ *
+ * @author 
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+@TableName("order")
+public class Order extends BasePo {
+
+    /**
+     * 订单号
+     */
+    private String code;
+
+    /**
+     * 万里牛订单号
+     */
+    private String wlnCode;
+
+    /**
+     * 快递单号
+     */
+    private String expressDeliveryCode;
+
+    /**
+     * 进度 1草稿 2订单待确认 3图稿未设计 4图稿已设计 5生产中 6生产完成 7已发货 8退款中 9已退款 10订单无效 11订单删除审核中
+     */
+    private Integer schedule;
+
+    /**
+     * 结算状态 1未结算 2已对账 3已结算
+     */
+    private Integer settlementStatus;
+
+    /**
+     * 电商平台 字典:commerce_platform
+     */
+    private String commercePlatform;
+
+    /**
+     * 订单总金额
+     */
+    private BigDecimal totalAmount;
+
+    /**
+     * 产品总金额
+     */
+    private BigDecimal productTotalAmount;
+
+    /**
+     * 定制加工费
+     */
+    private BigDecimal customProcessingFee;
+
+    /**
+     * 代发费
+     */
+    private BigDecimal lssueFee;
+
+    /**
+     * 快递包材费
+     */
+    private BigDecimal deliveryMaterialsFee;
+
+    /**
+     * 包装人工费
+     */
+    private BigDecimal packingLabor;
+
+    /**
+     * 包材费
+     */
+    private BigDecimal packagingMaterialCost;
+
+    /**
+     * 交期
+     */
+    private Date deliveryTime;
+
+    /**
+     * 下单时间
+     */
+    private Date orderTime;
+
+    /**
+     * 发货时间
+     */
+    private Date shippingTime;
+
+    /**
+     * 收货人
+     */
+    private String consignee;
+
+    /**
+     * 收货人电话
+     */
+    private String consigneeNumber;
+
+    /**
+     * 省
+     */
+    private String province;
+
+    /**
+     * 市
+     */
+    private String city;
+
+    /**
+     * 县
+     */
+    private String county;
+
+    /**
+     * 详细地址
+     */
+    private String detailedAddress;
+
+    /**
+     * 邮编
+     */
+    private String postcode;
+
+    /**
+     * 事业部id
+     */
+    private Long departmentId;
+
+    /**
+     * 快递网点id
+     */
+    private String expressDeliveryId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

+ 17 - 0
sd-business/src/main/java/com/sd/business/entity/order/vo/OrderVo.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.order.vo;
+
+import com.sd.business.entity.order.po.Order;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 订单列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+public class OrderVo extends Order {
+
+}

+ 17 - 0
sd-business/src/main/java/com/sd/business/entity/sku/dto/SkuClassifyDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.sku.dto;
+
+import com.sd.business.entity.sku.po.SkuClassify;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * sku分类新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-07-03
+ */
+@Getter
+@Setter
+public class SkuClassifyDto extends SkuClassify {
+
+}

+ 17 - 0
sd-business/src/main/java/com/sd/business/entity/sku/dto/SkuClassifySelectDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.sku.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * sku分类列表查询入参实体
+ *
+ * @author 
+ * @since 2023-07-03
+ */
+@Getter
+@Setter
+public class SkuClassifySelectDto extends BaseSelectDto {
+
+}

+ 17 - 0
sd-business/src/main/java/com/sd/business/entity/sku/dto/SkuDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.sku.dto;
+
+import com.sd.business.entity.sku.po.Sku;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * sku新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-07-03
+ */
+@Getter
+@Setter
+public class SkuDto extends Sku {
+
+}

+ 17 - 0
sd-business/src/main/java/com/sd/business/entity/sku/dto/SkuSelectDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.sku.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * sku列表查询入参实体
+ *
+ * @author 
+ * @since 2023-07-03
+ */
+@Getter
+@Setter
+public class SkuSelectDto extends BaseSelectDto {
+
+}

+ 82 - 0
sd-business/src/main/java/com/sd/business/entity/sku/po/Sku.java

@@ -0,0 +1,82 @@
+package com.sd.business.entity.sku.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * sku
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-03
+ */
+@Getter
+@Setter
+@TableName("sku")
+public class Sku extends BasePo {
+
+    /**
+     * 来源 1自定义添加 2万里牛
+     */
+    private Integer source;
+
+    /**
+     * 类目id
+     */
+    private Long skuClassifyId;
+
+    /**
+     * 条码
+     */
+    private String barCode;
+
+    /**
+     * 群组品号
+     */
+    private String groupItemNumber;
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 品牌
+     */
+    private String brand;
+
+    /**
+     * 材质
+     */
+    private String material;
+
+    /**
+     * 型号
+     */
+    private String modelNumber;
+
+    /**
+     * 工艺产线id
+     */
+    private Long craftProductionLineId;
+
+    /**
+     * 产品主图
+     */
+    private String mainImgUrl;
+
+    /**
+     * 详细描述
+     */
+    private String detailText;
+
+}

+ 42 - 0
sd-business/src/main/java/com/sd/business/entity/sku/po/SkuClassify.java

@@ -0,0 +1,42 @@
+package com.sd.business.entity.sku.po;
+
+import com.ruoyi.common.core.domain.BasePo;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * sku分类
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-03
+ */
+@Getter
+@Setter
+@TableName("sku_classify")
+public class SkuClassify extends BasePo {
+
+    /**
+     * 上级分类id
+     */
+    private Long parentId;
+
+    /**
+     * 分类名称
+     */
+    private String name;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 所有父级id
+     */
+    private String ancestors;
+
+}

+ 18 - 0
sd-business/src/main/java/com/sd/business/entity/sku/po/SkuClassifyParam.java

@@ -0,0 +1,18 @@
+package com.sd.business.entity.sku.po;
+
+import com.sd.wln.api.Signature;
+
+/**
+ * @Author
+ * @Description //TODO
+ * @Date 2023年07月03日 15:01
+ **/
+
+public class SkuClassifyParam extends Signature {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 公司id(具体可以咨询下万里牛客服)
+     */
+    private String com_uid;
+}

+ 17 - 0
sd-business/src/main/java/com/sd/business/entity/sku/vo/SkuClassifyVo.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.sku.vo;
+
+import com.sd.business.entity.sku.po.SkuClassify;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * sku分类列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-07-03
+ */
+@Getter
+@Setter
+public class SkuClassifyVo extends SkuClassify {
+
+}

+ 17 - 0
sd-business/src/main/java/com/sd/business/entity/sku/vo/SkuVo.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.sku.vo;
+
+import com.sd.business.entity.sku.po.Sku;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * sku列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-07-03
+ */
+@Getter
+@Setter
+public class SkuVo extends Sku {
+
+}

+ 17 - 0
sd-business/src/main/java/com/sd/business/entity/supplier/dto/SupplierDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.supplier.dto;
+
+import com.sd.business.entity.supplier.po.Supplier;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 供应商新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-07-01
+ */
+@Getter
+@Setter
+public class SupplierDto extends Supplier {
+
+}

+ 17 - 0
sd-business/src/main/java/com/sd/business/entity/supplier/dto/SupplierSelectDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.supplier.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 供应商列表查询入参实体
+ *
+ * @author 
+ * @since 2023-07-01
+ */
+@Getter
+@Setter
+public class SupplierSelectDto extends BaseSelectDto {
+
+}

+ 119 - 0
sd-business/src/main/java/com/sd/business/entity/supplier/po/Supplier.java

@@ -0,0 +1,119 @@
+package com.sd.business.entity.supplier.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 供应商
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-01
+ */
+@Getter
+@Setter
+@TableName("supplier")
+public class Supplier extends BasePo {
+
+    /**
+     * 供应商名称
+     */
+    private String name;
+
+    /**
+     * 公司电话
+     */
+    private String companyTelephone;
+
+    /**
+     * 账期
+     */
+    private Integer paymentPeriod;
+
+    /**
+     * 省
+     */
+    private String province;
+
+    /**
+     * 市
+     */
+    private String city;
+
+    /**
+     * 详细地址
+     */
+    private String detailedAddress;
+
+    /**
+     * 税号
+     */
+    private String dutyNumber;
+
+    /**
+     * 联系人1
+     */
+    private String contactPerson1;
+
+    /**
+     * 联系人电话1
+     */
+    private String contactNumber1;
+
+    /**
+     * 联系人邮箱1
+     */
+    private String contactMailbox1;
+
+    /**
+     * 联系人2
+     */
+    private String contactPerson2;
+
+    /**
+     * 联系人电话2
+     */
+    private String contactNumber2;
+
+    /**
+     * 联系人邮箱2
+     */
+    private String contactMailbox2;
+
+    /**
+     * 联系人3
+     */
+    private String contactPerson3;
+
+    /**
+     * 联系人电话3
+     */
+    private String contactNumber3;
+
+    /**
+     * 联系人邮箱3
+     */
+    private String contactMailbox3;
+
+    /**
+     * 银行
+
+     */
+    private String bank;
+
+    /**
+     * 银行账户名
+
+     */
+    private String bankAccountName;
+
+    /**
+     * 银行账号
+     */
+    private String bankAccountNumber;
+
+}

+ 17 - 0
sd-business/src/main/java/com/sd/business/entity/supplier/vo/SupplierVo.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.supplier.vo;
+
+import com.sd.business.entity.supplier.po.Supplier;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 供应商列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-07-01
+ */
+@Getter
+@Setter
+public class SupplierVo extends Supplier {
+
+}

+ 32 - 0
sd-business/src/main/java/com/sd/business/mapper/order/OrderMapper.java

@@ -0,0 +1,32 @@
+package com.sd.business.mapper.order;
+
+import com.sd.business.entity.order.po.Order;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sd.business.entity.order.vo.OrderVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 订单 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-06-30
+ */
+public interface OrderMapper extends BaseMapper<Order> {
+
+    /**
+     * 订单列表
+     */
+    List<OrderVo> getList(@Param("ew") IWrapper<Order> wrapper);
+
+    /**
+     * 订单分页
+     */
+    Page<OrderVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<Order> wrapper);
+
+}

+ 32 - 0
sd-business/src/main/java/com/sd/business/mapper/sku/SkuClassifyMapper.java

@@ -0,0 +1,32 @@
+package com.sd.business.mapper.sku;
+
+import com.sd.business.entity.sku.po.SkuClassify;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sd.business.entity.sku.vo.SkuClassifyVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * sku分类 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-03
+ */
+public interface SkuClassifyMapper extends BaseMapper<SkuClassify> {
+
+    /**
+     * sku分类列表
+     */
+    List<SkuClassifyVo> getList(@Param("ew") IWrapper<SkuClassify> wrapper);
+
+    /**
+     * sku分类分页
+     */
+    Page<SkuClassifyVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<SkuClassify> wrapper);
+
+}

+ 26 - 0
sd-business/src/main/java/com/sd/business/mapper/sku/SkuMapper.java

@@ -0,0 +1,26 @@
+package com.sd.business.mapper.sku;
+
+import com.sd.business.entity.sku.po.Sku;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sd.business.entity.sku.vo.SkuVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * sku Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-03
+ */
+public interface SkuMapper extends BaseMapper<Sku> {
+
+    /**
+     * sku分页
+     */
+    Page<SkuVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<Sku> wrapper);
+
+}

+ 26 - 0
sd-business/src/main/java/com/sd/business/mapper/supplier/SupplierMapper.java

@@ -0,0 +1,26 @@
+package com.sd.business.mapper.supplier;
+
+import com.sd.business.entity.supplier.po.Supplier;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sd.business.entity.supplier.vo.SupplierVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 供应商 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-01
+ */
+public interface SupplierMapper extends BaseMapper<Supplier> {
+
+    /**
+     * 供应商分页
+     */
+    Page<SupplierVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<Supplier> wrapper);
+
+}

+ 52 - 0
sd-business/src/main/java/com/sd/business/service/order/OrderService.java

@@ -0,0 +1,52 @@
+package com.sd.business.service.order;
+
+import com.sd.business.entity.order.po.Order;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sd.business.entity.order.vo.OrderVo;
+import com.sd.business.entity.order.dto.OrderSelectDto;
+import com.sd.business.entity.order.dto.OrderDto;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 订单 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-06-30
+ */
+public interface OrderService extends BaseService<Order> {
+
+    /**
+     * 订单列表
+     */
+    List<OrderVo> getList(OrderSelectDto dto);
+
+    /**
+     * 订单分页
+     */
+    Page<OrderVo> getPage(OrderSelectDto dto);
+
+    /**
+     * 订单明细
+     */
+    OrderVo detail(Long id);
+
+    /**
+     * 订单新增
+     */
+    void add(OrderDto orderDto);
+
+    /**
+     * 订单编辑
+     */
+    void edit(OrderDto orderDto);
+
+    /**
+     * 订单删除
+     */
+    void delete(Long id);
+
+}

+ 66 - 0
sd-business/src/main/java/com/sd/business/service/order/impl/OrderServiceImpl.java

@@ -0,0 +1,66 @@
+package com.sd.business.service.order.impl;
+
+import com.sd.business.entity.order.po.Order;
+import com.sd.business.mapper.order.OrderMapper;
+import com.sd.business.service.order.OrderService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sd.business.entity.order.vo.OrderVo;
+import com.sd.business.entity.order.dto.OrderSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.order.dto.OrderDto;
+import cn.hutool.core.bean.BeanUtil;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 订单 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-06-30
+ */
+@Service
+public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService {
+
+    @Override
+    public List<OrderVo> getList(OrderSelectDto dto) {
+        IWrapper<Order> wrapper = getWrapper();
+        wrapper.orderByDesc("o", Order::getId);
+        List<OrderVo> list = this.baseMapper.getList(wrapper);
+        return list;
+    }
+
+    @Override
+    public Page<OrderVo> getPage(OrderSelectDto dto) {
+        IWrapper<Order> wrapper = getWrapper();
+        wrapper.orderByDesc("o", Order::getId);
+        Page<OrderVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public OrderVo detail(Long id) {
+        Order Order = this.getById(id);
+        OrderVo result = BeanUtil.toBean(Order, OrderVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(OrderDto orderDto) {
+        this.save(orderDto);
+    }
+
+    @Override
+    public void edit(OrderDto orderDto) {
+        this.updateById(orderDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

+ 52 - 0
sd-business/src/main/java/com/sd/business/service/sku/SkuClassifyService.java

@@ -0,0 +1,52 @@
+package com.sd.business.service.sku;
+
+import com.sd.business.entity.sku.po.SkuClassify;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sd.business.entity.sku.vo.SkuClassifyVo;
+import com.sd.business.entity.sku.dto.SkuClassifySelectDto;
+import com.sd.business.entity.sku.dto.SkuClassifyDto;
+
+import java.util.List;
+
+/**
+ * <p>
+ * sku分类 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-03
+ */
+public interface SkuClassifyService extends BaseService<SkuClassify> {
+
+    /**
+     * sku分类列表
+     */
+    List<SkuClassifyVo> getList();
+
+    /**
+     * sku分类分页
+     */
+    Page<SkuClassifyVo> getPage(SkuClassifySelectDto dto);
+
+    /**
+     * sku分类明细
+     */
+    SkuClassifyVo detail(Long id);
+
+    /**
+     * sku分类新增
+     */
+    void add(SkuClassifyDto skuClassifyDto);
+
+    /**
+     * sku分类编辑
+     */
+    void edit(SkuClassifyDto skuClassifyDto);
+
+    /**
+     * sku分类删除
+     */
+    void delete(Long id);
+
+}

+ 46 - 0
sd-business/src/main/java/com/sd/business/service/sku/SkuService.java

@@ -0,0 +1,46 @@
+package com.sd.business.service.sku;
+
+import com.sd.business.entity.sku.po.Sku;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sd.business.entity.sku.vo.SkuVo;
+import com.sd.business.entity.sku.dto.SkuSelectDto;
+import com.sd.business.entity.sku.dto.SkuDto;
+
+
+/**
+ * <p>
+ * sku 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-03
+ */
+public interface SkuService extends BaseService<Sku> {
+
+    /**
+     * sku分页
+     */
+    Page<SkuVo> getPage(SkuSelectDto dto);
+
+    /**
+     * sku明细
+     */
+    SkuVo detail(Long id);
+
+    /**
+     * sku新增
+     */
+    void add(SkuDto skuDto);
+
+    /**
+     * sku编辑
+     */
+    void edit(SkuDto skuDto);
+
+    /**
+     * sku删除
+     */
+    void delete(Long id);
+
+}

+ 66 - 0
sd-business/src/main/java/com/sd/business/service/sku/impl/SkuClassifyServiceImpl.java

@@ -0,0 +1,66 @@
+package com.sd.business.service.sku.impl;
+
+import com.sd.business.entity.sku.po.SkuClassify;
+import com.sd.business.mapper.sku.SkuClassifyMapper;
+import com.sd.business.service.sku.SkuClassifyService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sd.business.entity.sku.vo.SkuClassifyVo;
+import com.sd.business.entity.sku.dto.SkuClassifySelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.sku.dto.SkuClassifyDto;
+import cn.hutool.core.bean.BeanUtil;
+
+import java.util.List;
+
+/**
+ * <p>
+ * sku分类 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-03
+ */
+@Service
+public class SkuClassifyServiceImpl extends ServiceImpl<SkuClassifyMapper, SkuClassify> implements SkuClassifyService {
+
+    @Override
+    public List<SkuClassifyVo> getList() {
+        IWrapper<SkuClassify> wrapper = getWrapper();
+        wrapper.orderByDesc("sc", SkuClassify::getId);
+        List<SkuClassifyVo> list = this.baseMapper.getList(wrapper);
+        return list;
+    }
+
+    @Override
+    public Page<SkuClassifyVo> getPage(SkuClassifySelectDto dto) {
+        IWrapper<SkuClassify> wrapper = getWrapper();
+        wrapper.orderByDesc("sc", SkuClassify::getId);
+        Page<SkuClassifyVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public SkuClassifyVo detail(Long id) {
+        SkuClassify SkuClassify = this.getById(id);
+        SkuClassifyVo result = BeanUtil.toBean(SkuClassify, SkuClassifyVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(SkuClassifyDto skuClassifyDto) {
+        this.save(skuClassifyDto);
+    }
+
+    @Override
+    public void edit(SkuClassifyDto skuClassifyDto) {
+        this.updateById(skuClassifyDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

+ 57 - 0
sd-business/src/main/java/com/sd/business/service/sku/impl/SkuServiceImpl.java

@@ -0,0 +1,57 @@
+package com.sd.business.service.sku.impl;
+
+import com.sd.business.entity.sku.po.Sku;
+import com.sd.business.mapper.sku.SkuMapper;
+import com.sd.business.service.sku.SkuService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sd.business.entity.sku.vo.SkuVo;
+import com.sd.business.entity.sku.dto.SkuSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.sku.dto.SkuDto;
+import cn.hutool.core.bean.BeanUtil;
+
+
+/**
+ * <p>
+ * sku 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-03
+ */
+@Service
+public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements SkuService {
+
+    @Override
+    public Page<SkuVo> getPage(SkuSelectDto dto) {
+        IWrapper<Sku> wrapper = getWrapper();
+        wrapper.orderByDesc("s", Sku::getId);
+        Page<SkuVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public SkuVo detail(Long id) {
+        Sku Sku = this.getById(id);
+        SkuVo result = BeanUtil.toBean(Sku, SkuVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(SkuDto skuDto) {
+        this.save(skuDto);
+    }
+
+    @Override
+    public void edit(SkuDto skuDto) {
+        this.updateById(skuDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

+ 46 - 0
sd-business/src/main/java/com/sd/business/service/supplier/SupplierService.java

@@ -0,0 +1,46 @@
+package com.sd.business.service.supplier;
+
+import com.sd.business.entity.supplier.po.Supplier;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sd.business.entity.supplier.vo.SupplierVo;
+import com.sd.business.entity.supplier.dto.SupplierSelectDto;
+import com.sd.business.entity.supplier.dto.SupplierDto;
+
+
+/**
+ * <p>
+ * 供应商 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-01
+ */
+public interface SupplierService extends BaseService<Supplier> {
+
+    /**
+     * 供应商分页
+     */
+    Page<SupplierVo> getPage(SupplierSelectDto dto);
+
+    /**
+     * 供应商明细
+     */
+    SupplierVo detail(Long id);
+
+    /**
+     * 供应商新增
+     */
+    void add(SupplierDto supplierDto);
+
+    /**
+     * 供应商编辑
+     */
+    void edit(SupplierDto supplierDto);
+
+    /**
+     * 供应商删除
+     */
+    void delete(Long id);
+
+}

+ 57 - 0
sd-business/src/main/java/com/sd/business/service/supplier/impl/SupplierServiceImpl.java

@@ -0,0 +1,57 @@
+package com.sd.business.service.supplier.impl;
+
+import com.sd.business.entity.supplier.po.Supplier;
+import com.sd.business.mapper.supplier.SupplierMapper;
+import com.sd.business.service.supplier.SupplierService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sd.business.entity.supplier.vo.SupplierVo;
+import com.sd.business.entity.supplier.dto.SupplierSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.supplier.dto.SupplierDto;
+import cn.hutool.core.bean.BeanUtil;
+
+
+/**
+ * <p>
+ * 供应商 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-01
+ */
+@Service
+public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> implements SupplierService {
+
+    @Override
+    public Page<SupplierVo> getPage(SupplierSelectDto dto) {
+        IWrapper<Supplier> wrapper = getWrapper();
+        wrapper.orderByDesc("s", Supplier::getId);
+        Page<SupplierVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public SupplierVo detail(Long id) {
+        Supplier Supplier = this.getById(id);
+        SupplierVo result = BeanUtil.toBean(Supplier, SupplierVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(SupplierDto supplierDto) {
+        this.save(supplierDto);
+    }
+
+    @Override
+    public void edit(SupplierDto supplierDto) {
+        this.updateById(supplierDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

+ 78 - 0
sd-business/src/main/resources/mapper/order/OrderMapper.xml

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sd.business.mapper.order.OrderMapper">
+    <select id="getList" resultType="com.sd.business.entity.order.vo.OrderVo">
+        select
+            o.id,
+            o.code,
+            o.wln_code,
+            o.express_delivery_code,
+            o.schedule,
+            o.settlement_status,
+            o.commerce_platform,
+            o.total_amount,
+            o.product_total_amount,
+            o.custom_processing_fee,
+            o.lssue_fee,
+            o.delivery_materials_fee,
+            o.packing_labor,
+            o.packaging_material_cost,
+            o.delivery_time,
+            o.order_time,
+            o.shipping_time,
+            o.consignee,
+            o.consignee_number,
+            o.province,
+            o.city,
+            o.county,
+            o.detailed_address,
+            o.postcode,
+            o.department_id,
+            o.express_delivery_id,
+            o.remark,
+            o.create_user,
+            o.create_time,
+            o.update_user,
+            o.update_time
+        from order o
+            ${ew.customSqlSegment}
+    </select>
+
+    <select id="getPage" resultType="com.sd.business.entity.order.vo.OrderVo">
+        select
+            o.id,
+            o.code,
+            o.wln_code,
+            o.express_delivery_code,
+            o.schedule,
+            o.settlement_status,
+            o.commerce_platform,
+            o.total_amount,
+            o.product_total_amount,
+            o.custom_processing_fee,
+            o.lssue_fee,
+            o.delivery_materials_fee,
+            o.packing_labor,
+            o.packaging_material_cost,
+            o.delivery_time,
+            o.order_time,
+            o.shipping_time,
+            o.consignee,
+            o.consignee_number,
+            o.province,
+            o.city,
+            o.county,
+            o.detailed_address,
+            o.postcode,
+            o.department_id,
+            o.express_delivery_id,
+            o.remark,
+            o.create_user,
+            o.create_time,
+            o.update_user,
+            o.update_time
+        from order o
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

+ 32 - 0
sd-business/src/main/resources/mapper/sku/SkuClassifyMapper.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sd.business.mapper.sku.SkuClassifyMapper">
+    <select id="getList" resultType="com.sd.business.entity.sku.vo.SkuClassifyVo">
+        select
+            sc.id,
+            sc.parent_id,
+            sc.name,
+            sc.sort,
+            sc.create_user,
+            sc.create_time,
+            sc.update_user,
+            sc.update_time
+        from sku_classify sc
+            ${ew.customSqlSegment}
+    </select>
+
+    <select id="getPage" resultType="com.sd.business.entity.sku.vo.SkuClassifyVo">
+        select
+            sc.id,
+            sc.parent_id,
+            sc.name,
+            sc.sort,
+            sc.create_user,
+            sc.create_time,
+            sc.update_user,
+            sc.update_time
+        from sku_classify sc
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

+ 27 - 0
sd-business/src/main/resources/mapper/sku/SkuMapper.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sd.business.mapper.sku.SkuMapper">
+    <select id="getPage" resultType="com.sd.business.entity.sku.vo.SkuVo">
+        select
+            s.id,
+            s.source,
+            s.sku_classify_id,
+            s.bar_code,
+            s.group_item_number,
+            s.code,
+            s.name,
+            s.brand,
+            s.material,
+            s.model_number,
+            s.craft_production_line_id,
+            s.main_img_url,
+            s.detail_text,
+            s.create_user,
+            s.create_time,
+            s.update_user,
+            s.update_time
+        from sku s
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

+ 34 - 0
sd-business/src/main/resources/mapper/supplier/SupplierMapper.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sd.business.mapper.supplier.SupplierMapper">
+    <select id="getPage" resultType="com.sd.business.entity.supplier.vo.SupplierVo">
+        select
+            s.id,
+            s.name,
+            s.company_telephone,
+            s.payment_period,
+            s.province,
+            s.city,
+            s.detailed_address,
+            s.duty_number,
+            s.contact_person1,
+            s.contact_number1,
+            s.contact_mailbox1,
+            s.contact_person2,
+            s.contact_number2,
+            s.contact_mailbox2,
+            s.contact_person3,
+            s.contact_number3,
+            s.contact_mailbox3,
+            s.bank,
+            s.bank_account_name,
+            s.bank_account_number,
+            s.create_user,
+            s.create_time,
+            s.update_user,
+            s.update_time
+        from supplier s
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

+ 105 - 0
sd-wln/src/main/java/com/sd/wln/api/Signature.java

@@ -0,0 +1,105 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.sd.wln.api;
+
+import com.ruoyi.common.utils.sign.Md5Utils;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 签名参数实体类
+ *
+ * @author BladeX
+ * @since 2022-8-03
+ */
+@Data
+public class Signature implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 请求键值
+     */
+    private String _app;
+
+    /**
+     * 时间戳
+     */
+    private Long _t;
+
+    /**
+     * 签名方法,支持 md5 和 hmac,默认 md5
+     */
+    private String _sign_kind;
+
+    /**
+     * 请求签名
+     */
+    private String _sign;
+
+    /**
+     * 授权码
+     */
+    private String _s;
+
+    /**
+     * 当前页码,从1开始
+     */
+    private Integer page;
+
+    /**
+     * 每页大小,最大200
+     */
+    private Integer limit;
+
+    /**
+     * 每页大小,最大200
+     */
+    private Long start_time;
+
+    public void setNull(){
+        //清空参数
+        this._app = null;
+        this._t = null;
+        this._sign = null;
+        this._sign_kind = null;
+        this._s = null;
+    }
+    /**
+     * 生成签名
+     */
+    public void generate(String param) {
+        long time = System.currentTimeMillis();
+        String p = WanliAPIConstant.BASIC_KEY.APP_SECRET
+                + "_app="+WanliAPIConstant.BASIC_KEY.APP_KEY+"&"
+                + "_t="+time+"&"
+                + param
+                + WanliAPIConstant.BASIC_KEY.APP_SECRET;
+        set_app(WanliAPIConstant.BASIC_KEY.APP_KEY);
+        set_sign(Md5Utils.hash(p));
+        set_t(time);
+    }
+
+    /**
+     * 默认分页
+     */
+    public void defaultPage() {
+        this.page = 1;
+        this.limit = 200;
+    }
+}

+ 122 - 0
sd-wln/src/main/java/com/sd/wln/api/WanliAPIConstant.java

@@ -0,0 +1,122 @@
+package com.sd.wln.api;
+
+/**
+ * 万里牛常量
+ */
+public class WanliAPIConstant {
+
+    private static final String PREFIX = "https://open-api.hupun.com/api/";
+
+    /**
+     * 密钥相关
+     */
+    public static class BASIC_KEY {
+        /**
+         * 生产密钥key
+         */
+        public static final String APP_KEY = "3923521627";
+//        /**
+//         * 测试密钥key
+//         */
+//        public static final String APP_KEY = "3823532979";
+
+        /**
+         * 生产密钥key
+         */
+        public static final String APP_SECRET = "ee6f90783e1c3ba72098137e9a6e8ec3";
+
+//        /**
+//         * 测试密钥key
+//         */
+//        public static final String APP_SECRET = "ea5b29320cb3d15a9883c1fa4654bd02";
+
+    }
+
+    /**
+     * 文件相关API
+     */
+    public static class FILE_API {
+        //批量创建文件夹
+        public static final String createBatchFile =  "http://192.168.2.201:8125/saas/file/operationFile/insertMkDir";
+
+        //创建文件夹
+        public static final String insertFolder =  "http://192.168.2.201:8125/saas/file/operationFile/insertFolder";
+
+        //删除文件夹
+        public static final String deleteFile =  "http://192.168.2.201:8125/saas/file/operationFile/deleteFile";
+
+        //判断路径下是否存在文件夹或者文件
+        public static final String isNoFile =  "http://192.168.2.201:8125/saas/file/operationFile/isNoFile";
+
+        //读取共享文件夹下文件详情
+        public static final String getFileDetails =  "http://192.168.2.201:8125/saas/file/operationFile/getFileDetails";
+
+        //读取共享文件夹下文件名称
+        public static final String getFileName =  "http://192.168.2.201:8125/saas/file/operationFile/getFileName";
+
+        //下载文件到指定文件夹
+        public static final String  downloadFileToFolder =  "http://192.168.2.201:8125/saas/file/operationFile/downloadFileToFolder";
+
+        //判断路径下是否存在文件夹或者文件
+        public static final String checkFile =  "http://192.168.2.201:8125/saas/file/operationFile/isNoFile";
+
+        //实现文件夹的复制功能
+        public static final String copeFile =  "http://192.168.2.201:8125/saas/file/operationFile/copeFile";
+    }
+    /**
+     * 销售相关API
+     */
+    public static class MARKET_API {
+        /**
+         * 查询订单;任意查询时间,查询范围与当前时间对比不能超过3个月;
+         * 任意查询时间,单次查询的开始时间与结束时间不能超过7天;
+         * 非bill_code查询,其他查询条件时间参数不能为空;
+         * 查询范围返回订单条数不能超过10000,如果超过需要缩小范围再次查询;
+         * 接口涉及客户敏感信息字段一律返回为空处理.对外开放
+         */
+        public static final String getTrades = PREFIX + "erp/opentrade/list/trades";
+
+        /**
+         * 描述:查询万里牛系统售后单;查询维度不能超过当前时间三个月,
+         * 接口仅支持返回七天的数据;bill_code与时间参数不能同时为空;
+         * 接口涉及客户敏感信息字段一律返回为空处理.对外开放
+         */
+        public static final String getReturnOrder = PREFIX + "erp/open/return/order/list";
+    }
+
+
+    /**
+     * 商品相关API
+     */
+    public static class GOODS_API {
+        /**
+         * 获取商品分类
+         */
+        public static final String getGoodsCatagory = PREFIX + "/erp/goods/catagory/query";
+
+        /**
+         * 查询商品规格列表,spec_code,item_code,modify_time,bar_code至少一个不能为空——对外开放
+         */
+        public static final String getGoods = PREFIX + "erp/goods/spec/open/query/goodswithspeclist";
+
+        /**
+         * 库存同步,将万里牛ERP的库存覆盖同步(一次性支持80个sku);
+         */
+        public static final String inventorySyn = PREFIX + "erp/open/inventory/syn";
+    }
+    /**
+     * 基础信息API
+     */
+    public static class BASIC_API {
+        /**
+         * 查询商品规格集合编码,其中spec_code,item_code,modify_time,bar_code不能同时为空——对外开放
+         */
+        public static final String getGoodsSpec = PREFIX + "erp/goods/spec/open/query";
+
+        /**
+         * 获取商品对应关系,以规格列表形式返回;shop_name和shop_nick不能同时为空
+         */
+        public static final String getGoodsRelation = PREFIX + "erp/goods/item/correspondence";
+    }
+
+}

+ 30 - 0
sd-wln/src/main/java/com/sd/wln/controller/WanliController.java

@@ -0,0 +1,30 @@
+package com.sd.wln.controller;
+
+import com.ruoyi.common.core.domain.R;
+import com.sd.business.entity.sku.po.SkuClassify;
+import com.sd.business.entity.sku.po.SkuClassifyParam;
+import com.sd.wln.service.WanliService;
+import org.apache.http.client.HttpClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author
+ * @Description //TODO
+ * @Date 2023年07月03日 14:36
+ **/
+@RestController
+@RequestMapping("/wanli")
+public class WanliController {
+
+    @Autowired
+    WanliService wanliService;
+
+    @PostMapping("/importSku")
+    public R importSku(@RequestBody SkuClassifyParam param){
+        return R.ok(wanliService.importSku(param));
+    }
+}

+ 7 - 0
sd-wln/src/main/java/com/sd/wln/service/WanliService.java

@@ -0,0 +1,7 @@
+package com.sd.wln.service;
+
+import com.sd.business.entity.sku.po.SkuClassifyParam;
+
+public interface WanliService {
+    Integer importSku(SkuClassifyParam param);
+}

+ 8 - 0
sd-wln/src/main/java/com/sd/wln/service/WanliSkuService.java

@@ -0,0 +1,8 @@
+package com.sd.wln.service;
+
+import cn.hutool.json.JSONObject;
+import com.sd.business.entity.sku.po.SkuClassifyParam;
+
+public interface WanliSkuService {
+    JSONObject getSkuClassIfy(SkuClassifyParam param);
+}

+ 92 - 0
sd-wln/src/main/java/com/sd/wln/service/impl/WanliServiceImpl.java

@@ -0,0 +1,92 @@
+package com.sd.wln.service.impl;
+
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.alibaba.nacos.shaded.com.google.common.base.Joiner;
+import com.sd.business.entity.sku.po.SkuClassifyParam;
+import com.sd.business.entity.sku.vo.SkuClassifyVo;
+import com.sd.business.service.sku.SkuClassifyService;
+import com.sd.wln.service.WanliService;
+import com.sd.wln.service.WanliSkuService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @Author
+ * @Description //TODO
+ * @Date 2023年07月03日 14:37
+ **/
+
+public class WanliServiceImpl implements WanliService {
+    @Autowired
+    SkuClassifyService skuClassifyService;
+    @Autowired
+    WanliSkuService wanliSkuService;
+
+    @Override
+    public Integer importSku(SkuClassifyParam param) {
+        List<SkuClassifyVo> skuClassifyList = skuClassifyService.getList();
+        List<Long> ids = skuClassifyList.stream().map(SkuClassifyVo::getId).collect(Collectors.toList());
+        JSONObject jsonObject = wanliSkuService.getSkuClassIfy(param);
+        JSONArray dataArray = JSONUtil.parseArray(jsonObject.get("data"));
+        List<SkuClassifyVo> skuClassifyVoList = new ArrayList<>();
+        for (int i=0;i<dataArray.size();i++){
+            SkuClassifyVo skuClassifyVo = new SkuClassifyVo();
+            JSONObject data = JSONUtil.parseObj(dataArray.get(i));
+            if(data.containsKey("catagoryid")){
+                skuClassifyVo.setId((Long) data.get("catagoryid"));
+            }
+            if(data.containsKey("catagory_name")){
+                skuClassifyVo.setName(data.get("catagory_name").toString());
+            }
+            if(data.containsKey("parentid")){
+                skuClassifyVo.setParentId((Long) data.get("parentid"));
+            }else{
+                skuClassifyVo.setParentId(0L);
+            }
+            skuClassifyVo.setCreateTime(new Date());
+            if(!ids.contains(skuClassifyVo.getId())){
+                skuClassifyVoList.add(skuClassifyVo);
+            }
+        }
+        for (SkuClassifyVo s:skuClassifyVoList){
+            List<Long> parentCategory = getParentCategory(s.getId(), skuClassifyVoList);
+            s.setAncestors(Joiner.on(",").join(parentCategory));
+        }
+
+        return null;
+    }
+
+
+    /**
+     * 获取当前节点得所有父级ID
+     * @param id
+     * @param skuClassifyVoList
+     * @return
+     */
+    private static List<Long> getParentCategory(Long id, List<SkuClassifyVo> skuClassifyVoList) {
+        //递归获取父级ids,不包含自己
+        List<Long> parentIds = new ArrayList<>();
+        parentIds.add(0L);
+        getParentTaxCompanyIds(skuClassifyVoList, id, parentIds);
+        return parentIds;
+    }
+
+    private static void getParentTaxCompanyIds(List<SkuClassifyVo> skuClassifyVos, Long id, List<Long> parentIds) {
+        for (SkuClassifyVo taxCompany : skuClassifyVos) {
+            if (taxCompany.getParentId()==0) {
+                continue;
+            }
+            //判断是否有父节点
+            if (id.equals(taxCompany.getId())) {
+                parentIds.add(taxCompany.getParentId());
+                getParentTaxCompanyIds(skuClassifyVos, taxCompany.getParentId(), parentIds);
+            }
+        }
+    }
+}

+ 26 - 0
sd-wln/src/main/java/com/sd/wln/service/impl/WanliSkuServiceImpl.java

@@ -0,0 +1,26 @@
+package com.sd.wln.service.impl;
+
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.ruoyi.common.utils.MapUtil;
+import com.ruoyi.common.utils.http.HttpUtils;
+import com.sd.business.entity.sku.po.SkuClassifyParam;
+import com.sd.wln.api.WanliAPIConstant;
+import com.sd.wln.service.WanliSkuService;
+
+/**
+ * @Author
+ * @Description //TODO
+ * @Date 2023年07月03日 15:29
+ **/
+
+public class WanliSkuServiceImpl implements WanliSkuService {
+
+    @Override
+    public JSONObject getSkuClassIfy(SkuClassifyParam param) {
+        param.generate(MapUtil.createLinkString(MapUtil.beanToMap(param)));
+        String skuResult = HttpUtils.sendPost(WanliAPIConstant.GOODS_API.getGoodsCatagory, MapUtil.beanToMap(param));
+        JSONObject jsonObject = JSONUtil.parseObj(skuResult);
+        return jsonObject;
+    }
+}

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно