推送款项确认、以及移动端菜单排序修改

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -30,6 +30,8 @@ import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign;
 import com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFileFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.UnCollectionDto;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@@ -112,14 +114,6 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
     private DictCommonFeign dictCommonFeign;
     @Autowired
     private BusDepositFeign busDepositFeign;
-    /*  @Autowired
-      private BusOrderFeign busOrderFeign;
-      @Autowired
-      private BusOrderDiscountFeign busOrderDiscountFeign;*/
-  /*  @Autowired
-    private BusOrderModelFeign busOrderModelFeign;
-    @Autowired
-    private BusOrderVehicleFeign busOrderVehicleFeign;*/
     @Autowired
     private BusDepositVehicleFeign busDepositVehicleFeign;
     @Autowired
@@ -152,6 +146,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
     private MessageFeign messageFeign;
     @Autowired
     private FlowTaskFeign flowTaskFeign;
+    @Autowired
+    private FinUncollectedReceivablesDetailedFeign finUncollectedDetailedFeign;
 
     private QueryWrapper<CommonContract> createQueryWrapper(CommonContractQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -1447,6 +1443,59 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                             commonAppendixService.insert(commonAppendix);
                         }
                     }
+                    //添加推送至款项确认的应收未收明细中
+                    if ("现车".equals(appOrderDetailsVo.getOrderType())) {
+                        List<String> vinList = appOrderModelInfoVo.getVinList();
+                        for (int i = 0; i < vinList.size(); i++) {
+                            UnCollectionDto unCollectionDto = new UnCollectionDto();
+                            //合同sid
+                            unCollectionDto.setContractSid(commonContract.getSid());
+                            //合同编号
+                            unCollectionDto.setContractNo(commonContract.getContractNo());
+                            //客户名称
+                            unCollectionDto.setCustomerName(appOrderDetailsVo.getName());
+                            //客户sid
+                            unCollectionDto.setCustomerSid(appOrderDetailsVo.getCustomerSid());
+                            //客户类型
+                            unCollectionDto.setCustomerClass(appOrderDetailsVo.getCustomerKey());
+                            //客户类型
+                            unCollectionDto.setCustomerClassKey(appOrderDetailsVo.getCustomerType());
+                            //客户头像
+                            unCollectionDto.setCustomerImage(appOrderDetailsVo.getCustomerImage());
+                            unCollectionDto.setReceivablesName("订金");
+                            unCollectionDto.setCustomerPhone(appOrderDetailsVo.getPhone());
+                            unCollectionDto.setUseOrgSid(appOrderDetailsVo.getUseOrgSid());
+                            unCollectionDto.setVinNo(vinList.get(i).toString());
+                            unCollectionDto.setCurrentReceivableMoney(depositInfo.getDeposit());
+                            finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
+                        }
+                    } else {
+                        int qualiy = Integer.valueOf(appOrderModelInfoVo.getTotal()).intValue();
+                        for (int i = 0; i < qualiy; i++) {
+                            UnCollectionDto unCollectionDto = new UnCollectionDto();
+                            //合同sid
+                            unCollectionDto.setContractSid(commonContract.getSid());
+                            //合同编号
+                            unCollectionDto.setContractNo(commonContract.getContractNo());
+                            //客户名称
+                            unCollectionDto.setCustomerName(appOrderDetailsVo.getName());
+                            //客户sid
+                            unCollectionDto.setCustomerSid(appOrderDetailsVo.getCustomerSid());
+                            //客户类型
+                            unCollectionDto.setCustomerClass(appOrderDetailsVo.getCustomerKey());
+                            //客户类型
+                            unCollectionDto.setCustomerClassKey(appOrderDetailsVo.getCustomerType());
+                            //客户头像
+                            unCollectionDto.setCustomerImage(appOrderDetailsVo.getCustomerImage());
+                            unCollectionDto.setReceivablesName("订金");
+                            unCollectionDto.setCustomerPhone(appOrderDetailsVo.getPhone());
+                            unCollectionDto.setUseOrgSid(appOrderDetailsVo.getUseOrgSid());
+                            unCollectionDto.setCurrentReceivableMoney(depositInfo.getDeposit());
+                            finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
+                        }
+
+                    }
+
                     return commonContract.getSid();
                 });
             }

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

