修改移动端销售订单问题

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

@@ -885,7 +885,7 @@
         select bv.vinNo        vin,
                bv.locationName address,
                bv.sid          carSid,
-               if(bv.lockedState = 1, 1, 0)
+               if(bv.lockedState = '01', 1, 0)
                        as      isFictitious
         from base_vehicle bv
         where bv.modelSid = #{modelSid}

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

@@ -115,4 +115,6 @@ public class AppBusMainDepositVo implements Vo {
     @ApiModelProperty("订车特殊：审批成功后不再显示流程状态显示为 ： 有效期：3天/2天/1天;失效")
     private String virtualOrderState2;
 
+    private String usedDeposit;
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.java

@@ -63,4 +63,6 @@ public interface BusDepositMapper extends BaseMapper<BusDeposit> {
      * @return
      */
     int updateFlowFiled(Map<String, Object> map);
+
+    int updateDeposit(@Param("depositAll") String depositAll, @Param("depositBillNo") String depositBillNo);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml

@@ -67,4 +67,7 @@
         WHERE sid = #{sid}
     </update>
 
+    <update id="updateDeposit">
+        update bus_deposit set usedDeposit = #{depositAll} where billNo = #{depositBillNo}
+    </update>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java

@@ -202,4 +202,8 @@ public class BusDepositService extends MybatisBaseService<BusDepositMapper, BusD
         vo.setCustomerList(customerList);
         return vo;
     }
+
+    public int updateDeposit(String depositAll, String depositBillNo) {
+       return baseMapper.updateDeposit(depositAll,depositBillNo);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.java

@@ -83,4 +83,6 @@ public interface BusDepositFictitiousMapper extends BaseMapper<BusDepositFictiti
      * @return
      */
     List<AppBusSalesOrderDepositListVo> getList(String sid);
+
+    String selectDeposit(String depositBillNo);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml

@@ -48,4 +48,10 @@
                  left join bus_deposit bd2 on bf.depositBillSid = bd2.billSid
         where bf.depositSid = #{sid}
     </select>
+
+    <select id="selectDeposit" resultType="java.lang.String">
+        select sum(bf.price)
+        from bus_deposit_fictitious bf
+        where depositBillNo = #{depositBillNo}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java

@@ -99,4 +99,8 @@ public class BusDepositFictitiousService extends MybatisBaseService<BusDepositFi
     public List<AppBusSalesOrderDepositListVo> getList(String sid) {
         return baseMapper.getList(sid);
     }
+
+    public String selectDeposit(String depositBillNo) {
+        return baseMapper.selectDeposit(depositBillNo);
+    }
 }

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

@@ -45,7 +45,8 @@
         bmd.staffName AS sellerName,
         bmd.orgName,
         if(length(bmd.nodeState) > 0, nodeState, '待提交') AS virtualOrderState,
-        bmd.remarks
+        bmd.remarks,
+        bd.usedDeposit
         FROM bus_main_deposit bmd
         LEFT JOIN bus_deposit_vehicle_customer bdvc ON bmd.sid = bdvc.billSid
         LEFT JOIN bus_deposit bd ON bmd.sid = bd.billSid
@@ -67,7 +68,8 @@
             bmd.staffName AS sellerName,
             bmd.orgName,
             if(length(bmd.nodeState) > 0, nodeState, '待提交') AS virtualOrderState,
-            bmd.remarks
+            bmd.remarks,
+            bd.usedDeposit
             FROM bus_main_deposit bmd
             LEFT JOIN bus_deposit_vehicle_customer bdvc ON bmd.sid = bdvc.billSid
             LEFT JOIN bus_deposit bd ON bmd.sid = bd.billSid
@@ -88,7 +90,8 @@
             bmd.staffName AS sellerName,
             bmd.orgName,
             if(length(bmd.nodeState) > 0, nodeState, '待提交') AS virtualOrderState,
-            bmd.remarks
+            bmd.remarks,
+            bd.usedDeposit
             FROM bus_main_deposit bmd
             LEFT JOIN bus_deposit_vehicle_customer bdvc ON bmd.sid = bdvc.billSid
             LEFT JOIN bus_deposit bd ON bmd.sid = bd.billSid

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

@@ -71,7 +71,6 @@ import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
 import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum;
 import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo;
 import com.yxt.anrui.flowable.api.sysprourl.SysProUrlFeign;
-import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.api.utils.ProcessStateEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
@@ -94,7 +93,9 @@ import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.messagecenter.api.message.*;
+import com.yxt.messagecenter.api.message.MessageFeign;
+import com.yxt.messagecenter.api.message.MessageFlowVo;
+import com.yxt.messagecenter.api.message.MessageFlowableQuery;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -643,7 +644,12 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                 AppBusDepositBusDetailsVo vo = baseMapper.selDepositByBillsid(virtualOrderSid);
                 record.setPayName(vo.getPayName());
                 record.setMobile(vo.getMobile());
-                List<BusDepositRecordsVo> depositRecords = busDepositFictitiousService.getDepositRecords(record.getVirtualOrderId());
+                if(StringUtils.isNotBlank(record.getUsedDeposit())){
+                    record.setDescribe("订金: " + vo.getDeposit() + "元 已用:" + record.getUsedDeposit() + "元");
+                }else{
+                    record.setDescribe("订金: " + vo.getDeposit() + "元 已用:" + "0" + "元");
+                }
+                /*List<BusDepositRecordsVo> depositRecords = busDepositFictitiousService.getDepositRecords(record.getVirtualOrderId());
                 if (depositRecords.size() > 0) {
                     for (BusDepositRecordsVo depositRecord : depositRecords) {
                         String usePrice = depositRecord.getUsePrice();
@@ -655,7 +661,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                     record.setDescribe("订金: " + vo.getDeposit() + "元 已用:" + bigDecimalAll.toString() + "元");
                 } else {
                     record.setDescribe("订金: " + vo.getDeposit() + "元 已用:" + "0" + "元");
-                }
+                }*/
                 record.setCarNumber(vo.getCarNumber());
             } else if (record.getVirtualOrderType().equals("02")) {
                 BusDepositVehicleCustomer busDepositVehicleCustomer = baseMapper.selectVehicleCustomerByBillSid(virtualOrderSid);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java

@@ -252,6 +252,10 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
                     busDepositFictitious.setPayPath(payPath);
                 }
                 busDepositFictitiousService.save(busDepositFictitious);
