Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/VinQuery.java

@@ -18,4 +18,6 @@ public class VinQuery implements Query {
     private String userSid;
     @ApiModelProperty("组织机构sid")
     private String orgPath;
+
+    private String name;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml

@@ -309,6 +309,7 @@
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
           AND bvc.useOrgSid = #{useOrg}
+        order by bvc.id desc limit 1
     </select>
 
     <!-- <select id="configPageList" resultType="com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigListVo">
@@ -751,6 +752,7 @@
             <if test="orgSid != null and orgSid != ''">
                 and bvc.useOrgSid = #{orgSid}
             </if>
+            and length(bvc.guidedPrice)>0
         </where>
         ORDER BY nowCarNum DESC
     </select>

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

@@ -208,7 +208,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
      * @param configSid
      * @return
      */
-    List<AppVinsDetailsVo> getVins(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("state") String state, @Param("orgSid") String orgSid);
+    List<AppVinsDetailsVo> getVins(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("state") String state, @Param("orgSid") String orgSid,@Param("name")String name);
 
     /**
      * 现车分页列表（新）

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

@@ -430,6 +430,7 @@
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
           AND bvc.useOrgSid = #{useOrg}
+        order by bvc.id desc limit 1
     </select>
 
     <select id="exiCarPagerList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleListVo">
@@ -604,6 +605,9 @@
                         or bv.vehicleStateValue = '在途'
                         or bv.vehicleStateValue = '调入'
                 )
+        <if test="name != null and name != ''">
+            and bv.vinNo LIKE concat('%', #{name}, '%')
+        </if>
     </select>
 
     <select id="selExistingCarPageList"
@@ -721,6 +725,7 @@
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
           AND bvc.useOrgSid = #{useOrg}
+        order by bvc.id desc limit 1
     </select>
 
     <select id="getNowModelList" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseVehicleNowModelVo">

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

@@ -987,7 +987,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
      */
     @Override
     public ResultBean<List<AppVinsDetailsVo>> getVins(String modelSid, String configSid, String userSid) {
-        List<AppVinsDetailsVo> vo = baseVehicleService.getVins(modelSid, configSid, userSid, "");
+        List<AppVinsDetailsVo> vo = baseVehicleService.getVins(modelSid, configSid, userSid, "","");
         return new ResultBean<List<AppVinsDetailsVo>>().success().setData(vo);
     }
 
@@ -997,7 +997,8 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         String configSid = vinQuery.getConfigSid();
         String userSid = vinQuery.getUserSid();
         String orgPath = vinQuery.getOrgPath();
-        List<AppVinsDetailsVo> vo = baseVehicleService.getVins(modelSid, configSid, userSid, orgPath);
+        String name = vinQuery.getName();
+        List<AppVinsDetailsVo> vo = baseVehicleService.getVins(modelSid, configSid, userSid, orgPath,name);
         return new ResultBean<List<AppVinsDetailsVo>>().success().setData(vo);
     }
 

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

@@ -1121,13 +1121,13 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
      * @param configSid
      * @return
      */
