Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js

@@ -181,3 +181,12 @@ export function getButtonPermissions(data) {
     headers: { 'Content-Type': 'application/json' }
   })
 }
+
+// 根据当前登录用户分公司sid获取所有用户
+export function getGressionUserList(data) {
+  return request({
+    url: 'portal/v1/sysstaffinfo/getGressionUserList',
+    method: 'get',
+    params: data
+  })
+}

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/billingmanagement.vue

@@ -151,12 +151,41 @@
     <el-dialog :append-to-body="true" :visible.sync="dialogImgVisible">
       <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in srcList" :key="index" :src="item" :preview-src-list="srcList"></el-image>
     </el-dialog>
+
+    <el-dialog :append-to-body="true" :visible.sync="dialogFileVisible">
+      <el-form :model="formobj" ref="form_obj" :rules="rules" class="formadd">
+        <el-row style="border: 1px solid #E0E3EB">
+          <el-col :span="6" class="tleftb">
+            <span><span class="icon">*</span>移交日期</span>
+          </el-col>
+          <el-col :span="18">
+            <el-form-item prop="transferTime">
+              <el-date-picker v-model="formobj.transferTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" class="tleftb">
+            <span><span class="icon">*</span>接收人</span>
+          </el-col>
+          <el-col :span="18">
+            <el-form-item prop="recipient">
+              <el-select v-model="formobj.recipient" placeholder="请选择" @change="changeRecipient" clearable>
+                <el-option v-for="item in user_list" :key="item.userSid" :label="item.userName" :value="item.userName"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" type="primary" @click="handleConfirm">确定</el-button>
+        <el-button size="small" @click="dialogFileVisible = false">取消</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listPage, cancellation } from '@/api/anruifinmanagement/fininvoiceapply'
-import { getOrgSidByPath, typeValues, getButtonPermissions } from '@/api/jichuxinxi/dictcommons'
+import { listPage, cancellation, saveOrUpdate } from '@/api/anruifinmanagement/fininvoiceapply'
+import { getOrgSidByPath, typeValues, getButtonPermissions, getGressionUserList } from '@/api/jichuxinxi/dictcommons'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
@@ -184,6 +213,13 @@ export default {
           btnKey: 'toEdit',
           btnLabel: '编辑'
         },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: '',
