bug修改

src/main/java/com/dk/mdm/mapper/ivt/OutboundItemMapper.xml

@@ -334,6 +334,7 @@
                tmgs.sku_name                                                             as "skuName",
                tpoi.item_qty                                                             as "orderQty",
                tpoi.item_qty - tpoi.outing_qty - tpoi.out_qty + t.outing_qty + t.out_qty as "canOutingQty",
+               tmgb.brand_name AS "brandName",
                t.price_out,
                t.outing_qty + t.out_qty                                                  as outing_qty,
                t.outing_amt + t.out_amt                                                  as outing_amt,
@@ -351,6 +352,7 @@
                  left join dkic_b.t_mst_goods_sku tmgs on tpoi.sku_id = tmgs.sku_id
                  left join dkic_b.t_psi_inventory as tpi on tpi.inv_id = t.inv_id
                  left join dkic_b.t_mst_warehouse as tmw on tmw.wh_id = tpi.wh_id
+                 left join dkic_b.t_mst_goods_brand tmgb on tmgb.brand_id = tmgs.brand_id
         where t.flg_valid
           and t.out_id = #{id}::uuid
         order by t.item_index

src/main/java/com/dk/mdm/mapper/ivt/OutboundMapper.xml

@@ -101,6 +101,9 @@
         <result column="cus_from_name" property="cusFromName"/>
         <result column="out_reason" property="outReason" typeHandler="UuidTypeHandler"/>
         <result column="out_reason_name" property="outReasonName" />
+        <result column="sumOutAmt" property="sumOutAmt" />
+        <result column="sumOutQty" property="sumOutQty" />
+
     </resultMap>
 
     <resultMap id="BaseResultMapDetailResponse" type="com.dk.mdm.model.response.ivt.OutboundResponse">
