移动端销售订单订金信息修复

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

@@ -248,4 +248,9 @@ public interface BusSalesOrderFeign {
     @GetMapping("/selectOrderByContractNo")
     @ResponseBody
     ResultBean<BusSalesOrder> selectOrderByContractNo(@RequestParam("contractNo")String contractNo);
+
+    @ApiOperation("销售订单的虚拟订金删除")
+    @DeleteMapping("/deleteVirtualDepositList")
+    @ResponseBody
+    ResultBean deleteVirtualDepositList(@RequestParam("saleOrderSid") String saleOrderSid, @RequestParam("virtualOrderSid") String virtualOrderSid, @RequestParam("depositRecordSid") String depositRecordSid);
 }

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

@@ -224,4 +224,9 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
     public ResultBean<BusSalesOrder> selectOrderByContractNo(String contractNo) {
         return null;
     }
+
+    @Override
+    public ResultBean deleteVirtualDepositList(String saleOrderSid, String virtualOrderSid, String depositRecordSid) {
+        return null;
+    }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/app/AppBusSalesOrderDepositListDto.java

@@ -28,4 +28,7 @@ public class AppBusSalesOrderDepositListDto implements Dto {
     private String price;
     @ApiModelProperty(value = "委托书")
     private List<String> entrustImage;
+
+    @ApiModelProperty("虚拟订金使用记录")
+    private String useDepositRecordSid;
 }

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

@@ -85,4 +85,6 @@ public interface BusDepositFictitiousMapper extends BaseMapper<BusDepositFictiti
     List<AppBusSalesOrderDepositListVo> getList(String sid);
 
     String selectDeposit(String depositBillNo);
+
+    List<String> getStringList(String salesOrderSid);
 }

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

@@ -56,4 +56,12 @@
         from bus_deposit_fictitious bf
         where depositBillNo = #{depositBillNo}
     </select>
+
+    <select id="getStringList" resultType="java.lang.String">
+        select bf.sid
+        from bus_deposit_fictitious bf
+                 left join bus_sales_order_deposit bd on bd.sid = bf.depositSid
+                 left join bus_sales_order bo on bo.sid = bd.salesOrderSid
+        where bo.sid = #{salesOrderSid}
+    </select>
 </mapper>

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

@@ -106,4 +106,8 @@ public class BusDepositFictitiousService extends MybatisBaseService<BusDepositFi
     public String selectDeposit(String depositBillNo) {
         return baseMapper.selectDeposit(depositBillNo);
     }
+
+    public List<String> getStringList(String salesOrderSid) {
+        return baseMapper.getStringList(salesOrderSid);
+    }
 }

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

@@ -301,4 +301,9 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
     public ResultBean<BusSalesOrder> selectOrderByContractNo(String contractNo) {
         return busSalesOrderService.selectOrderByContractNo(contractNo);
     }
+
+    @Override
+    public ResultBean deleteVirtualDepositList(String saleOrderSid, String virtualOrderSid, String depositRecordSid) {
+        return busSalesOrderService.deleteVirtualDepositList(saleOrderSid, virtualOrderSid,depositRecordSid);
+    }
 }

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

@@ -3262,4 +3262,26 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         }
         return rb.success();
     }
+
+    public ResultBean deleteVirtualDepositList(String saleOrderSid, String virtualOrderSid, String depositRecordSid) {
+        ResultBean rb = ResultBean.fireFail();
+        //查询该销售订单是否存在
+        BusSalesOrder busSalesOrder = fetchBySid(saleOrderSid);
+        if(busSalesOrder == null){
+            return rb.setMsg("该销售订单不存在");
+        }
+        //查询该销售订单的使用记录是否存在
+        BusDepositFictitious busDepositFictitious = busDepositFictitiousService.fetchBySid(depositRecordSid);
+        if(busDepositFictitious == null){
+            return rb.setMsg("该虚拟订金使用记录不存在");
+        }
+        //更新
+        //查询该虚拟订金单已使用的订金值
+        String depositAll = busDepositFictitiousService.selectDeposit(busDepositFictitious.getDepositBillNo());
+        depositAll = new BigDecimal(depositAll).subtract(busDepositFictitious.getPrice()).toString();
+        //更新该虚拟订单的订金值
+        busDepositService.updateDeposit(depositAll, busDepositFictitious.getDepositBillNo());
+        busDepositFictitiousService.deleteBySid(depositRecordSid);
+        return rb.success();
+    }
 }

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

