Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java

@@ -63,5 +63,7 @@ public class BusSalesOrderVehicle extends BaseEntity {
     private String topSid;
     @ApiModelProperty("临时号")
     private String temporaryNo;
+    @ApiModelProperty("临时客户名称")
+    private String temporaryName;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java

@@ -75,7 +75,7 @@ public interface BusSalesOrderVehicleFeign {
     @ApiOperation("根据销售订单车辆表的sid更新临时号码")
     @PostMapping("/updateTemporaryNo")
     @ResponseBody
-    ResultBean updateTemporaryNo(@RequestParam("sid") String sid, @RequestParam("temporaryNo") String temporaryNo);
+    ResultBean updateTemporaryNo(@RequestParam("sid") String sid, @RequestParam("temporaryNo") String temporaryNo,@RequestParam("temporaryName") String temporaryName);
 
     @ApiOperation("根据sid查询")
     @GetMapping("/fetchBySalesOrderVehiclerSid/{busVinSid}")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java

@@ -64,7 +64,7 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
     }
 
     @Override
-    public ResultBean updateTemporaryNo(String sid, String temporaryNo) {
+    public ResultBean updateTemporaryNo(String sid, String temporaryNo,String temporaryName) {
         return null;
     }
 

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

@@ -4786,8 +4786,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 String salesOrderVinSid = vinList.get(i).getSid();
                 String temporaryNum = String.format("%02d", i + 1);
                 String temporaryNo = commonContract.getContractNo() + temporaryNum;
+                String temporaryName = appOrderDetailsVo.getName()+temporaryNo;
                 //更新临时号
-                ResultBean busSalesOrderResultBean = busSalesOrderVehicleService.updateTemporaryNo(salesOrderVinSid, temporaryNo);
+                ResultBean busSalesOrderResultBean = busSalesOrderVehicleService.updateTemporaryNo(salesOrderVinSid, temporaryNo,temporaryName);
             }
         } else {
             for (int i = 0; i < vinList.size(); i++) {
@@ -4795,7 +4796,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 String salesOrderVinSid = vinList.get(i).getSid();
                 String temporaryNum = String.format("%02d", i + 1);
                 //更新临时号
-                ResultBean busSalesOrderResultBean = busSalesOrderVehicleService.updateTemporaryNo(salesOrderVinSid, temporaryNum);
+                ResultBean busSalesOrderResultBean = busSalesOrderVehicleService.updateTemporaryNo(salesOrderVinSid, temporaryNum,"");
             }
 
         }

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

@@ -104,7 +104,7 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
 
     List<VinListsVo> selectListBySids(String sid);
 
-    int updateTemporaryNo(@Param("sid") String sid, @Param("temporaryNo") String temporaryNo);
+    int updateTemporaryNo(@Param("sid") String sid, @Param("temporaryNo") String temporaryNo,@Param("temporaryName") String temporaryName);
 
     List<BusSalesOrderVehicle> selectByOrderSid(String salesOrderSid);
 

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

@@ -69,7 +69,7 @@
 
     <update id="updateTemporaryNo">
         update bus_sales_order_vehicle
-        set temporaryNo = #{temporaryNo}
+        set temporaryNo = #{temporaryNo},temporaryName = #{temporaryName}
         where sid = #{sid}
     </update>
 

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

@@ -75,8 +75,8 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
     }
 
     @Override
-    public ResultBean updateTemporaryNo(String sid, String temporaryNo) {
-        return busSalesOrderVehicleService.updateTemporaryNo(sid, temporaryNo);
+    public ResultBean updateTemporaryNo(String sid, String temporaryNo,String temporaryName) {
+        return busSalesOrderVehicleService.updateTemporaryNo(sid, temporaryNo,temporaryName);
     }
 
     @Override

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

@@ -240,9 +240,9 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         return list;
     }
 
-    public ResultBean updateTemporaryNo(String sid, String temporaryNo) {
+    public ResultBean updateTemporaryNo(String sid, String temporaryNo,String temporaryName) {
         ResultBean rb = ResultBean.fireFail();
-        baseMapper.updateTemporaryNo(sid, temporaryNo);
+        baseMapper.updateTemporaryNo(sid, temporaryNo,temporaryName);
         return rb.success();
     }