-    public List<AppVinsDetailsVo> getVins(String modelSid, String configSid, String userSid, String orgPath) {
+    public List<AppVinsDetailsVo> getVins(String modelSid, String configSid, String userSid, String orgPath,String name) {
         if (StringUtils.isBlank(orgPath)) {
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         } else {
             orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
-        List<AppVinsDetailsVo> vins = baseMapper.getVins(modelSid, configSid, VehicleState.LockEnum.UN_LOCK.getCode(), orgPath);
+        List<AppVinsDetailsVo> vins = baseMapper.getVins(modelSid, configSid, VehicleState.LockEnum.UN_LOCK.getCode(), orgPath,name);
         if (vins.size() <= 0) {
             for (AppVinsDetailsVo vin : vins) {
                 vins.add(vin);

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java

@@ -119,4 +119,7 @@ public class AppBusMainDepositVo implements Vo {
     @ApiModelProperty("财务确认状态")
     private String paymentState;
 
+    @ApiModelProperty("财务驳回原因")
+    private String reason;
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/ScheduledService.java

@@ -7,14 +7,15 @@ import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleDetailVo;
 import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleListVo;
 import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDeposit;
+import com.yxt.messagecenter.api.message.MessageFeign;
+import com.yxt.messagecenter.api.message.OrderListMessageDto;
+import com.yxt.messagecenter.api.message.OrderMesageDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -29,9 +30,11 @@ public class ScheduledService {
     private BusDepositVehicleService busDepositVehicleService;
     @Autowired
     private BaseVehicleFeign baseVehicleFeign;
+    @Autowired
+    private MessageFeign messageFeign;
 
     @Scheduled(cron = "0 0 0 * * ?")
-//    @Scheduled(cron = "0 0/5 12 * * ?")
+//    @Scheduled(cron = "0 0/5 16 * * ?")
     public void remindVehicle() {
         Date now = new Date();
         //获取当前时间
@@ -46,6 +49,8 @@ public class ScheduledService {
         //查询简易订单-车辆预定中
         //查询修改日期包含该日期的已经通过的简易订车单
         List<BusMainDeposit> strList = busDepositVehicleService.selectListByState(tomorrow);
+        OrderMesageDto dto = new OrderMesageDto();
+        List<OrderListMessageDto> orderListMessageDtoList = new ArrayList<>();
         for (BusMainDeposit strDeposit : strList) {
             String sid = strDeposit.getSid();
             AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(sid).getData();
@@ -55,7 +60,29 @@ public class ScheduledService {
             busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.UN_LOCK.getCode());
             busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks());
             baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
+            //推送解锁提醒
+            OrderListMessageDto orderListMessageDto = new OrderListMessageDto();
+            orderListMessageDto.setBusinessSid(strDeposit.getSid());//业务sid
+            List<String> createBySidList = new ArrayList<>();
+            createBySidList.add(strDeposit.getCreateBySid());
+            orderListMessageDto.setCreateBySid(createBySidList);//接收人sid
+            Map<String, Object> appMaps = new HashMap<>();
+            appMaps.put("virtualOrderSid", strDeposit.getSid());//简易订单sid
+            orderListMessageDto.setModuleName("业务");
+            orderListMessageDto.setMsgTitle("简易订单-车辆预定解锁提醒");
+            List<String> vinList = appBusDepositVehicleDetailVo.getVehicleList().stream().map(v->v.getVin().substring(v.getVin().length()-8)).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+            String msgContent = "您在简易订单-车辆预定中预定的车架号："+String.join(",",vinList)+"的"+vinList.size()+"台车现在已经解锁，如需继续预定请重新申请或在销售订单走销售流程。";
+            orderListMessageDto.setMsgContent(msgContent);
+            orderListMessageDto.setMsgTargetUri("com.anrui.android.plugin.autoservice.activity.DetailVirtualOrderReserveCarActivity");
+            orderListMessageDto.setAppMap(appMaps);
+            orderListMessageDto.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028");
+            orderListMessageDto.setApp_type("2");
+            orderListMessageDtoList.add(orderListMessageDto);
+
         }
+        dto.setList(orderListMessageDtoList);
+        messageFeign.sendOrderMessage(dto);
+        
     }
 
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -670,6 +670,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                                 record.setPaymentState("待确认");
                             }else if(finCollectionConfirmation.getAuditState() ==2){
                                 record.setPaymentState("驳回");
+                                record.setReason(finCollectionConfirmation.getReason());
                             }else{
                                 record.setPaymentState("已确认");
                                 if (StringUtils.isNotBlank(record.getUsedDeposit())) {

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java

@@ -110,4 +110,7 @@ public class FinCollectionConfirmation extends BaseEntity {
     private String createDeptSid;
     @ApiModelProperty("单据编号")
     private String billNo;
+
+    @ApiModelProperty("驳回原因")
+    private String reason;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java

@@ -82,7 +82,7 @@ public interface FinCollectionConfirmationFeign {
 
     @ApiOperation("出纳驳回")
     @PostMapping("/cashierReject")
-    public ResultBean cashierReject(@RequestParam("sid") String sid);
+    public ResultBean cashierReject(FinCollectionRejectQuery finCollectionRejectQuery);
 
     /*---------------------App接口 ---------------------*/
 

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java

@@ -79,7 +79,7 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf
     }
 
     @Override
-    public ResultBean cashierReject(String sid) {
+    public ResultBean cashierReject(FinCollectionRejectQuery finCollectionRejectQuery) {
         return null;
     }
 

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionRejectQuery.java

@@ -0,0 +1,17 @@
+package com.yxt.anrui.fin.api.fincollectionconfirmation;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/1/9 13:48
+ * @Description
+ */
+@Data
+public class FinCollectionRejectQuery {
+    @ApiModelProperty("款项确认sid")
+    private String sid;
+    @ApiModelProperty("驳回原因")
+    private String reason;
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java

@@ -99,8 +99,8 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF
     }
 
     @Override
-    public ResultBean cashierReject(String sid) {
-        return finCollectionConfirmationService.cashierReject(sid);
+    public ResultBean cashierReject(FinCollectionRejectQuery finCollectionRejectQuery) {
+        return finCollectionConfirmationService.cashierReject(finCollectionRejectQuery);
     }
 
     /**

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -1241,8 +1241,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         return qw;
     }
 
-    public ResultBean cashierReject(String sid) {
+    public ResultBean cashierReject(FinCollectionRejectQuery finCollectionRejectQuery) {
         ResultBean rb = ResultBean.fireFail();
+        String sid = finCollectionRejectQuery.getSid();
+        String reason = finCollectionRejectQuery.getReason();
         FinCollectionConfirmation confirmation = fetchBySid(sid);
         if (confirmation == null) {
             return rb.setMsg("该申请不存在");
@@ -1259,6 +1261,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed);
         });
         confirmation.setAuditState(2);
+        //更新驳回原因
+        confirmation.setReason(reason);
         baseMapper.updateById(confirmation);
         //删除临时表的数据
         ResultBean deleteResult = baseVehicleTempstateFeign.delByBusSid(sid);

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/orders/MainDepositVo.java

@@ -77,4 +77,7 @@ public class MainDepositVo implements Vo {
     
     @ApiModelProperty("财务确认状态")
     private String paymentState;
+
+    @ApiModelProperty("财务驳回原因")
+    private String reason;
 }