移动端-销售订单详情完善

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java

@@ -35,6 +35,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderBillI
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderSubmitInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppModelInfoVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
@@ -143,5 +144,13 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
      */
     int updateNodesBySid(@Param("remarks") String remarks, @Param("sid") String sid);
 
+    /**
+     * 初始化销售订单确认提交
+     *
+     * @param sid 销售订单
+     * @return
+     */
     AppBusSalesOrderSubmitInfoVo getSubmitInfo(String sid);
+
+    AppOrderDetailsVo getSaleOrderDetails(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -68,7 +68,8 @@
         </where>
     </select>
     <!--根据销售订单sid查询车型信息-->
-    <select id="selectModelInfoByOrderSid" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppModelInfoVo">
+    <select id="selectModelInfoByOrderSid"
+            resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppModelInfoVo">
         SELECT bm.modelName       AS model,
                bm.brandName       AS brand,
                p.singleFinalPrice AS price,
@@ -78,7 +79,8 @@
         where bm.salesOrderSid = #{saleOrderSid}
     </select>
     <!--App初始化销售订单单据信息-->
-    <select id="getBillInfo" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderBillInfoVo">
+    <select id="getBillInfo"
+            resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderBillInfoVo">
         SELECT customerSid,
                customerName,
                mobile            AS customerMobile,
@@ -136,7 +138,8 @@
         where sid = #{sid}
     </update>
 
-    <select id="getSubmitInfo" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderSubmitInfoVo">
+    <select id="getSubmitInfo"
+            resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderSubmitInfoVo">
         select bo.customerName        name,
                bo.mobile,
                bp.quantity         as number,
@@ -149,4 +152,23 @@
                  left join bus_sales_order_submit bs on bo.sid = bs.salesOrderSid
         where bo.sid = #{sid}
     </select>
+
+    <select id="getSaleOrderDetails" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo">
+        select DATE_FORMAT(bo.createDate, '%Y-%m-%d') as orderDate,
+               bo.customerSid,
+               bo.customerName                        as name,
+               bo.mobile                              as phone,
+               bo.customerClassKey                    as customerKey,
+               bo.affiliatedCompany                   as affiliated,
+               bo.billingType                         as invoiceType,
+               bo.orgName                             as departmentName,
+               bo.staffName                           as sellerName,
+               bo.notes                               as addRemarks,
+               case bo.type
+                   when 1 then '现车'
+                   when 2 then '采购订单'
+                   when 3 then '排产' end               as orderType
+        from bus_sales_order bo
+        where sid = #{sid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java

@@ -213,4 +213,9 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
     public ResultBean<AppBusSalesOrderSubmitInfoVo> getSubmitInfo(String sid) {
         return busSalesOrderService.getSubmitInfo(sid);
     }
+
+    @Override
+    public ResultBean<AppOrderDetailsVo> getSaleOrderDetails(String sid) {
+        return busSalesOrderService.getSaleOrderDetails(sid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -2005,4 +2005,81 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         }
         return rb.success().setData(vo);
     }
+
+    /**
+     * 销售订单的详情
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    public ResultBean<AppOrderDetailsVo> getSaleOrderDetails(String sid) {
+        ResultBean<AppOrderDetailsVo> rb = ResultBean.fireFail();
+        BusSalesOrder busSalesOrder = fetchBySid(sid);
+        if (busSalesOrder == null) {
+            return rb.setMsg("该销售订单单据不存在");
+        }
+        AppOrderDetailsVo vo = new AppOrderDetailsVo();
+        vo = baseMapper.getSaleOrderDetails(sid);
+        /***************************车型信息***************************************/
+        AppOrderModelInfoVo modelInfo = busSalesOrderModelService.selectModel(sid);
+        //若订单类型为0则为现车，为1采购订单，为2排产
+        if ("0".equals(modelInfo.getType())) {
+            //查询车架号
+            List<String> vinList = busSalesOrderVehicleService.selectList(sid);
+            modelInfo.setVinList(vinList);
+        } else {
+            if ("1".equals(modelInfo.getType())) {
+                //查询采购订单编号
+                List<String> stringList = busSalesVehicleOrderService.selectList(sid);
+                modelInfo.setOrderList(stringList);
+            }
+        }
+        if (modelInfo != null) {
+            vo.setModelInfo(modelInfo);
+        }
+
+        /***************************价格信息***************************************/
+        AppOrderPriceInfoVo priceInfo = busSalesOrderPriceService.selectPrice(sid);
+        if (priceInfo != null) {
+            vo.setPriceInfo(priceInfo);
+        }
+        /***************************上装信息***************************************/
+        if ("1".equals(busSalesOrder.getIsTop())) {
+            AppOrderTopInfoVo topInfo = busSalesOrderMakeupService.selectTop(sid);
+            if (topInfo != null) {
+                if (StringUtils.isNotBlank(topInfo.getContractPath())) {
+                    List<String> stringList = Arrays.asList(topInfo.getContractPath().split(","));
+                    if (!stringList.isEmpty()) {
+                        topInfo.setContractImages(stringList);
+                    }
+                }
+                vo.setTopInfo(topInfo);
+            }
+        }
+        /***************************主车优惠***************************************/
+        List<AppOrderDiscountListVo> discountList = busSalesOrderDiscountService.selectDiscount(sid);
+        discountList.parallelStream().filter(Objects::nonNull).collect(Collectors.toList());
+        if (!discountList.isEmpty()) {
+            vo.setDiscountList(discountList);
+        }
+        /***************************订金信息***************************************/
+        AppOrderDepositInfoVo depositInfo = busSalesOrderDepositService.selectDeposit(sid);
+        if (depositInfo != null) {
+            String a = "由";
+            if ("02".equals(depositInfo.getDepositTypeKey())) {
+                List<BusDepositFictitiousDetailsVo> list = busDepositFictitiousService.detailsList(depositInfo.getSid());
+                list.parallelStream().filter(Objects::nonNull).collect(Collectors.toList());
+                if (!list.isEmpty()) {
+                    for (BusDepositFictitiousDetailsVo v : list) {
+                        String b = "编号为" + v.getDepositBillNo() + "虚拟订单订金转入" + v.getPrice() + "元，";
+                        a = a + b;
+                    }
+                    a = a + "原订金额度使用完后，其收据自动作废。";
+                    depositInfo.setDepositRemarks(a);
+                }
+            }
+            vo.setDepositInfo(depositInfo);
+        }
+        return rb.success().setData(vo);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml

@@ -43,4 +43,28 @@
                  left join bus_sales_order b on bm.salesOrderSid = b.sid
         where salesOrderSid = #{sid}
     </select>
+
+    <select id="selectTop" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderTopInfoVo">
+        select CONCAT_WS(
+                       '、',
+                       IF(LENGTH(trim(GROUP_CONCAT(topName))) > 0, GROUP_CONCAT('上装名称：', topName), NULL),
+                       IF(LENGTH(trim(GROUP_CONCAT(refitMethod))) > 0, GROUP_CONCAT('委改方式：', refitMethod),
+                          NULL),
+                       IF(LENGTH(trim(GROUP_CONCAT(refitFactory))) > 0, GROUP_CONCAT('委改厂：', refitFactory),
+                          NULL),
+                       IF(LENGTH(trim(GROUP_CONCAT(overallDimension))) > 0, GROUP_CONCAT('外廓尺寸：', overallDimension),
+                          NULL),
+                       IF(LENGTH(trim(GROUP_CONCAT(plateMaterial))) > 0, GROUP_CONCAT('板材材质：', plateMaterial),
+                          NULL),
+                       IF(LENGTH(trim(GROUP_CONCAT(plateThickness))) > 0, GROUP_CONCAT('板材厚度：', plateThickness),
+                          NULL),
+                       IF(LENGTH(trim(GROUP_CONCAT(announcementModel))) > 0, GROUP_CONCAT('公告型号：', announcementModel),
+                          NULL), IF(LENGTH(trim(GROUP_CONCAT(topPrice))) > 0, GROUP_CONCAT('上装价格：', topPrice),
+                                    NULL),
+                       IF(LENGTH(trim(GROUP_CONCAT(moreConfig))) > 0, GROUP_CONCAT('更多配置：', moreConfig),
+                          NULL)) as topBean,
+               contractPath
+        FROM bus_sales_order_makeup
+        where salesOrderSid = #{sid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java

@@ -28,6 +28,7 @@ package com.yxt.anrui.buscenter.biz.bussalesordermakeup;
 import cn.hutool.core.bean.BeanUtil;
 import com.google.common.base.Joiner;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderTopInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup;
 import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDto;
@@ -142,4 +143,8 @@ public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrder
         appBusSalesOrderMakeUpVo.setSaleOrderSid(sid);
         return rb.success().setData(appBusSalesOrderMakeUpVo);
     }