@@ -58,10 +58,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -208,16 +206,48 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
         if ("02".equals(dto.getDepositTypeKey())) {
             List<AppBusSalesOrderDepositListDto> listVos = dto.getVirtualOrderList();
             listVos.removeAll(Collections.singleton(null));
-            for (AppBusSalesOrderDepositListDto listDto : listVos) {
-                //查询付款人是否和客户一样
-                BusDeposit busDeposit = busDepositService.selectByBillSid(listDto.getDepositBillSid());
-                if (!busSalesOrder.getCustomerName().equals(busDeposit.getDraweeName())) {
-                    if (listDto.getEntrustImage().isEmpty()) {
-                        return rb.setMsg("选择的虚拟订金单中有付款人与该客户不一致，请上传款项支付委托书");
+            if (!listVos.isEmpty()) {
+                //判断是否存在重复的虚拟订金单
+                List<String> depositNoList = listVos.stream().map(v->v.getDepositBillNo()).collect(Collectors.toList());
+                Set<String> set = new HashSet<>(depositNoList);
+                if(depositNoList.size() != set.size()){
+                    return rb.setMsg("存在相同虚拟订金单,请刷新后重新添加");
+                }
+                //查询存在使用记录sid的与数据库中该销售订单的虚拟订金使用记录的是否一致，若不一致则提示刷新后重试。若一致则继续
+                List<String> recordSidList = listVos.stream().filter(v-> null != v.getUseDepositRecordSid()).filter(v->!v.getUseDepositRecordSid().isEmpty()).map(v->v.getUseDepositRecordSid()).collect(Collectors.toList());
+                Set<String> setRecord = new HashSet<>(recordSidList);
+                if(recordSidList.size() != setRecord.size()) {
+                    return rb.setMsg("存在相同虚拟订金单，请刷新后重新添加");
+                }
+                //查询该销售订单下的所有虚拟订金单的信息
+                List<String> recordSidLists = busDepositFictitiousService.getStringList(salesOrderSid);
+                if(recordSidList.size() != recordSidLists.size()){
+                    return rb.setMsg("存在缓存数据，请刷新后再进行保存操作");
+                }else{
+                    recordSidList.removeAll(recordSidLists);
+                    if(recordSidList.size()>0){
+                        return rb.setMsg("存在缓存数据，请刷新后再进行保存操作");
+                    }
+                    recordSidList = listVos.stream().filter(v-> null != v.getUseDepositRecordSid()).filter(v->!v.getUseDepositRecordSid().isEmpty()).map(v->v.getUseDepositRecordSid()).collect(Collectors.toList());
+                    recordSidLists.removeAll(recordSidList);
+                    if(recordSidLists.size()>0){
+                        return rb.setMsg("存在缓存数据，请刷新后再进行保存操作");
                     }
                 }
-                makeUpDecimal = makeUpDecimal.add(new BigDecimal(listDto.getPrice()));
+
+                for (AppBusSalesOrderDepositListDto listDto : listVos) {
+                    //查询付款人是否和客户一样
+                    BusDeposit busDeposit = busDepositService.selectByBillSid(listDto.getDepositBillSid());
+                    if (!busSalesOrder.getCustomerName().equals(busDeposit.getDraweeName())) {
+                        if (listDto.getEntrustImage().isEmpty()) {
+                            return rb.setMsg("选择的虚拟订金单中有付款人与该客户不一致，请上传款项支付委托书");
+                        }
+                    }
+                    makeUpDecimal = makeUpDecimal.add(new BigDecimal(listDto.getPrice()));
+                }
+
             }
+
         }
         BusSalesOrderDeposit busSalesOrderDeposit = baseMapper.selectByOrderSid(salesOrderSid);
         String depositSid = "";
@@ -341,8 +371,8 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
             }
             //查询已审核通过的款项确认
             ResultBean<List<String>> stringList = finCollectionConfirmationFeign.billeNoList();
-            if(stringList.getSuccess()){
-                qw.in("bmd.billNo",stringList.getData());
+            if (stringList.getSuccess()) {
+                qw.in("bmd.billNo", stringList.getData());
             }
         }
         qw.eq("bmd.nodeState", FlowComment.SETTLE.getRemark());//已办结
@@ -371,7 +401,7 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
      * @param salesOrderSid 销售订单sid
      * @return
      */
-    public int updateBySalesOrderSid(BigDecimal depositSum, String salesOrderSid,BigDecimal bigDecimalSum) {
-        return baseMapper.updateBySalesOrderSid(depositSum, salesOrderSid,bigDecimalSum);
+    public int updateBySalesOrderSid(BigDecimal depositSum, String salesOrderSid, BigDecimal bigDecimalSum) {
+        return baseMapper.updateBySalesOrderSid(depositSum, salesOrderSid, bigDecimalSum);
     }
 }

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

@@ -207,6 +207,11 @@ public interface AppBusSalesOrderFeign {
     @ResponseBody
     ResultBean<PagerVo<DepositListVo>> getDepositList(@RequestBody PagerQuery<DepositInfoQuery> pagerQuery);
 
+    @ApiOperation("虚拟订金删除")
+    @DeleteMapping("/deleteVirtualDepositList")
+    @ResponseBody
+    ResultBean deleteVirtualDepositList(@RequestParam("saleOrderSid") String saleOrderSid, @RequestParam("virtualOrderSid") String virtualOrderSid, @RequestParam("depositRecordSid") String depositRecordSid);
+
     /*-----------------------------------------补充说明------------------------------------------*/
 
     @ApiOperation("保存销售订单补充说明")

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

@@ -182,6 +182,11 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
         return null;
     }
 
+    @Override
+    public ResultBean deleteVirtualDepositList(String saleOrderSid, String virtualOrderSid, String depositRecordSid) {
+        return null;
+    }
+
     @Override
     public ResultBean updateNodesBySid(OrderRemarksDto dto) {
         return null;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/depositinfo/DepositInfoListDto.java

@@ -32,5 +32,7 @@ public class DepositInfoListDto implements Dto {
     private String price;
     @ApiModelProperty(value = "委托书")
     private List<String> entrustImage;
+    @ApiModelProperty("虚拟订金单使用记录sid")
+    private String useDepositRecordSid;
 
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java

@@ -269,6 +269,11 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
         return appBusSalesOrderService.getDepositList(pagerQuery);
     }
 
+    @Override
+    public ResultBean deleteVirtualDepositList(String saleOrderSid, String virtualOrderSid, String depositRecordSid) {
+        return appBusSalesOrderService.deleteVirtualDepositList(saleOrderSid,virtualOrderSid,depositRecordSid);
+    }
+
     @Override
     public ResultBean updateNodesBySid(OrderRemarksDto dto) {
         return appBusSalesOrderService.updateNodesBySid(dto);

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

@@ -595,4 +595,13 @@ public class AppBusSalesOrderService {
         ResultBean resultBean = busSalesOrderFeign.saveSaleOrderInputVin(vinDto);
         return resultBean;
     }
+
+    public ResultBean deleteVirtualDepositList(String saleOrderSid, String virtualOrderSid, String depositRecordSid) {
+        ResultBean rb = ResultBean.fireFail();
+        ResultBean resultBean = busSalesOrderFeign.deleteVirtualDepositList(saleOrderSid, virtualOrderSid, depositRecordSid);
+        if(!resultBean.getSuccess()){
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success();
+    }
 }