@@ -346,6 +349,8 @@
                sys.f_get_name_i18n(tdktype.kind_name_i18n, #{i18n}) AS  "outTypeName",
                t.outing_qty,
                t.outing_amt,
+               (t.outing_amt + t.out_amt) AS "sumOutAmt",
+               (t.outing_qty + t.out_qty) AS "sumOutQty",
                t.out_qty,
                t.out_amt,
                t.return_qty,

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

@@ -2,9 +2,13 @@ package com.dk.mdm.mapper.sale;
 
 import com.dk.mdm.model.pojo.sale.MultiOwner;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.query.sale.MultiOwnerQuery;
+import com.dk.mdm.model.response.sale.MultiOwnerResponse;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
 *  多业务归属 Mapper
 */
@@ -18,5 +22,6 @@ public interface MultiOwnerMapper extends BaseMapper<MultiOwner>{
      * @date : 2024-03-03 14:17
      */
     int deleteByOrderId(@Param("orderId") String orderId);
+    List<MultiOwnerResponse> selectByType(MultiOwnerQuery multiOwnerQuery);
 }
 

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

@@ -18,7 +18,20 @@
             <result column="flg_valid" property="flgValid"/>
             <result column="cp_id" property="cpId"/>
     </resultMap>
+    <resultMap id="BaseResultMapResponse" type="com.dk.mdm.model.response.sale.MultiOwnerResponse">
+        <id column="multi_id" property="multiId"/>
+        <result column="order_id" property="orderId" typeHandler="UuidTypeHandler"/>
+        <result column="owner_type" property="ownerType"/>
+        <result column="owner_id" property="ownerId" typeHandler="UuidTypeHandler"/>
+        <result column="allocation_ratio" property="allocationRatio"/>
+        <result column="flg_valid" property="flgValid"/>
+        <result column="cp_id" property="cpId"/>
+        <result column="staff_id" property="staffId"/>
+        <result column="staff_name" property="staffName"/>
+        <result column="org_id" property="orgId"/>
+        <result column="org_name" property="orgName"/>
 
+    </resultMap>
     <!-- 通用条件列 -->
     <sql id="Condition">
         <where>
@@ -126,4 +139,23 @@
     <delete id="deleteByOrderId">
         DELETE FROM dkic_b.t_psi_multi_owner WHERE order_id = #{orderId}::uuid
     </delete>
+
+    <!-- 查询表t_psi_multi_owner，（条件查询+分页）列表 -->
+    <select id="selectByType" resultMap="BaseResultMapResponse">
+        SELECT tpmo.multi_id,
+               tpmo.order_id,
+               tpmo.owner_type,
+               tpmo.owner_id,
+               tpmo.allocation_ratio,
+               tpmo.flg_valid,
+               tpmo.cp_id,
+               tms.staff_id,
+               tms.staff_name,
+               tmo.org_id,
+               tmo.org_name
+        FROM dkic_b.t_psi_multi_owner tpmo
+        left join dkic_b.t_mst_staff tms on tms.staff_id = tpmo.owner_id
+        left join dkic_b.t_mst_org tmo  on tmo.org_id = tpmo.owner_id
+        where tpmo.order_id = #{orderId}::uuid AND tpmo.owner_type = ANY ( #{ownerTypes, typeHandler=StringListTypeHandler} )
+    </select>
 </mapper>

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

@@ -67,6 +67,7 @@
                 <result column="wh_name" property="whName"/>
                 <result column="order_no" property="orderNo"/>
                 <result column="transferableQuantity" property="transferableQuantity"/>
+                <result column="skuImages" property="skuImages" typeHandler="JsonTypeHandler"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -291,6 +292,7 @@
                tmgs.sku_code                              as "skuCode",
                tmgs.sku_model                             as "skuModel",
                tmgs.sku_name                              as "skuName",
+               tmgs.sku_images AS "skuImages",
                t.item_qty                                 as "orderQty",
                t.item_qty - t.outing_qty - t.out_qty      as "canOutingQty",
                t.item_qty - t.outing_qty - t.out_qty      as outing_qty,

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

@@ -0,0 +1,112 @@
+package com.dk.mdm.model.query.sale;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dk.common.infrastructure.annotaiton.ExportTitle;
+import com.dk.common.infrastructure.handler.UuidTypeHandler;
+import com.dk.common.model.pojo.PageInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ *  多业务归属
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ExportTitle("多业务归属")
+@TableName(value = "t_psi_multi_owner", schema =  "dkic_b", autoResultMap = true)
+@ApiModel(value="实体类：多业务归属", description="表名：t_psi_multi_owner")
+public class MultiOwnerQuery extends PageInfo<MultiOwnerQuery> implements Serializable {
+
+    /*
+     * 数据库字段
+     */
+
+    /**
+     * 多业务ID
+     */
+//    @TableId(value = "multi_id", type = IdType.AUTO)
+    @ApiModelProperty(value = "多业务ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String multiId;
+
+
+    /**
+     * 订单Id
+     */
+    @Excel(name = "订单Id")
+    @ApiModelProperty(value = "订单Id")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String orderId;
+
+
+    /**
+     * 归属类型 (【系统字典】)
+     */
+    @Excel(name = "归属类型 (【系统字典】)")
+    @ApiModelProperty(value = "归属类型 (【系统字典】)")
+    private String ownerType;
+
+
+    /**
+     * 归属ID
+     */
+    @Excel(name = "归属ID")
+    @ApiModelProperty(value = "归属ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String ownerId;
+
+
+    /**
+     * 分配比例
+     */
+    @Excel(name = "分配比例")
+    @ApiModelProperty(value = "分配比例")
+    private BigDecimal allocationRatio;
+
+
+    /**
+     * 有效标识 (1：正常 0：停用)
+     */
+    @Excel(name = "有效标识 (1：正常 0：停用)")
+    @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
+    private Boolean flgValid;
+
+
+    /**
+     * 企业ID
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Excel(name = "企业ID")
+    @ApiModelProperty(value = "企业ID")
+    private Integer cpId;
+
+
+    /*
+     * 相关属性
+     * @TableField(exist = false)
+     */
+
+    /*
+     * 关联属性 + 查询条件
+     * @TableField(exist = false)
+     */
+    private List<String> ownerTypes;
+
+    private static final long serialVersionUID = 1L;
+
+}

src/main/java/com/dk/mdm/model/response/ivt/OutboundResponse.java

@@ -339,6 +339,14 @@ public class OutboundResponse extends PageInfo<OutboundResponse> implements Seri
     private String salesChannel;
 
 
+
+    private BigDecimal sumOutAmt;
+
+
+    private BigDecimal sumOutQty;
+
+
+
     private static final long serialVersionUID = 1L;
 
 }

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

@@ -0,0 +1,113 @@
+package com.dk.mdm.model.response.sale;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dk.common.infrastructure.annotaiton.ExportTitle;
+import com.dk.common.infrastructure.handler.UuidTypeHandler;
+import com.dk.common.model.pojo.PageInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ *  多业务归属
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ExportTitle("多业务归属")
+@TableName(value = "t_psi_multi_owner", schema =  "dkic_b", autoResultMap = true)
+@ApiModel(value="实体类：多业务归属", description="表名：t_psi_multi_owner")
+public class MultiOwnerResponse extends PageInfo<MultiOwnerResponse> implements Serializable {
+
+    /*
+     * 数据库字段
+     */
+
+    /**
+     * 多业务ID
+     */
+//    @TableId(value = "multi_id", type = IdType.AUTO)
+    @ApiModelProperty(value = "多业务ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String multiId;
+
+
+    /**
+     * 订单Id
+     */
+    @Excel(name = "订单Id")
+    @ApiModelProperty(value = "订单Id")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String orderId;
+
+
+    /**
+     * 归属类型 (【系统字典】)
+     */
+    @Excel(name = "归属类型 (【系统字典】)")
+    @ApiModelProperty(value = "归属类型 (【系统字典】)")
+    private String ownerType;
+
+
+    /**
+     * 归属ID
+     */
+    @Excel(name = "归属ID")
+    @ApiModelProperty(value = "归属ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String ownerId;
+
+
+    /**
+     * 分配比例
+     */
+    @Excel(name = "分配比例")
+    @ApiModelProperty(value = "分配比例")
+    private BigDecimal allocationRatio;
+
+
+    /**
+     * 有效标识 (1：正常 0：停用)
+     */
+    @Excel(name = "有效标识 (1：正常 0：停用)")
+    @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
+    private Boolean flgValid;
+
+
+    /**
+     * 企业ID
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Excel(name = "企业ID")
+    @ApiModelProperty(value = "企业ID")
+    private Integer cpId;
+
+
+
+
+    private String staffId;
+
+    private String staffName;
+
+    private String orgId;
+
+    private String orgName;
+
+
+
+    private static final long serialVersionUID = 1L;
+
+}

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

@@ -1,11 +1,13 @@
 package com.dk.mdm.model.response.sale;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
+import com.dk.common.infrastructure.handler.JsonTypeHandler;
 import com.dk.common.infrastructure.handler.TimestampTypeHandler;
 import com.dk.common.infrastructure.handler.UuidTypeHandler;
 import com.dk.common.model.pojo.PageInfo;
@@ -292,6 +294,11 @@ public class OrderItemResponse extends PageInfo<OrderItemResponse> implements Se
     @TableField(typeHandler = UuidTypeHandler.class)
     private String whId;
 
+    @Excel(name = "商品图片 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
+    @ApiModelProperty(value = "商品图片 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
+    @TableField(typeHandler = JsonTypeHandler.class)
+    private JSONArray skuImages;
+
     private static final long serialVersionUID = 1L;
 
 }

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

@@ -36,10 +36,12 @@ import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.pojo.sale.OrderItem;
 import com.dk.mdm.model.query.mac.RecPayItemQuery;
 import com.dk.mdm.model.query.mac.RecPayQuery;
+import com.dk.mdm.model.query.sale.MultiOwnerQuery;
 import com.dk.mdm.model.query.sale.OrderItemQuery;
 import com.dk.mdm.model.query.sale.OrderQuery;
 import com.dk.mdm.model.response.mac.RecPayItemResponse;
 import com.dk.mdm.model.response.mac.RecPayResponse;
+import com.dk.mdm.model.response.sale.MultiOwnerResponse;
 import com.dk.mdm.model.response.sale.OrderItemResponse;
 import com.dk.mdm.model.response.sale.OrderResponse;
 import com.dk.mdm.model.vo.mac.RecPayItemVO;
@@ -600,6 +602,23 @@ public class OrderService extends BaseService<Order> {
         List<OrderItemResponse> orderItemResponse = orderItemMapper.selectByCond(new OrderItemQuery().setOrderId(id));
         dataInfo.put("dataItem", orderItemResponse);
 
+        //查询主从业务员
+        List<String> staffList = new ArrayList<>();
+        staffList.add(Constant.OwnerType.Z_STAFF.getName());
+        staffList.add(Constant.OwnerType.C_STAFF.getName());
+        List<MultiOwnerResponse> multiOwnersStaff = multiOwnerMapper.selectByType(new MultiOwnerQuery().setOrderId(id).setOwnerTypes(staffList));
+        if(multiOwnersStaff != null && multiOwnersStaff.size() > 0){
+            dataInfo.put("staffList", multiOwnersStaff);
+        }
+        //查询主从业务部门
+        List<String> orgList = new ArrayList<>();
+        orgList.add(Constant.OwnerType.Z_ORG.getName());
+        orgList.add(Constant.OwnerType.C_ORG.getName());
+        List<MultiOwnerResponse> multiOwnersOrg = multiOwnerMapper.selectByType(new MultiOwnerQuery().setOrderId(id).setOwnerTypes(orgList));
+        if(multiOwnersOrg != null && multiOwnersOrg.size() > 0){
+            dataInfo.put("orgList", multiOwnersOrg);
+        }
+
         // 收款明细
         List<RecPayResponse> recPayList = recPayMapper.selectByCond(new RecPayQuery().setBiznisId(id).setFlgOrderHandle(false));
         if (recPayList != null && recPayList.size() > 0) {