+
+    public AppOrderTopInfoVo selectTop(String sid) {
+        return baseMapper.selectTop(sid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.java

@@ -27,6 +27,7 @@ package com.yxt.anrui.buscenter.biz.bussalesordermodel;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppOrderInfoVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -86,4 +87,6 @@ public interface BusSalesOrderModelMapper extends BaseMapper<BusSalesOrderModel>
      * @return
      */
     int updateFinalPrice(@Param("sid") String sid, @Param("price") BigDecimal finalPrice);
+
+    AppOrderModelInfoVo selectModel(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml

@@ -50,4 +50,21 @@
         set finalPrice = #{price}
         where salesOrderSid = #{sid}
     </update>
+
+    <select id="selectModel" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo">
+        select bm.modelName,
+               bm.modelSid,
+               bm.config,
+               bm.brandName            as brand,
+               bp.singleFinalPrice     as price,
+               case bo.type
+                   when 1 then '0'
+                   when 2 then '1'
+                   when 3 then '2' end as type,
+               bp.quantity             as total
+        from bus_sales_order_model bm
+                 left join bus_sales_order bo on bm.salesOrderSid = bo.sid
+                 left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
+        where bm.salesOrderSid = #{sid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java

@@ -28,6 +28,7 @@ package com.yxt.anrui.buscenter.biz.bussalesordermodel;
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppOrderInfoVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsVo;
@@ -220,4 +221,8 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
     public int updateFinalPrice(String sid, BigDecimal finalPrice) {
         return baseMapper.updateFinalPrice(sid, finalPrice);
     }
+
+    public AppOrderModelInfoVo selectModel(String sid) {
+        return baseMapper.selectModel(sid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.buscenter.biz.bussalesorderprice;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.app.AppBusSalesOrderPriceVo;
@@ -82,4 +83,12 @@ public interface BusSalesOrderPriceMapper extends BaseMapper<BusSalesOrderPrice>
      * @return
      */
     AppBusSalesOrderPriceVo getPriceInfo(String sid);
+
+    /**
+     * 根据销售订单的sid查询销售订单的价格信息
+     *
+     * @param sid 销售订单的sid
+     * @return
+     */
+    AppOrderPriceInfoVo selectPrice(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml

@@ -47,4 +47,14 @@
                  left join bus_sales_order_model bm on bm.salesOrderSid = bp.salesOrderSid
         where bp.salesOrderSid = #{sid}
     </select>
+
+    <select id="selectPrice" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo">
+        select bp.singleFinalPrice                           as transactionPrice,
+               bp.quantity                                   as number,
+               bp.priceSum                                   as totalPrice,
+               DATE_FORMAT(bp.plannedPickUpDate, '%Y-%m-%d') as date,
+               bp.plannedPickUpLocation                      as address
+        from bus_sales_order_price bp
+        where bp.salesOrderSid = #{sid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java

@@ -27,6 +27,7 @@ package com.yxt.anrui.buscenter.biz.bussalesorderprice;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDetailsVo;
@@ -177,4 +178,14 @@ public class BusSalesOrderPriceService extends MybatisBaseService<BusSalesOrderP
         updateById(busSalesOrderPrice);
         return rb.success().setMsg("价格信息保存成功");
     }
+
+    /**
+     * 根据销售订单sid查询价格信息
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    public AppOrderPriceInfoVo selectPrice(String sid) {
+        return baseMapper.selectPrice(sid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java

@@ -71,4 +71,12 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
     int deleteByOrderSid(String sid);
 
     List<AppNowCarListVo> selectAppDetailsVoBySaleOrderSid(String saleOrderSid);
+
+    /**
+     * 根据销售订单sid查询现车的车架号集合
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    List<String> selectListBySid(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml

@@ -39,4 +39,10 @@
         from bus_sales_order_vehicle
         where salesOrderSid = #{saleOrderSid}
     </select>
+
+    <select id="selectListBySid" resultType="java.lang.String">
+        select linkNo
+        from bus_sales_order_vehicle
+        where salesOrderSid = #{sid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -106,4 +106,14 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
             }
         }
     }
+
+    /**
+     * 根据销售订单sid查询现车车架号集合
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    public List<String> selectList(String sid) {
+        return baseMapper.selectListBySid(sid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.java

@@ -72,4 +72,11 @@ public interface BusSalesVehicleOrderMapper extends BaseMapper<BusSalesVehicleOr
     int deleteByOrderSid(String sid);
 
     List<AppReadyCarListVo> selectAppDetailsVoBySaleOrderSid(String saleOrderSid);
+
+    /**
+     * 根据销售订单sid查询采购订单的编号
+     * @param sid 销售订单sid
+     * @return
+     */
+    List<String> selectListBySid(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.xml

@@ -41,4 +41,10 @@
         from bus_sales_vehicle_order
         where salesOrderSid = #{saleOrderSid}
     </select>
+
+    <select id="selectListBySid" resultType="java.lang.String">
+        select linkNo
+        from bus_sales_vehicle_order
+        where salesOrderSid = #{sid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java

@@ -110,4 +110,13 @@ public class BusSalesVehicleOrderService extends MybatisBaseService<BusSalesVehi
             }
         }
     }
+
+    /**
+     * 根据销售订单sid查询采购订单的编号
+     * @param sid
+     * @return
+     */
+    public List<String> selectList(String sid) {
+        return baseMapper.selectListBySid(sid);
+    }
 }