+          btnKey: 'doHandover',
+          btnLabel: '移交'
+        },
         {
           type: 'danger',
           size: 'small',
@@ -212,6 +248,7 @@ export default {
       invoiceType_list: [],
       state_list: [],
       invoiceState_list: [],
+      user_list: [],
       FormLoading: false,
       listLoading: false,
       listQuery: {
@@ -234,7 +271,17 @@ export default {
         size: 10,
         total: 0
       },
-      rules: {}
+      formobj: {
+        recipient: '',
+        recipientSid: '',
+        showTransfer: true,
+        transferTime: '',
+        sid: ''
+      },
+      rules: {
+        transferTime: [{ required: true, message: '移交日期不能为空', trigger: 'blur' }],
+        recipient: [{ required: true, message: '接收人不能为空', trigger: 'change' }]
+      }
     }
   },
   created() {
@@ -272,6 +319,9 @@ export default {
         case 'toEdit':
           this.toEdit()
           break
+        case 'doHandover':
+          this.doHandover()
+          break
         case 'doCancellation':
           this.doCancellation()
           break
@@ -301,6 +351,11 @@ export default {
       getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
         if (res.success) {
           this.listQuery.params.createOrgSid = res.data
+          getGressionUserList({ userSid: window.sessionStorage.getItem('userSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
+            if (resp.success) {
+              this.user_list = resp.data
+            }
+          })
           this.getList()
           console.log(this.listQuery.params.createOrgSid)
         }
@@ -318,7 +373,10 @@ export default {
       const bb = []
       row.forEach(element => {
         aa.push(element.sid)
-        bb.push(element.billingState)
+        bb.push({
+          billingState: element.billingState,
+          transferState: element.transferState
+        })
       })
       this.sids = aa
       this.nodeState_list = bb
@@ -372,7 +430,7 @@ export default {
       if (this.sids.length === 1) {
         if (this.nodeState_list.length > 0) {
           for (var i = 0; i < this.nodeState_list.length; i++) {
-            if (this.nodeState_list[i] === '作废' || this.nodeState_list[i] === '已开票') {
+            if (this.nodeState_list[i].billingState === '作废' || this.nodeState_list[i].billingState === '已开票') {
               this.$message({ showClose: true, type: 'error', message: '因选择的记录中包含作废或已开票的,操作失败' })
               return
             }
@@ -385,6 +443,44 @@ export default {
         return
       }
     },
+    doHandover() {
+      if (this.sids.length === 1) {
+        if (this.nodeState_list[0].billingState === '已开票' && this.nodeState_list[0].transferState === '未移交') {
+          this.formobj = {
+            recipient: '',
+            recipientSid: '',
+            showTransfer: true,
+            transferTime: '',
+            sid: ''
+          }
+          this.dialogFileVisible = true
+        } else {
+          this.$message({ showClose: true, type: 'error', message: '请选择发票状态为已开票且交接状态为未移交的进行移交操作' })
+          return
+        }
+      } else {
+        this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行移交操作' })
+        return
+      }
+    },
+    changeRecipient(value) {
+      const choose = this.user_list.filter((item) => item.userName === value)
+      this.formobj.recipientSid = choose[0].userSid
+    },
+    handleConfirm() {
+      this.formobj.sid = this.sids[0]
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          saveOrUpdate(this.formobj).then((resp) => {
+            if (resp.success) {
+              this.$message({ showClose: true, type: 'success', message: '移交成功' })
+              this.getList()
+              this.dialogFileVisible = false
+            }
+          })
+        }
+      })
+    },
     doCancellation() {
       if (this.sids.length === 0) {
         this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行作废操作' })
@@ -392,7 +488,7 @@ export default {
       }
       if (this.nodeState_list.length > 0) {
         for (var i = 0; i < this.nodeState_list.length; i++) {
-          if (this.nodeState_list[i] === '作废') {
+          if (this.nodeState_list[i].billingState === '作废') {
             this.$message({ showClose: true, type: 'error', message: '因选择的记录中包含作废的,操作失败' })
             return
           }

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

@@ -1175,7 +1175,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
      * @param userSid
      * @return
      */
-    public ResultBean cashierConfirm111(String sid, String userSid) {
+    public ResultBean cashierConfirm(String sid, String userSid) {
         ResultBean rb = ResultBean.fireFail();
         FinCollectionConfirmation confirmation = fetchBySid(sid);
         if (confirmation == null) {
@@ -1217,7 +1217,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         ARReceivebill.FRECEIVEBILLENTRY freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
         //推送全款车款
         List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "车款", "1");
-        List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1_1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "首付款", "1");
+        List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1_1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "首付款及费用", "1");
         //推送全款订金
         List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos2 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "订金", "1");
         //贷款推送车款
@@ -1951,7 +1951,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
     }
 
     //备份
-    public ResultBean cashierConfirm(String sid, String userSid) {
+    public ResultBean cashierConfirm111(String sid, String userSid) {
         ResultBean rb = ResultBean.fireFail();
         FinCollectionConfirmation confirmation = fetchBySid(sid);
         if (confirmation == null) {
@@ -2315,7 +2315,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         ARReceivebill.FRECEIVEBILLENTRY freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
         //推送全款车款
         List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "车款", "1");
-        List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1_1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "首付款", "1");
+        List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1_1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "首付款及费用", "1");
         //推送全款订金
         List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos2 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "订金", "1");
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@@ -110,6 +110,58 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 }
             }
         }
+        //自营非担保和贷款的需要填写金融方案
+        if ("01".equals(dto.getTypeKey()) || StringUtils.isBlank(dto.getTypeKey())) {
+            String mainVehicleAmount = dto.getMainVehicleAmount();
+            if (StringUtils.isBlank(mainVehicleAmount)) {
+                return rb.setMsg("主车发票价不能为空");
+            }
+            //是否勾选融资票据
+            if (dto.isAccessoriesAmountCb()) {
+                //融资票据
+                String accessoriesAmount = dto.getAccessoriesAmount();
+                if (StringUtils.isBlank(accessoriesAmount)) {
+                    return rb.setMsg("请输入融资票据");
+                }
+            }
+            //是否勾选挂车
+            if (dto.isTrailerAmountCb()) {
+                //挂车
+                String trailerAmount = dto.getTrailerAmount();
+                if (StringUtils.isBlank(trailerAmount)) {
+                    return rb.setMsg("请输入挂车金额");
+                }
+            }
+            //是否勾选保险
+            if (dto.isPremiumCb()) {
+                //保险
+                String premium = dto.getPremium();
+                if (StringUtils.isBlank(premium)) {
+                    return rb.setMsg("请输入保险金额");
+                } else {
+                    if (StringUtils.isNotBlank(dto.getOffsetPremium())) {
+                        if(new BigDecimal(dto.getOffsetPremium()).compareTo(new BigDecimal(premium))>0){
+                            return rb.setMsg("抵顶首年保险费不能超过保险费用");
+                        }
+                    }
+                }
+            }
+            //是否勾选购置税
+            if (dto.isPurchaseTaxCb()) {
+                //购置税
+                String purchaseTax = dto.getPurchaseTax();
+                if (StringUtils.isBlank(purchaseTax)) {
+                    return rb.setMsg("请输入购置税");
+                } else{
+                    if (StringUtils.isNotBlank(dto.getOffsetPurchasetax())) {
+                        if(new BigDecimal(dto.getOffsetPurchasetax()).compareTo(new BigDecimal(purchaseTax))>0){
+                            return rb.setMsg("抵顶购置税不能超过购置税");
+                        }
+                    }
+                }
+
+            }
+        }
 
         //查询金融方案
         LoanSolutions loanSolutions = baseMapper.selectBySaleOrderSid(dto.getSaleOrderSid());

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDetailsVo.java

@@ -172,4 +172,11 @@ public class AppSolutionsDetailsVo implements Vo {
     @ApiModelProperty("名义留购价")
     @JsonSerialize(using = ToStringSerializer.class)
     private String nominalPrice;
+
+    @ApiModelProperty("单台成交价")
+    private String finalPrice;
+    @ApiModelProperty("挂车价格")
+    private String gcPrice;
+    @ApiModelProperty("上装成交价")
+    private String szPrice;
 }