企业开票信息管理

2 years ago · 9512c25484
10 changed files with 127 additions and 15 deletions
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmAppDisAndCustm.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmAppDisAndCustm.java
@ -0,0 +1,11 @@
+package com.yxt.anrui.crm.api.crmcustomertemp;
+
+import lombok.Data;
+
+@Data
+public class CrmAppDisAndCustm {
+
+    private String id;
+    private String dictValue;
+    private CrmExtra extra;
+}
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java
@ -93,7 +93,7 @@ public interface CrmCustomerTempFeign {
     */
    @ApiOperation("开票信息维护客户新增修改")
    @PostMapping("/billApplicatSaveCust")
-    public ResultBean billApplicatSaveCust(@Valid @RequestBody CrmCustomerBillApplicationDto dto);
+    public ResultBean<CrmAppDisAndCustm> billApplicatSaveCust(@Valid @RequestBody CrmCustomerBillApplicationDto dto);


    /**
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmExtra.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmExtra.java
@ -0,0 +1,11 @@
+package com.yxt.anrui.crm.api.crmcustomertemp;
+
+import lombok.Data;
+
+@Data
+public class CrmExtra {
+
+    private String name;
+    private String sid;
+    private String info;
+}
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java
@ -115,7 +115,7 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign {
    }

    @Override
-    public ResultBean billApplicatSaveCust(CrmCustomerBillApplicationDto dto) {
+    public ResultBean<CrmAppDisAndCustm> billApplicatSaveCust(CrmCustomerBillApplicationDto dto) {
        return crmCustomerTempService.billApplicatSaveCust(dto);
    }

--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
@ -1101,7 +1101,7 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
        return rb.success().setData(customerQuery.getCustomerNo());
    }

-    public ResultBean billApplicatSaveCust(CrmCustomerBillApplicationDto dto) {
+    public ResultBean<CrmAppDisAndCustm> billApplicatSaveCust(CrmCustomerBillApplicationDto dto) {
        ResultBean rb = ResultBean.fireFail();
        String dtoSid = dto.getSid();
        //手机号
@ -1116,6 +1116,11 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
        String name = dto.getName();
        //业务员sid
        String staffSid = dto.getStaffSid();
+        if (StringUtils.isBlank(staffSid)){
+            String userSid = dto.getCreateBySid();
+            SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
+            staffSid = sysUserVo.getStaffSid();
+        }
        if (StringUtils.isBlank(dtoSid)){//新增
            //生成客户编码：分公司简称+部门编码+手机号+姓名首字母大写拼写
            String customerNo = getPrefix(staffSid, name, phone);
@ -1145,8 +1150,16 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
            crmCustomerTempDto.setIsOnRemindkey("0");
            crmCustomerTempDto.setIsOnRemind("否");
            crmCustomerTempDto.setRemind_day("未设置提醒");
-            saveCrmCustomerTemp(crmCustomerTempDto, sysUserVo);
-            return rb.success();
+            CrmCustomerTemp crmCustomerTempNew = saveCrmCustomerTemp(crmCustomerTempDto, sysUserVo);
+            CrmAppDisAndCustm crmAppDisAndCustm = new CrmAppDisAndCustm();
+            CrmExtra crmExtra = new CrmExtra();
+            crmAppDisAndCustm.setId(crmCustomerTempNew.getSid());
+            crmAppDisAndCustm.setDictValue(crmCustomerTempNew.getName());
+            crmExtra.setSid(crmCustomerTempNew.getSid());
+            crmExtra.setName(crmCustomerTempNew.getName());
+            crmExtra.setInfo(crmCustomerTempNew.getIDNumber());
+            crmAppDisAndCustm.setExtra(crmExtra);
+            return rb.success().setData(crmAppDisAndCustm);
        }
        CrmCustomerTempUpdateDto crmCustomerTempDto = new CrmCustomerTempUpdateDto();
        crmCustomerTempDto.setName(name);
@ -1162,6 +1175,14 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
        if (!resultBean.getSuccess()) {
            return rb.setMsg(resultBean.getMsg());
        }
-        return rb.success().setMsg(resultBean.getMsg());
+        CrmAppDisAndCustm crmAppDisAndCustm = new CrmAppDisAndCustm();
+        CrmExtra crmExtra = new CrmExtra();
+        crmAppDisAndCustm.setId(dtoSid);
+        crmAppDisAndCustm.setDictValue(name);
+        crmExtra.setSid(dtoSid);
+        crmExtra.setName(name);
+        crmExtra.setInfo(crmCustomerTempDto.getIDNumber());
+        crmAppDisAndCustm.setExtra(crmExtra);
+        return rb.success().setMsg(resultBean.getMsg()).setData(crmAppDisAndCustm);
    }
 }
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinAppDisAndCustm.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinAppDisAndCustm.java
@ -0,0 +1,11 @@
+package com.yxt.anrui.fin.api.fincompanyinvoicing;
+
+import lombok.Data;
+
+@Data
+public class FinAppDisAndCustm {
+
+    private String id;
+    private String dictValue;
+    private FinExtra extra;
+}
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java
@ -25,8 +25,6 @@
 *********************************************************/
 package com.yxt.anrui.fin.api.fincompanyinvoicing;

-import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceQuery;
-import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@ -111,7 +109,7 @@ public interface FinCompanyInvoicingFeign {
    @ApiOperation("企业开票信息管理新增或保存")
    @PostMapping("/qySaveOrUpdate")
    @ResponseBody
-    public ResultBean qySaveOrUpdate(@RequestBody FinCompanyInvoicingDto dto);
+    public ResultBean<FinAppDisAndCustm> qySaveOrUpdate(@RequestBody FinCompanyInvoicingDto dto);

    @ApiOperation("企业开票信息管理根据分公司sid查询不带采购系统的开票信息")
    @PostMapping("/qySelByUseOrgSid")
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinExtra.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinExtra.java
@ -0,0 +1,11 @@
+package com.yxt.anrui.fin.api.fincompanyinvoicing;
+
+import lombok.Data;
+
+@Data
+public class FinExtra {
+
+    private String name;
+    private String sid;
+    private String info;
+}
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java
@ -132,7 +132,7 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign {
 	}

 	@Override
-	public ResultBean qySaveOrUpdate(FinCompanyInvoicingDto dto) {
+	public ResultBean<FinAppDisAndCustm> qySaveOrUpdate(FinCompanyInvoicingDto dto) {
 		return finCompanyInvoicingService.qySaveOrUpdate(dto);
 	}

--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java
@ -155,10 +155,11 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
        return rb.success();
    }

-    public void insertByDto(FinCompanyInvoicingDto dto) {
+    public String insertByDto(FinCompanyInvoicingDto dto) {
        FinCompanyInvoicing entity = new FinCompanyInvoicing();
        BeanUtil.copyProperties(dto, entity, "id", "sid");
        baseMapper.insert(entity);
+        return entity.getSid();
    }

    public void updateByDto(FinCompanyInvoicingDto dto) {
@ -260,7 +261,7 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
        return p;
    }

-    public ResultBean qySaveOrUpdate(FinCompanyInvoicingDto dto) {
+    public ResultBean<FinAppDisAndCustm> qySaveOrUpdate(FinCompanyInvoicingDto dto) {
        ResultBean rb = ResultBean.fireFail();
        String dtoSid = dto.getSid();
        String useOrgSid = dto.getUseOrgSid();
@ -284,8 +285,32 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
            if (finCompanyInvoicingDetailsVo1 != null || finCompanyInvoicingDetailsVo2 != null) {
                return rb.setMsg("该企业开票信息已存在");
            }
-            this.insertByDto(dto);
-            return rb.success();
+            String sid = this.insertByDto(dto);
+            FinAppDisAndCustm finAppDisAndCustm = new FinAppDisAndCustm();
+            FinExtra finExtra = new FinExtra();
+            finAppDisAndCustm.setId(sid);
+            finAppDisAndCustm.setDictValue(name);
+            finExtra.setSid(sid);
+            finExtra.setName(name);
+            String openTickRemarks = "";
+            if (StringUtils.isNotBlank(openTickRemarks + dto.getTaxpayerNo())) {
+                openTickRemarks = openTickRemarks + dto.getTaxpayerNo() + "；";
+            }
+            if (StringUtils.isNotBlank(dto.getAddress())) {
+                openTickRemarks = openTickRemarks + dto.getAddress() + "；";
+            }
+            if (StringUtils.isNotBlank(dto.getPhone())) {
+                openTickRemarks = openTickRemarks + dto.getPhone() + "；";
+            }
+            if (StringUtils.isNotBlank(dto.getBankName())) {
+                openTickRemarks = openTickRemarks + dto.getBankName() + "；";
+            }
+            if (StringUtils.isNotBlank(dto.getBankAccount())) {
+                openTickRemarks = openTickRemarks + dto.getBankAccount() + "；";
+            }
+            finExtra.setInfo(openTickRemarks);
+            finAppDisAndCustm.setExtra(finExtra);
+            return rb.success().setData(finAppDisAndCustm);
        }
        QueryWrapper qw1 = new QueryWrapper<>();
        qw1.eq("useOrgSid", useOrgSid);
@ -301,7 +326,31 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
            return rb.setMsg("该企业开票信息已存在");
        }
        this.updateByDto(dto);
-        return rb.success();
+        FinAppDisAndCustm finAppDisAndCustm = new FinAppDisAndCustm();
+        FinExtra finExtra = new FinExtra();
+        finAppDisAndCustm.setId(dtoSid);
+        finAppDisAndCustm.setDictValue(name);
+        finExtra.setSid(dtoSid);
+        finExtra.setName(name);
+        String openTickRemarks = "";
+        if (StringUtils.isNotBlank(openTickRemarks + dto.getTaxpayerNo())) {
+            openTickRemarks = openTickRemarks + dto.getTaxpayerNo() + "；";
+        }
+        if (StringUtils.isNotBlank(dto.getAddress())) {
+            openTickRemarks = openTickRemarks + dto.getAddress() + "；";
+        }
+        if (StringUtils.isNotBlank(dto.getPhone())) {
+            openTickRemarks = openTickRemarks + dto.getPhone() + "；";
+        }
+        if (StringUtils.isNotBlank(dto.getBankName())) {
+            openTickRemarks = openTickRemarks + dto.getBankName() + "；";
+        }
+        if (StringUtils.isNotBlank(dto.getBankAccount())) {
+            openTickRemarks = openTickRemarks + dto.getBankAccount() + "；";
+        }
+        finExtra.setInfo(openTickRemarks);
+        finAppDisAndCustm.setExtra(finExtra);
+        return rb.success().setData(finAppDisAndCustm);
    }

    public List<FinCompanyInvoicingDetailsVo> qyFetchListByName(String name,String useOrgSid) {