销售订单

src/main/java/com/dk/mdm/controller/sale/OrderController.java

@@ -1,18 +1,22 @@
 package com.dk.mdm.controller.sale;
 
+import com.dk.common.model.pojo.PageList;
+import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.model.pojo.sale.Order;
-import com.dk.common.controller.BaseController;
 import com.dk.common.service.BaseService;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.dk.mdm.model.query.sale.OrderQuery;
+import com.dk.mdm.model.response.sale.OrderResponse;
+import com.dk.mdm.model.vo.sale.OrderVO;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RestController;
 import io.swagger.annotations.Api;
 import com.dk.mdm.service.sale.OrderService;
 
 @Api(tags = "销售订单API接口")
 @RestController
-@RequestMapping("/order")
-public class OrderController{
+@RequestMapping("/sale/order")
+public class OrderController {
 
     public BaseService<Order> getService() {
         return orderService;
@@ -21,4 +25,47 @@ public class OrderController{
     @Autowired
     private OrderService orderService;
 
+    /**
+     * @desc : 条件查询
+     * @author : 付斌
+     * @date : 2023/1/9 10:36
+     */
+    @ApiOperation(value = "分页、关联、条件查询", notes = "分页、关联、条件查询")
+    @PostMapping({"list_by"})
+    public ResponseResultVO<PageList<OrderResponse>> selectByCond(@RequestBody OrderQuery orderQuery) {
+        return orderService.selectByCond(orderQuery);
+    }
+
+    /**
+     * @desc : 通过ID查询
+     * @author : 付斌
+     * @date : 2023/1/9 10:41
+     */
+    @PostMapping({"/{id}"})
+    public ResponseResultVO selectById(@PathVariable String id) {
+        return orderService.selectById(id);
+    }
+
+
+    /**
+     * @desc : 新建员工
+     * @author : 付斌
+     * @date : 2023/1/9 10:48
+     */
+    @ApiOperation(value = "新建员工", notes = "新建员工")
+    @PostMapping({"insert"})
+    public ResponseResultVO<?> insert(@RequestBody OrderVO orderVO) {
+        return orderService.insert(orderVO);
+    }
+
+    /**
+     * @desc : 编辑员工
+     * @author : 付斌
+     * @date : 2023/1/9 10:49
+     */
+    @ApiOperation(value = "编辑员工", notes = "编辑员工")
+    @PostMapping({"update"})
+    public ResponseResultVO<Boolean> update(@RequestBody OrderVO orderVO) {
+        return orderService.update(orderVO);
+    }
 }

src/main/java/com/dk/mdm/infrastructure/convert/sale/OrderConvert.java

@@ -0,0 +1,22 @@
+package com.dk.mdm.infrastructure.convert.sale;
+
+import com.dk.mdm.model.pojo.sale.Order;
+import com.dk.mdm.model.vo.sale.OrderVO;
+import org.mapstruct.Mapper;
+
+/**
+ * @desc   : Order转换类
+ * @author : 付斌
+ * @date   : 2024-02-28 10:18
+ */
+@Mapper(componentModel = "spring")
+public interface OrderConvert {
+
+    /**
+     * @desc   : 转换vo为pojo
+     * @author : admin
+     * @date   : 2023/1/9 10:37
+     */
+    Order convertToPo(OrderVO orderVO);
+
+}

src/main/java/com/dk/mdm/mapper/sale/OrderMapper.java

@@ -2,13 +2,29 @@ package com.dk.mdm.mapper.sale;
 
 import com.dk.mdm.model.pojo.sale.Order;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.query.sale.OrderQuery;
+import com.dk.mdm.model.response.sale.OrderResponse;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
 *  销售订单 Mapper
 */
 @Repository
 public interface OrderMapper extends BaseMapper<Order>{
-	
+    /**
+     * @desc   : 根据条件进行查询
+     * @author : 付斌
+     * @date   : 2024-02-28 10:18
+     */
+    List<OrderResponse> selectByCond(OrderQuery orderQuery);
+
+    /**
+     * @desc   : 根据条件进行查询（数量）
+     * @author : 付斌
+     * @date   : 2024-02-28 10:19
+     */
+    Long countByCond(OrderQuery orderQuery);
 }
 

src/main/java/com/dk/mdm/model/pojo/sale/Order.java

@@ -18,6 +18,7 @@ import io.swagger.annotations.ApiModelProperty;
 import com.alibaba.fastjson.JSONObject;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.List;
 import java.time.LocalDateTime;
 
@@ -162,9 +163,9 @@ public class Order extends PageInfo<Order> implements Serializable {
      */
     @Excel(name = "送货日期")
     @ApiModelProperty(value = "送货日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime deliveryDate;
+    private LocalDate deliveryDate;
 
 
     /**

src/main/java/com/dk/mdm/model/query/sale/OrderQuery.java

@@ -22,6 +22,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -165,9 +166,9 @@ public class OrderQuery extends PageInfo<OrderQuery> implements Serializable {
      */
     @Excel(name = "送货日期")
     @ApiModelProperty(value = "送货日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime deliveryDate;
+    private LocalDate deliveryDate;
 
 
     /**

src/main/java/com/dk/mdm/model/response/sale/OrderResponse.java

@@ -22,6 +22,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -165,9 +166,9 @@ public class OrderResponse extends PageInfo<OrderResponse> implements Serializab
      */
     @Excel(name = "送货日期")
     @ApiModelProperty(value = "送货日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime deliveryDate;
+    private LocalDate deliveryDate;
 
 
     /**

src/main/java/com/dk/mdm/model/vo/sale/OrderVO.java

@@ -22,6 +22,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -165,9 +166,9 @@ public class OrderVO extends PageInfo<OrderVO> implements Serializable {
      */
     @Excel(name = "送货日期")
     @ApiModelProperty(value = "送货日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime deliveryDate;
+    private LocalDate deliveryDate;
 
 
     /**

src/main/java/com/dk/mdm/service/sale/OrderService.java

@@ -1,13 +1,25 @@
 package com.dk.mdm.service.sale;
 
-import com.dk.mdm.model.pojo.sale.Order;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.dk.common.infrastructure.annotaiton.Pagination;
+import com.dk.common.model.pojo.PageList;
+import com.dk.common.response.ResponseResultUtil;
+import com.dk.common.response.ResponseResultVO;
+import com.dk.mdm.infrastructure.convert.sale.OrderConvert;
 import com.dk.mdm.mapper.sale.OrderMapper;
+import com.dk.mdm.model.pojo.sale.Order;
 import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.query.sale.OrderQuery;
+import com.dk.mdm.model.response.sale.OrderResponse;
+import com.dk.mdm.model.vo.sale.OrderVO;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+import java.util.UUID;
+
 @Service
 @Transactional
 public class OrderService extends BaseService<Order> {
@@ -17,7 +29,59 @@ public class OrderService extends BaseService<Order> {
 		return orderMapper;
 	}
 
+	/**
+	 * @desc   : 重写主键
+	 * @author : 付斌
+	 * @date   : 2023/1/9 10:39
+	 */
+	@Override
+	public String getPrimaryKey() {
+		return "order_id";
+	}
+
 	@Autowired
 	private OrderMapper orderMapper;
 
+	@Autowired
+	private OrderConvert orderConvert;
+
+	/**
+	 * @desc   : 条件查询
+	 * @author : 付斌
+	 * @date   : 2023/1/9 10:40
+	 */
+	@Pagination
+	public ResponseResultVO<PageList<OrderResponse>> selectByCond(OrderQuery orderQuery) {
+		return super.mergeListWithCount(orderQuery, orderMapper.selectByCond(orderQuery),
+				orderMapper.countByCond(orderQuery));
+	}
+
+	/**
+	 * @desc   : 保存方法
+	 * @author : 付斌
+	 * @date   : 2023/1/9 10:49
+	 */
+	@Transactional(
+			rollbackFor = {Exception.class}
+	)
+	public ResponseResultVO<?> insert(OrderVO orderVO) {
+		// 转化实体
+		Order order = orderConvert.convertToPo(orderVO);
+		return super.insert(order);
+	}
+
+	/**
+	 * @desc   : 编辑方法
+	 * @author : 付斌
+	 * @date   : 2023/1/9 10:49
+	 */
+	@Transactional(
+			rollbackFor = {Exception.class}
+	)
+	public ResponseResultVO<Boolean> update(OrderVO orderVO) {
+		// 转化实体
+		Order order = orderConvert.convertToPo(orderVO);
+		return ResponseResultUtil.success(super.update(order,new UpdateWrapper<Order>().lambda().eq(Order::getOrderId,
+				UUID.fromString(order.getOrderId())))) ;
+	}
 }