+                //查询该虚拟订金单已使用的订金值
+                String depositAll = busDepositFictitiousService.selectDeposit(listDto.getDepositBillNo());
+                //更新该虚拟订单的订金值
+                busDepositService.updateDeposit(depositAll,listDto.getDepositBillNo());
             }
         }
         return rb.success().setMsg("保存成功");

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmOrderVehicleDemandQuery.java

@@ -7,7 +7,10 @@ import lombok.Data;
 @Data
 public class AppCrmOrderVehicleDemandQuery implements Query {
 
+    private static final long serialVersionUID = -6941183575825055762L;
     @ApiModelProperty("客户sid")
     private String customerSid;
 
+    private String names;
+
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java

@@ -468,7 +468,13 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
     private QueryWrapper<CrmVehicledemand> AppCreatePagePcWrapper(AppCrmOrderVehicleDemandQuery query) {
         QueryWrapper<CrmVehicledemand> qw = new QueryWrapper<>();
         if (query != null) {
-            qw.eq("cv.customerSid", query.getCustomerSid());
+            if(StringUtils.isNotBlank(query.getCustomerSid())){
+                qw.eq("cv.customerSid", query.getCustomerSid());
+            }
+            if(StringUtils.isNotBlank(query.getNames())){
+                qw.like("cv.modelName",query.getNames());
+            }
+
         }
         //是否意向：0非意向，1意向
         qw.eq("states", 1);

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/CrmOrderVehicleDemandQuery.java

@@ -15,4 +15,6 @@ public class CrmOrderVehicleDemandQuery implements Query {
 
     @ApiModelProperty("客户sid")
     private String customerSid;
+
+    private String names;
 }