Merge remote-tracking branch 'origin/master'

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

@@ -7299,6 +7299,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     newSalesOrderVehicle.setCreateTime(createTime);
                     newSalesOrderVehicle.setModifyTime(modifyTime);
                     newSalesOrderVehicle.setSalesOrderSid(newSalesOrderSid);
+                    newSalesOrderVehicle.setBorrowName("");
+                    newSalesOrderVehicle.setBorrowerSid("");
                     boolean vehicleSave = busSalesOrderVehicleService.save(newSalesOrderVehicle);
                 }
             }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.java

@@ -84,4 +84,6 @@ public interface BusSalesOrderReturnVehApplyMapper extends BaseMapper<BusSalesOr
 	 * @return
 	 */
     List<BusSalesOrderReturnVehApplyByOrderSidVo> listPageByOrderSid(String orderSid);
+
+    int updateByBorrowSid(String s);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml

@@ -74,4 +74,7 @@
         AND bso.isDelete = '0'
     </select>
 
+    <update id="updateByBorrowSid">
+        update anrui_buscenter.bus_sales_order_borrower set state = 0 where salesOrderSid = #{s}
+    </update>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java

@@ -744,6 +744,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
                 List<BusSalesOrderVehicle> vinList = busSalesOrderVehicleService.selectByOrderSid(orderSid);
                 vinList.removeAll(Collections.singleton(null));
                 List<BaseVehicleState> stateList = new ArrayList<>();
+                List<String> stringList = new ArrayList<>();
                 if (!vinList.isEmpty()) {
                     for (BusSalesOrderVehicle busSalesOrderVehicle : vinList) {
                         String busSalesOrderVehicleSid = busSalesOrderVehicle.getSid();
@@ -751,11 +752,21 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
                         if (null != baseVehicleState) {
                             stateList.add(baseVehicleState);
                         }
+                        stringList.add(busSalesOrderVehicle.getBorrowerSid());
+                        stringList.removeAll(Collections.singleton(null));
                     }
                     if (stateList.size() == vinList.size()) {
                         BusSalesOrder salesOrder = busSalesOrderService.fetchBySid(orderSid);
                         salesOrder.setNodeState("作废");
                         busSalesOrderService.updateById(salesOrder);
+                        if(!stringList.isEmpty()){
+                            for (int j = 0; j < stringList.size(); j++) {
+                                if(StringUtils.isNotBlank(stringList.get(j))){
+                                    baseMapper.updateByBorrowSid(stringList.get(j));
+                                }
+                            }
+                        }
+
                     }
                 }
                 //-------修改应收未收款项表中的款项状态为02作废------------