销售订单-完善调式价格信息初始化

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

@@ -30,6 +30,9 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.AppOrderInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -74,4 +77,13 @@ public interface BusSalesOrderModelMapper extends BaseMapper<BusSalesOrderModel>
      * @return
      */
     AppOrderInfoVo selectAppModelBySid(String saleOrderSid);
+
+    /**
+     * 根据销售订单sid更新主车单台成交价
+     *
+     * @param sid        销售订单sid
+     * @param finalPrice 主车单台成交价
+     * @return
+     */
+    int updateFinalPrice(@Param("sid") String sid, @Param("price") BigDecimal finalPrice);
 }

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

@@ -43,4 +43,10 @@
         from bus_sales_order_model
         where salesOrderSid = #{saleOrderSid}
     </select>
+
+    <update id="updateFinalPrice">
+        update bus_sales_order_model
+        set finalPrice = #{price}
+        where salesOrderSid = #{sid}
+    </update>
 </mapper>

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

@@ -200,10 +200,21 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
             busSalesOrderPrice.setSingleGuildPrice(bigDecimalPrice);
             busSalesOrderPriceService.save(busSalesOrderPrice);
         } else {
-            busSalesOrderPriceService.updateBySalesSid(num, salesOrderSid,bigDecimalPrice);
+            busSalesOrderPriceService.updateBySalesSid(num, salesOrderSid, bigDecimalPrice);
         }
         //更新销售订单的车辆类型
         busSalesOrderService.updateTypeBySid(type, salesOrderSid);
         return rb.success().setMsg("成功");
     }
+
+    /**
+     * 根据销售订单sid更新主车单台成交价
+     *
+     * @param sid        销售订单sid
+     * @param finalPrice 主车单台成交价
+     * @return
+     */
+    public int updateFinalPrice(String sid, BigDecimal finalPrice) {
+        return baseMapper.updateFinalPrice(sid, finalPrice);
+    }
 }

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

@@ -35,6 +35,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderprice.app.AppBusSalesOrderPriceD
 import com.yxt.anrui.buscenter.api.bussalesorderprice.app.AppBusSalesOrderPriceVo;
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.anrui.buscenter.biz.bussalesordermakeup.BusSalesOrderMakeupService;
+import com.yxt.anrui.buscenter.biz.bussalesordermodel.BusSalesOrderModelService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.result.ResultBean;
@@ -63,6 +64,8 @@ public class BusSalesOrderPriceService extends MybatisBaseService<BusSalesOrderP
     private BusSalesOrderService busSalesOrderService;
     @Autowired
     private BusSalesOrderMakeupService busSalesOrderMakeupService;
+    @Autowired
+    private BusSalesOrderModelService busSalesOrderModelService;
 
     public void saveOrderPrice(BusSalesOrderPriceDto busSalesOrderPriceDto, String sid) {
         BusSalesOrderPrice busSalesOrderPrice = new BusSalesOrderPrice();
@@ -125,14 +128,24 @@ public class BusSalesOrderPriceService extends MybatisBaseService<BusSalesOrderP
         if (busSalesOrder == null) {
             return rb.setMsg("该销售订单单据不存在");
         }
-        AppBusSalesOrderPriceVo vo = baseMapper.getPriceInfo(sid);
-        if (vo != null) {
+        AppBusSalesOrderPriceVo vo = new AppBusSalesOrderPriceVo();
+        AppBusSalesOrderPriceVo vo1 = baseMapper.getPriceInfo(sid);
+        BeanUtil.copyProperties(vo1, vo);
+        BigDecimal bigDecimalFinalPrice = new BigDecimal("0");
+        if (vo1 != null) {
             //查询挂车和上装的总价
             BusSalesOrderMakeupDetailsVo busSalesOrderMakeupDetailsVo = busSalesOrderMakeupService.details(sid);
             if (busSalesOrderMakeupDetailsVo != null) {
                 String topPrice = busSalesOrderMakeupDetailsVo.getTopPrice();
                 vo.setTopAndTrailerPrice(topPrice);
+                bigDecimalFinalPrice = bigDecimalFinalPrice.add(new BigDecimal(topPrice));
             }
+        } else {
+            return rb.setMsg("请先完善车型信息");
+        }
+
+        if (StringUtils.isNotBlank(vo.getTransactionPrice())) {
+            vo.setOverallPrice(bigDecimalFinalPrice.toString());
         }
         vo.setSaleOrderSid(sid);
         return rb.success().setData(vo);
@@ -146,6 +159,8 @@ public class BusSalesOrderPriceService extends MybatisBaseService<BusSalesOrderP
         if (busSalesOrder == null) {
             return rb.setMsg("该销售订单单据不存在");
         }
+        //更新车型中的单台成交价
+        busSalesOrderModelService.updateFinalPrice(sid, new BigDecimal(dto.getTransactionPrice()));
         BusSalesOrderPrice busSalesOrderPrice = selectBySalesOrderSid(sid);
         BeanUtil.copyProperties(dto, busSalesOrderPrice, "sid");
         BigDecimal bigDecimalPrice = new BigDecimal(dto.getTransactionPrice());

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

@@ -250,10 +250,15 @@ public class AppBusSalesOrderService {
     public ResultBean<PriceVo> getPriceInfo(String sid) {
         ResultBean<PriceVo> rb = ResultBean.fireFail();
         ResultBean<AppBusSalesOrderPriceVo> resultBean = busSalesOrderPriceFeign.getPriceInfo(sid);
-        PriceVo priceVo = new PriceVo();
-        AppBusSalesOrderPriceVo appBusSalesOrderPriceVo = resultBean.getData();
-        BeanUtil.copyProperties(appBusSalesOrderPriceVo, priceVo);
-        return rb.success().setData(priceVo);
+        if(resultBean.getSuccess()){
+            PriceVo priceVo = new PriceVo();
+            AppBusSalesOrderPriceVo appBusSalesOrderPriceVo = resultBean.getData();
+            BeanUtil.copyProperties(appBusSalesOrderPriceVo, priceVo);
+            return rb.success().setData(priceVo);
+        }else{
+            return rb.setMsg(resultBean.getMsg());
+        }
+
     }
 
     public ResultBean savePriceInfo(PriceDto dto) {