销售订单

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

@@ -13,6 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import io.swagger.annotations.Api;
 import com.dk.mdm.service.sale.OrderService;
 
+import java.util.Map;
+
 @Api(tags = "销售订单API接口")
 @RestController
 @RequestMapping("/sale/order")
@@ -37,6 +39,16 @@ public class OrderController {
     }
 
     /**
+     * @desc   :查询订单明细（货物、收款、附件）
+     * @author : 付斌
+     * @date   : 2024-02-28 13:24
+     */
+    @PostMapping({"select_order_item_by_id/{id}"})
+    public ResponseResultVO<Map<String, Object>> selectOrderItemById(@PathVariable String id) {
+        return orderService.selectOrderItemById(id);
+    }
+
+    /**
      * @desc : 通过ID查询
      * @author : 付斌
      * @date : 2023/1/9 10:41

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

@@ -11,7 +11,7 @@ import com.dk.mdm.service.sale.OrderItemService;
 
 @Api(tags = "销售明细API接口")
 @RestController
-@RequestMapping("/orderItem")
+@RequestMapping("/sale/orderItem")
 public class OrderItemController{
 
     public BaseService<OrderItem> getService() {

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

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

src/main/java/com/dk/mdm/mapper/sale/OrderItemMapper.xml

@@ -9,7 +9,7 @@
     </sql>
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.dk.mdm.model.pojo.sale.OrderItem">
+    <resultMap id="BaseResultMap" type="com.dk.mdm.model.response.sale.OrderItemResponse">
         <id column="item_id" property="itemId"/>
                 <result column="order_id" property="orderId" typeHandler="UuidTypeHandler"/>
                 <result column="item_index" property="itemIndex"/>
@@ -44,85 +44,64 @@
     <sql id="Condition">
         <where>
             <if test="orderId != null and orderId != ''">
-                AND order_id = #{orderId}
+                AND tpoi.order_id = #{orderId}::uuid
             </if>
             <if test="itemIndex != null">
-                AND item_index = #{itemIndex}
+                AND tpoi.item_index = #{itemIndex}
             </if>
             <if test="skuId != null and skuId != ''">
-                AND sku_id = #{skuId}
+                AND tpoi.sku_id = #{skuId}
             </if>
             <if test="itemQty != null">
-                AND item_qty = #{itemQty}
+                AND tpoi.item_qty = #{itemQty}
             </if>
             <if test="priceStd != null">
-                AND price_std = #{priceStd}
+                AND tpoi.price_std = #{priceStd}
             </if>
             <if test="amtStd != null">
-                AND amt_std = #{amtStd}
+                AND tpoi.amt_std = #{amtStd}
             </if>
             <if test="priceSale != null">
-                AND price_sale = #{priceSale}
+                AND tpoi.price_sale = #{priceSale}
             </if>
             <if test="itemAmt != null">
-                AND item_amt = #{itemAmt}
+                AND tpoi.item_amt = #{itemAmt}
             </if>
             <if test="priceDiscount != null">
-                AND price_discount = #{priceDiscount}
+                AND tpoi.price_discount = #{priceDiscount}
             </if>
             <if test="nonStdCode != null and nonStdCode != ''">
-                AND non_std_code = #{nonStdCode}
+                AND tpoi.non_std_code = #{nonStdCode}
             </if>
             <if test="outStatus != null and outStatus != ''">
-                AND out_status = #{outStatus}
+                AND tpoi.out_status = #{outStatus}
             </if>
             <if test="outingQty != null">
-                AND outing_qty = #{outingQty}
+                AND tpoi.outing_qty = #{outingQty}
             </if>
             <if test="outingAmt != null">
-                AND outing_amt = #{outingAmt}
+                AND tpoi.outing_amt = #{outingAmt}
             </if>
             <if test="outQty != null">
-                AND out_qty = #{outQty}
+                AND tpoi.out_qty = #{outQty}
             </if>
             <if test="outAmt != null">
-                AND out_amt = #{outAmt}
+                AND tpoi.out_amt = #{outAmt}
             </if>
             <if test="returnQty != null">
-                AND return_qty = #{returnQty}
+                AND tpoi.return_qty = #{returnQty}
             </if>
             <if test="returnAmt != null">
-                AND return_amt = #{returnAmt}
+                AND tpoi.return_amt = #{returnAmt}
             </if>
             <if test="remarks != null and remarks != ''">
-                AND remarks = #{remarks}
+                AND tpoi.remarks = #{remarks}
             </if>
             <if test="flgValid != null">
-                AND flg_valid = #{flgValid}
+                AND tpoi.flg_valid = #{flgValid}
             </if>
             <if test="cpId != null">
-                AND cp_id = #{cpId}
-            </if>
-            <if test="opCreateTime != null">
-                AND op_create_time = #{opCreateTime}
-            </if>
-            <if test="opCreateUserId != null and opCreateUserId != ''">
-                AND op_create_user_id = #{opCreateUserId}
-            </if>
-            <if test="opUpdateTime != null">
-                AND op_update_time = #{opUpdateTime}
-            </if>
-            <if test="opUpdateUserId != null and opUpdateUserId != ''">
-                AND op_update_user_id = #{opUpdateUserId}
-            </if>
-            <if test="opAppCode != null and opAppCode != ''">
-                AND op_app_code = #{opAppCode}
-            </if>
-            <if test="opTimestamp != null">
-                AND op_timestamp = #{opTimestamp}
-            </if>
-            <if test="opDbUser != null and opDbUser != ''">
-                AND op_db_user = #{opDbUser}
+                AND tpoi.cp_id = #{cpId}
             </if>
         </where>
     </sql>
@@ -137,9 +116,30 @@
 
     <!-- 查询表t_psi_order_item，（条件查询+分页）列表 -->
     <select id="selectByCond" resultMap="BaseResultMap">
-        SELECT
-        <include refid="Base_Column_List"/>
-        FROM t_psi_order_item
+        SELECT tpoi.item_id,
+               tpoi.order_id,
+               tpoi.item_index,
+               tpoi.sku_id,
+               tmgs.sku_code  as "skuCode",
+               tmgs.sku_model as "skuModel",
+               tmgs.sku_name  as "skuName",
+               tpoi.item_qty,
+               tpoi.price_std,
+               tpoi.amt_std,
+               tpoi.price_sale,
+               tpoi.item_amt,
+               tpoi.price_discount,
+               tpoi.non_std_code,
+               tpoi.out_status,
+               tpoi.outing_qty,
+               tpoi.outing_amt,
+               tpoi.out_qty,
+               tpoi.out_amt,
+               tpoi.return_qty,
+               tpoi.return_amt,
+               tpoi.remarks
+        FROM dkic_b.t_psi_order_item as tpoi
+                 inner join dkic_b.t_mst_goods_sku tmgs on tpoi.sku_id = tmgs.sku_id
         <include refid="Condition"/>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}

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

@@ -273,7 +273,14 @@ public class OrderItemResponse extends PageInfo<OrderItemResponse> implements Se
     @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
     private String opDbUser;
 
+    @ApiModelProperty(value = "商品编码")
+    private String skuCode;
 
+    @ApiModelProperty(value = "商品型号")
+    private String skuModel;
+
+    @ApiModelProperty(value = "商品名称")
+    private String skuName;
     /*
      * 相关属性
      * @TableField(exist = false)

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

@@ -6,82 +6,108 @@ 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.OrderItemMapper;
 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.OrderItemQuery;
 import com.dk.mdm.model.query.sale.OrderQuery;
+import com.dk.mdm.model.response.sale.OrderItemResponse;
 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.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 @Service
 @Transactional
 public class OrderService extends BaseService<Order> {
 
-	@Override
-	public BaseMapper<Order> getRepository() {
-		return orderMapper;
-	}
+    @Override
+    public BaseMapper<Order> getRepository() {
+        return orderMapper;
+    }
 
-	/**
-	 * @desc   : 重写主键
-	 * @author : 付斌
-	 * @date   : 2023/1/9 10:39
-	 */
-	@Override
-	public String getPrimaryKey() {
-		return "order_id";
-	}
+    /**
+     * @desc : 重写主键
+     * @author : 付斌
+     * @date : 2023/1/9 10:39
+     */
+    @Override
+    public String getPrimaryKey() {
+        return "order_id";
+    }
 
-	@Autowired
-	private OrderMapper orderMapper;
+    @Autowired
+    private OrderMapper orderMapper;
 
-	@Autowired
-	private OrderConvert orderConvert;
+    @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));
-	}
+    @Autowired
+    private OrderItemMapper orderItemMapper;
 
-	/**
-	 * @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: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<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())))) ;
-	}
+    /**
+     * @desc : 查询订单明细（货物、收款、附件）
+     * @author : 付斌
+     * @date : 2024-02-28 13:25
+     */
+    @Pagination
+    public ResponseResultVO<Map<String, Object>> selectOrderItemById(String id) {
+        Map<String, Object> result = new HashMap<>();
+        // 货物
+        List<OrderItemResponse> orderItem = orderItemMapper.selectByCond(new OrderItemQuery().setOrderId(id));
+        result.put("orderItem", orderItem);
+
+        // 收款
+
+        // 附件
+        return ResponseResultUtil.success(result);
+    }
+
+    /**
+     * @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()))));
+    }
 }