@@ -118,4 +118,7 @@ public class BusSalesOrder extends BaseEntity {
     private String financePlan;
     @ApiModelProperty(value = "付款类型下级value")
     private String financePlanValue;
+
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java

@@ -88,4 +88,7 @@ public class AppOrderDetailsVo implements Vo {
     private String financePlanValue;
     @ApiModelProperty("付款类型")
     private String payTypeKey;
+
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
 }

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

@@ -26,6 +26,7 @@
 package com.yxt.anrui.buscenter.biz.busmaindeposit;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -62,6 +63,8 @@ import com.yxt.anrui.buscenter.biz.busdepositvehiclecustomer.BusDepositVehicleCu
 import com.yxt.anrui.buscenter.biz.flow.FlowableService;
 import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowcomment.FlowComment;
@@ -179,6 +182,8 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
     private SysProUrlFeign sysProUrlFeign;
     @Autowired
     private MessageFeign messageFeign;
+    @Autowired
+    private FinCollectionConfirmationFeign finCollectionConfirmationFeign;
 
 
     public PagerVo<BusMainDeposit> listPage(PagerQuery<BusMainDepositQuery> pq) {
@@ -1992,13 +1997,37 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                 messageFlowableQuery.setMsgTitle("简易订单");
                 ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
             } else {
-                //更新已选择的车架号的状态为简易订单锁定
+                //如果类型为订金，推送款项确认
-                //如果类型为订车
                 if (DictCommonEnum.DepositBillType.JYDD_DJ.getCode().equals(busMainDeposit.getDepositBillTypeKey())) {
+                    BusDeposit busDeposit = busDepositService.selectByBillSid(bv.getBusinessSid());
                     //推送款项确认
+                    FinConfirmDto finConfirmDto = new FinConfirmDto();
+                    //收款日期
+                    finConfirmDto.setCollectionDate(DateUtil.format(busDeposit.getPaymentDate(), "yyyy-MM-dd"));
+                    //收款银行key
+                    finConfirmDto.setCollectionBankKey(busDeposit.getProBankKey());
+                    //收款银行value
+                    finConfirmDto.setCollectionBank(busDeposit.getProBankValue());
+                    //收款银行账号key
+                    finConfirmDto.setCollectionBankNumKey(busDeposit.getProBankAccKey());
+                    //收款银行账号value
+                    finConfirmDto.setCollectionBankNum(busDeposit.getProBankAccValue());
+                    //收款方式key
+                    finConfirmDto.setCollectionTypeKey(busDeposit.getPayTypeKey());
+                    //收款银行value
+                    finConfirmDto.setCollectionTypeValue(busDeposit.getPayType());
+                    //付款方名称
+                    //收款金额
+                    finConfirmDto.setCollectionMoney(busDeposit.getDeposit().toString());
+                    //分公司sid
+                    finConfirmDto.setUseOrgSid(busDeposit.getOrgSid());
+                    //创建人sid
+                    finConfirmDto.setCreateBySid(busMainDeposit.getCreateBySid());
+                    finCollectionConfirmationFeign.saveFinConfirm(finConfirmDto);
 
                 }
                 if (DictCommonEnum.DepositBillType.JYDD_DC.getCode().equals(busMainDeposit.getDepositBillTypeKey())) {
+                    //更新已选择的车架号的状态为简易订单锁定
                     AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(bv.getBusinessSid()).getData();
                     List<String> list = appBusDepositVehicleDetailVo.getVehicleList().stream().map(AppBusDepositVehicleListVo::getCarSid).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
                     BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();

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

@@ -195,7 +195,8 @@
                bo.orgSid,
                bo.billNo,
                bo.financePlanValue,
-               bo.payTypeKey
+               bo.payTypeKey,
+               bo.useOrgSid
         from bus_sales_order bo
         where sid = #{sid}
     </select>
@@ -230,15 +231,15 @@
 
     <select id="getApprovalContractList"
             resultType="com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo">
-        SELECT bo.sid as busSid,
+        SELECT bo.sid          as busSid,
-        bo.customerName as customerName,
+               bo.customerName as customerName,
-        bo.mobile as modelName,
+               bo.mobile       as modelName,
-        bsov.linkNo AS vin
+               bsov.linkNo     AS vin
         FROM bus_sales_order bo
-        LEFT JOIN bus_sales_order_vehicle bsov ON bsov.salesOrderSid = bo.sid
+                 LEFT JOIN bus_sales_order_vehicle bsov ON bsov.salesOrderSid = bo.sid
         <where>
             ${ew.sqlSegment}
-            and length( bo.contractNo ) > 1
+              and length(bo.contractNo) > 1
         </where>
     </select>
     <select id="selectByContractNo"

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

@@ -1422,6 +1422,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameChoose());
                     busSalesOrder.setAffiliatedCompanySid(dto.getAffiliatedOrgSid());
                 }
+                //根据用户sid查询分公司sid
+                String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
+                busSalesOrder.setUseOrgSid(useOrgSid);
                 boolean isSave = save(busSalesOrder);
                 if (!isSave) {
                     return rb.setMsg("保存失败");

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

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.fincollectionconfirmation;
 
+import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -108,4 +109,10 @@ public interface FinCollectionConfirmationFeign {
     @ApiOperation("手机端—查询可使用款项明细列表")
     @PostMapping("/getPaymentDetailsList")
     public ResultBean<PagerVo<AppFinUncollectedReceivablesDetailedVo>> getPaymentDetailsList(@RequestBody PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery);
+
+    @ApiOperation("简易订单-订金推送款项确认")
+    @PostMapping("/saveFinConfirm")
+    ResultBean saveFinConfirm(@RequestBody FinConfirmDto dto);
+
+
 }

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

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.fincollectionconfirmation;
 
+import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -113,4 +114,9 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf
     public ResultBean<PagerVo<AppFinUncollectedReceivablesDetailedVo>> getPaymentDetailsList(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
         return null;
     }
+
+    @Override
+    public ResultBean saveFinConfirm(FinConfirmDto dto) {
+        return null;
+    }
 }

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

@@ -0,0 +1,53 @@
+package com.yxt.anrui.fin.api.fincollectionconfirmation.app;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/2 11:11
+ * @Description
+ */
+@Data
+public class FinConfirmDto implements Dto {
+    private static final long serialVersionUID = 943766899406641199L;
+    @ApiModelProperty("收款日期")
+    private String collectionDate;
+
+    @ApiModelProperty("收款银行")
+    private String collectionBankKey;
+
+    @ApiModelProperty("收款银行")
+    private String collectionBank;
+
+    @ApiModelProperty("收款银行账号")
+    private String collectionBankNumKey;
+
+    @ApiModelProperty("收款银行账号")
+    private String collectionBankNum;
+
+    @ApiModelProperty("收款方式")
+    private String collectionTypeKey;
+
+    @ApiModelProperty("收款方式")
+    private String collectionTypeValue;
+
+    @ApiModelProperty("付款方名称")
+    private String payerName;
+
+    @ApiModelProperty("收款金额")
+    private String collectionMoney;
+
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+
+    @ApiModelProperty("创建人sid")
+    private String createBySid;
+
+    private List<FinSelectDto> finSelectList = new ArrayList<>();
+
+}

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

@@ -0,0 +1,36 @@
+package com.yxt.anrui.fin.api.fincollectionconfirmation.app;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/2 11:34
+ * @Description
+ */
+@Data
+public class FinSelectDto implements Dto {
+    private static final long serialVersionUID = -3886526423118907465L;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+
+    @ApiModelProperty("联系电话")
+    private String customerPhone;
+
+    @ApiModelProperty("应收项目名称")
+    private String receivablesName;
+    @ApiModelProperty("当前应收金额")
+    private String currentReceivableMoney;
+
+    @ApiModelProperty("认款申请日期")
+    private String subscriptionDate;
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java

@@ -90,4 +90,9 @@ public interface FinUncollectedReceivablesDetailedFeign {
     @ApiOperation("app获取账单详情")
     @PostMapping("/getCustomerBillDetail/{paymentSid}")
     public ResultBean<PagerVo<AppCustomerBillDetailVo>> getCustomerBillDetail(@PathVariable("paymentSid") String paymentSid);
+
+    @ApiOperation("合同推送-款项确认应收未收")
+    @PostMapping("/saveUnCollection")
+    ResultBean saveUnCollection(@RequestBody UnCollectionDto dto);
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java

@@ -90,4 +90,9 @@ public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncoll
 	public ResultBean<PagerVo<AppCustomerBillDetailVo>> getCustomerBillDetail(String paymentSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean saveUnCollection(UnCollectionDto dto) {
+		return null;
+	}
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/UnCollectionDto.java

@@ -0,0 +1,49 @@
+package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/2 15:11
+ * @Description
+ */
+@Data
+public class UnCollectionDto implements Dto {
+    private static final long serialVersionUID = -6071524233335201421L;
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+    @ApiModelProperty("联系电话")
+    private String customerPhone;
+
+    @ApiModelProperty("应收项目名称")
+    private String receivablesName;
+
+    @ApiModelProperty("当前应收金额")
+    private String currentReceivableMoney;
+
+    @ApiModelProperty("款项类型key")
+    private String paymentTypeKey;
+    @ApiModelProperty("款项类型value")
+    private String paymentTypeValue;
+
+    @ApiModelProperty("客户头像")
+    private String customerImage;
+    @ApiModelProperty("客户类型")
+    private String customerClass;
+    @ApiModelProperty("客户类型key")
+    private String customerClassKey;
+
+}

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

@@ -27,6 +27,7 @@ package com.yxt.anrui.fin.biz.fincollectionconfirmation;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -187,4 +188,9 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF
         PagerVo<AppFinUncollectedReceivablesDetailedVo> pagerVo = PagerUtil.pageToVo(iPage, page);
         return new ResultBean<PagerVo<AppFinUncollectedReceivablesDetailedVo>>().success().setData(pagerVo);
     }
+
+    @Override
+    public ResultBean saveFinConfirm(FinConfirmDto dto) {
+        return finCollectionConfirmationService.saveFinConfirm(dto);
+    }
 }

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

@@ -33,6 +33,7 @@ import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.AppFinSelectedReceivablesDetailedDto;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto;
@@ -54,19 +55,15 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.xml.crypto.Data;
 import java.math.BigDecimal;
-import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Optional;
 
 /**
  * Project: anrui-fin(销售相关) <br/>
@@ -348,7 +345,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         IPage<AppFinCollectionConfirmationPageVo> collectionConfirmList = baseMapper.getCollectionConfirmList(page, qw);
         for (AppFinCollectionConfirmationPageVo record : collectionConfirmList.getRecords()) {
             BigDecimal balance = record.getBalance();
-            int i = balance.intValue();
+            int i = 0;
+            if(balance != null){
+                i = balance.intValue();
+            }
             int collectionBillState = record.getAuditState();
             if (i <= 0) {
                 if (collectionBillState == 1 && collectionBillState == 3) {
@@ -737,4 +737,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         }
         return rb.success().setMsg("款项确认成功");
     }
+
+    public ResultBean saveFinConfirm(FinConfirmDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        FinCollectionConfirmation confirmation = new FinCollectionConfirmation();
+        BeanUtil.copyProperties(dto, confirmation);
+        baseMapper.insert(confirmation);
+        return rb.success();
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java

@@ -25,7 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed;
 
-import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationVo;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -55,66 +54,71 @@ import java.util.List;
 @RequestMapping("/finuncollectedreceivablesdetailed")
 public class FinUncollectedReceivablesDetailedRest implements FinUncollectedReceivablesDetailedFeign {
 
-	@Autowired
+    @Autowired
-	private FinUncollectedReceivablesDetailedService finUncollectedReceivablesDetailedService;
+    private FinUncollectedReceivablesDetailedService finUncollectedReceivablesDetailedService;
 
-	@Override
+    @Override
-	@ApiOperation("根据条件查询所有数据列表")
+    @ApiOperation("根据条件查询所有数据列表")
-	@PostMapping("/listAll")
+    @PostMapping("/listAll")
-	public ResultBean<List<DetailsOfReceivablesAndUncollectedItemsVo>> listAll(@RequestBody FinUncollectedReceivablesDetailedQuery query){
+    public ResultBean<List<DetailsOfReceivablesAndUncollectedItemsVo>> listAll(@RequestBody FinUncollectedReceivablesDetailedQuery query) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		List<DetailsOfReceivablesAndUncollectedItemsVo> list = finUncollectedReceivablesDetailedService.listAllVo(query);
+        List<DetailsOfReceivablesAndUncollectedItemsVo> list = finUncollectedReceivablesDetailedService.listAllVo(query);
-		return rb.success().setData(list);
+        return rb.success().setData(list);
-	}
+    }
 
-	@Override
+    @Override
-	@ApiOperation("新增或修改保存")
+    @ApiOperation("新增或修改保存")
-	@PostMapping("/saveOrUpdate")
+    @PostMapping("/saveOrUpdate")
-	public ResultBean saveOrUpdate(@RequestBody FinUncollectedReceivablesDetailedDto dto){
+    public ResultBean saveOrUpdate(@RequestBody FinUncollectedReceivablesDetailedDto dto) {
-		return finUncollectedReceivablesDetailedService.saveOrUpdateDto(dto);
+        return finUncollectedReceivablesDetailedService.saveOrUpdateDto(dto);
-	}
+    }
 
-	@Override
+    @Override
-	@ApiOperation("根据SID获取一条记录")
+    @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchBySid/{sid}")
-    public ResultBean<FinUncollectedReceivablesDetailedVo> fetchBySid(@PathVariable("sid") String sid){
+    public ResultBean<FinUncollectedReceivablesDetailedVo> fetchBySid(@PathVariable("sid") String sid) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		FinUncollectedReceivablesDetailedVo vo = new FinUncollectedReceivablesDetailedVo();
+        FinUncollectedReceivablesDetailedVo vo = new FinUncollectedReceivablesDetailedVo();
-		return rb.success().setData(vo);
+        return rb.success().setData(vo);
-	}
+    }
 
-	@Override
+    @Override
-	public ResultBean<PagerVo<CustomerBillSummaryVo>> customerBillListPage(PagerQuery<FinUncollectedReceivablesDetailedQuery> pq) {
+    public ResultBean<PagerVo<CustomerBillSummaryVo>> customerBillListPage(PagerQuery<FinUncollectedReceivablesDetailedQuery> pq) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		PagerVo<CustomerBillSummaryVo> pv = finUncollectedReceivablesDetailedService.listPageVo(pq);
+        PagerVo<CustomerBillSummaryVo> pv = finUncollectedReceivablesDetailedService.listPageVo(pq);
-		return rb.success().setData(pv);
+        return rb.success().setData(pv);
-	}
+    }
 
-	@Override
+    @Override
-	public ResultBean<PagerVo<FinUncollectedReceivablesDetailedVo>> customerBillDetailedListPage(PagerQuery<FinUncollectedReceivablesDetailedQuery> pq) {
+    public ResultBean<PagerVo<FinUncollectedReceivablesDetailedVo>> customerBillDetailedListPage(PagerQuery<FinUncollectedReceivablesDetailedQuery> pq) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		PagerVo<FinUncollectedReceivablesDetailedVo> pv = finUncollectedReceivablesDetailedService.detailedListPageVo(pq);
+        PagerVo<FinUncollectedReceivablesDetailedVo> pv = finUncollectedReceivablesDetailedService.detailedListPageVo(pq);
-		return rb.success().setData(pv);
+        return rb.success().setData(pv);
-	}
+    }
 
-	@Override
+    @Override
-	public ResultBean<PagerVo<AppCustomerBillSummaryDetailsVo>> getCustomerBillList(PagerQuery<AppFinUncollectedReceivablesDetailedQuery> pq) {
+    public ResultBean<PagerVo<AppCustomerBillSummaryDetailsVo>> getCustomerBillList(PagerQuery<AppFinUncollectedReceivablesDetailedQuery> pq) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		PagerVo<AppCustomerBillSummaryDetailsVo> pv = finUncollectedReceivablesDetailedService.getCustomerBillList(pq);
+        PagerVo<AppCustomerBillSummaryDetailsVo> pv = finUncollectedReceivablesDetailedService.getCustomerBillList(pq);
-		return rb.success().setData(pv);
+        return rb.success().setData(pv);
-	}
+    }
 
-	@Override
+    @Override
-	public ResultBean<PagerVo<AppCustomerBillSummaryVo>> getCustomerBill2List(PagerQuery<AppCustomerBillSummaryQuery> pq) {
+    public ResultBean<PagerVo<AppCustomerBillSummaryVo>> getCustomerBill2List(PagerQuery<AppCustomerBillSummaryQuery> pq) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		PagerVo<AppCustomerBillSummaryVo> pv = finUncollectedReceivablesDetailedService.getCustomerBill2List(pq);
+        PagerVo<AppCustomerBillSummaryVo> pv = finUncollectedReceivablesDetailedService.getCustomerBill2List(pq);
-		return rb.success().setData(pv);
+        return rb.success().setData(pv);
-	}
+    }
 
-	@Override
+    @Override
-	public ResultBean<PagerVo<AppCustomerBillDetailVo>> getCustomerBillDetail(String paymentSid) {
+    public ResultBean<PagerVo<AppCustomerBillDetailVo>> getCustomerBillDetail(String paymentSid) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		AppCustomerBillDetailVo vo = finUncollectedReceivablesDetailedService.getCustomerBillDetail(paymentSid);
+        AppCustomerBillDetailVo vo = finUncollectedReceivablesDetailedService.getCustomerBillDetail(paymentSid);
-		return rb.success().setData(vo);
+        return rb.success().setData(vo);
-	}
+    }
+
+    @Override
+    public ResultBean saveUnCollection(UnCollectionDto dto) {
+        return finUncollectedReceivablesDetailedService.saveUnCollection(dto);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@@ -27,14 +27,8 @@ package com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
-import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
-import com.yxt.anrui.base.api.commoncontract.CommonContract;
 import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
 import com.yxt.anrui.base.api.commoncontract.CommonContractVo;
-import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmation;
-import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationQuery;
-import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationVo;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*;
 import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService;
@@ -54,7 +48,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -477,4 +470,16 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         }
         return vo;
     }
+
+    public ResultBean saveUnCollection(UnCollectionDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        FinUncollectedReceivablesDetailed detailed = new FinUncollectedReceivablesDetailed();
+        BeanUtils.copyProperties(dto, detailed);
+        detailed.setVIN(dto.getVinNo());
+        if (StringUtils.isNotBlank(dto.getCurrentReceivableMoney())) {
+            detailed.setCurrentReceivableMoney(new BigDecimal(dto.getCurrentReceivableMoney()));
+        }
+        baseMapper.insert(detailed);
+        return rb.success();
+    }
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmobilemenu/SysMobileMenu.java

@@ -31,7 +31,7 @@ public class SysMobileMenu extends BaseEntity {
     private String path;
 
     @ApiModelProperty("排序")
-    private String sortNo;
+    private Integer sortNo;
 
     @ApiModelProperty("父级sid")
     private String psid;

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenu/SysMobileMenuService.java

@@ -37,6 +37,9 @@ public class SysMobileMenuService extends MybatisBaseService<SysMobileMenuMapper
                     sysMobileMenu.setIconUrl(sysMobileMenu.getIconUrl().replace(fileUploadComponent.getUrlPrefix(), ""));
                 }
             }
+            if (StringUtils.isNotBlank(dto.getSortNo())) {
+                sysMobileMenu.setSortNo(Integer.valueOf(dto.getSortNo()));
+            }
             baseMapper.insert(sysMobileMenu);
             sid = sysMobileMenu.getSid();
         } else {
@@ -50,6 +53,9 @@ public class SysMobileMenuService extends MybatisBaseService<SysMobileMenuMapper
                     sysMobileMenu.setIconUrl(sysMobileMenu.getIconUrl().replace(fileUploadComponent.getUrlPrefix(), ""));
                 }
             }
+            if (StringUtils.isNotBlank(dto.getSortNo())) {
+                sysMobileMenu.setSortNo(Integer.valueOf(dto.getSortNo()));
+            }
             baseMapper.updateById(sysMobileMenu);
 
         }