合同推送销售订单问题

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -1201,7 +1201,13 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     public IPage<VehicleModelPriceVo> getModelList(PagerQuery<VehicleModelPriceQuery> pagerQuery) {
         String userSid = pagerQuery.getParams().getUserSid();
         // 1、根据业务员部门sid查询分公司sid
-        String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        String orgPath = pagerQuery.getParams().getOrgPath();
+        String orgSid = "";
+        if (StringUtils.isBlank(orgPath)) {
+            orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        } else {
+            orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+        }
         if (StringUtils.isNotBlank(orgSid)) {
             pagerQuery.getParams().setUseOrg(orgSid);
         }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -182,6 +182,11 @@ public interface BusSalesOrderFeign {
     @ResponseBody
     ResultBean updateNodesBySid(@RequestBody AppOrderRemarkDto dto);
 
+    @ApiOperation("更新销售订单补充说明")
+    @PutMapping("/updateContractNoBySid")
+    @ResponseBody
+    ResultBean updateContractNoBySid(@RequestBody AppOrderContractNoDto dto);
+
     @ApiOperation("判断销售订单是否可提交")
     @GetMapping("/isSubmit/{sid}")
     @ResponseBody

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java

@@ -159,6 +159,11 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
         return null;
     }
 
+    @Override
+    public ResultBean updateContractNoBySid(AppOrderContractNoDto dto) {
+        return null;
+    }
+
     @Override
     public ResultBean isSubmit(String sid) {
         return null;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderContractNoDto.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.buscenter.api.bussalesorder.app.order;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppOrderContractNoDto implements Dto {
+    private static final long serialVersionUID = -1955137877682009798L;
+
+    @ApiModelProperty(value = "销售订单sid")
+    private String saleOrderSid;
+
+    @ApiModelProperty(value = "合同编号")
+    private String contractNo;
+}

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

@@ -77,7 +77,7 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
      * @param qw
      * @return
      */
-    IPage<AppBusSalesOrderVo> getSaleOrders(IPage<BusSalesOrder> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrder> qw,@Param("name") String name);
+    IPage<AppBusSalesOrderVo> getSaleOrders(IPage<BusSalesOrder> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrder> qw, @Param("name") String name);
 
     /**
      * 根据销售订单sid查询车型信息
@@ -149,6 +149,15 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
      */
     int updateNodesBySid(@Param("remarks") String remarks, @Param("sid") String sid);
 
+    /**
+     * 根据销售订单sid更新合同编号字段
+     *
+     * @param contractNo 合同编号
+     * @param sid        销售订单sid
+     * @return
+     */
+    int updateContractNoBySid(@Param("contractNo") String contractNo, @Param("sid") String sid);
+
     /**
      * 初始化销售订单确认提交
      *

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

@@ -151,6 +151,12 @@
         where sid = #{sid}
     </update>
 
+    <update id="updateContractNoBySid">
+        update bus_sales_order
+        set contractNo = #{contractNo}
+        where sid = #{sid}
+    </update>
+
     <select id="getSubmitInfo"
             resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderSubmitInfoVo">
         select bo.customerName        name,

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

@@ -230,6 +230,11 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
         return busSalesOrderService.updateNodesBySid(dto);
     }
 
+    @Override
+    public ResultBean updateContractNoBySid(AppOrderContractNoDto dto) {
+        return busSalesOrderService.updateContractNoBySid(dto);
+    }
+
     @Override
     public ResultBean isSubmit(String sid) {
         return busSalesOrderService.isSubmit(sid);

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

@@ -1975,6 +1975,19 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         return rb.success().setMsg("保存成功");
     }
 
+
+    public ResultBean updateContractNoBySid(AppOrderContractNoDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String sid = dto.getSaleOrderSid();
+        BusSalesOrder busSalesOrder = fetchBySid(sid);
+        if (busSalesOrder == null) {
+            return rb.setMsg("该销售订单单据不存在");
+        }
+        //根据销售订单sid更新合同编号字段字段
+        int i = baseMapper.updateContractNoBySid(dto.getContractNo(), sid);
+        return rb.success().setMsg("保存成功");
+    }
+
     /**
      * 验证销售顶大是否可提交
      *