diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index 9b734f1a7d..675c5c51bf 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java @@ -403,4 +403,11 @@ public interface BusSalesOrderFeign { @PostMapping("/saveList") @ResponseBody void saveList(@RequestBody() List orders); + + /**********************************************小程序订单列表********************************************************/ + + @ApiOperation("小程序销售订单分页列表") + @PostMapping("/getSaleOrdersWx") + @ResponseBody + public ResultBean> getSaleOrdersWx(@RequestBody PagerQuery pq); } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderQuery.java index fbc25a0ea8..39360ba0ae 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderQuery.java @@ -63,7 +63,4 @@ public class AppBusSalesOrderQuery implements Query { private String staffSid; @ApiModelProperty("当前组织机构全路径sid") private String orgPath; - - - } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java index e043f3a3fc..7b13ef56bb 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java @@ -53,6 +53,9 @@ import lombok.Data; public class AppBusSalesOrderVo implements Vo { private static final long serialVersionUID = -5570433499942792774L; + + @ApiModelProperty("经销商") + private String dealer; /** * 销售订单sid */ diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java index 0d1273db11..78939f316a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java @@ -456,4 +456,11 @@ public class BusSalesOrderRest implements BusSalesOrderFeign { public void saveList(List orders) { busSalesOrderService.saveList(orders); } + + @Override + public ResultBean> getSaleOrdersWx(PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = busSalesOrderService.getSaleOrdersWx(pq); + return rb.success().setData(pv); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 4942d685ee..e27b50ee7b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -430,7 +430,7 @@ public class BusSalesOrderService extends MybatisBaseService busSalesOrderTrailerDetailsVos = busSalesOrderTrailerService.fetchAllByOrderSid(sid); - if (busSalesOrderTrailerDetailsVos.size() == 1){ + if (busSalesOrderTrailerDetailsVos.size() == 1) { BusSalesOrderTrailerDetailsVo busSalesOrderTrailerDetailsVo = busSalesOrderTrailerDetailsVos.get(0); BusSalesOrderTrailer busSalesOrderTrailer = busSalesOrderTrailerService.fetchBySid(busSalesOrderTrailerDetailsVo.getSid()); String certFile = busSalesOrderTrailer.getCertFile(); - if (StringUtils.isNotBlank(certFile)){ + if (StringUtils.isNotBlank(certFile)) { String[] certFiles = certFile.split(","); List certFiless = new ArrayList<>(); for (String path : certFiles) { @@ -497,7 +497,7 @@ public class BusSalesOrderService extends MybatisBaseService contractFiless = new ArrayList<>(); for (String path : contractFiles) { @@ -509,12 +509,12 @@ public class BusSalesOrderService extends MybatisBaseService certFiless1 = new ArrayList<>(); for (String path : certFiles1) { @@ -526,7 +526,7 @@ public class BusSalesOrderService extends MybatisBaseService contractFiless1 = new ArrayList<>(); for (String path : contractFiles1) { @@ -541,7 +541,7 @@ public class BusSalesOrderService extends MybatisBaseService certFiless2 = new ArrayList<>(); for (String path : certFiles2) { @@ -553,7 +553,7 @@ public class BusSalesOrderService extends MybatisBaseService contractFiless2 = new ArrayList<>(); for (String path : contractFiles2) { @@ -709,9 +709,9 @@ public class BusSalesOrderService extends MybatisBaseService 0){ + if (i > 0) { vo.setTrailerInfoState(1); - }else { + } else { vo.setTrailerInfoState(0); } - }else { + } else { vo.setTrailerState(false); vo.setTrailerInfoState(0); } @@ -2150,6 +2150,26 @@ public class BusSalesOrderService extends MybatisBaseService appCreateQueryWrapperWx(AppBusSalesOrderQuery query) { + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + if (query != null) { + if (StringUtils.isNotBlank(query.getUserSid())) { + SysUserVo sysUserVo = sysUserFeign.fetchBySid(query.getUserSid()).getData(); + CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.selByMobile(sysUserVo.getMobile()).getData(); + qw.eq("bo.customerSid", crmCustomerTempVo.getSid()); + } + qw.eq("bo.nodeState", "已办结"); + } + return qw; + } + /** * App销售订单分页列表 * @@ -2510,9 +2530,9 @@ public class BusSalesOrderService extends MybatisBaseService appOrderTrailerInfoVos = new ArrayList<>(); for (BusSalesOrderTrailerDetailsVo busSalesOrderTrailerDetailsVo : busSalesOrderTrailerDetailsVos) { AppOrderTrailerInfoVo appOrderTrailerInfoVo = new AppOrderTrailerInfoVo(); - BeanUtil.copyProperties(busSalesOrderTrailerDetailsVo,appOrderTrailerInfoVo,"contractFile","certFile"); + BeanUtil.copyProperties(busSalesOrderTrailerDetailsVo, appOrderTrailerInfoVo, "contractFile", "certFile"); List contractFile = busSalesOrderTrailerDetailsVo.getContractFile(); List certFile = busSalesOrderTrailerDetailsVo.getCertFile(); ArrayList contractFileString = new ArrayList<>(); @@ -3909,9 +3929,9 @@ public class BusSalesOrderService extends MybatisBaseService busSalesOrderTrailerDetailsVos = busSalesOrderTrailerService.fetchAllByOrderSid(busSalesOrder.get().getSid()); BigDecimal total = new BigDecimal("0"); @@ -5221,10 +5241,10 @@ public class BusSalesOrderService extends MybatisBaseService busSalesOrderTrailerDetailsVos = busSalesOrderTrailerService.fetchAllByOrderSid(busSalesOrder.getSid()); //获取挂车金额 BigDecimal gcMoney = new BigDecimal("0"); - if ("1".equals(busSalesOrder.getPayTypeKey())){ - if (busSalesOrderTrailerDetailsVos.size() == 1){ + if ("1".equals(busSalesOrder.getPayTypeKey())) { + if (busSalesOrderTrailerDetailsVos.size() == 1) { gcMoney = gcMoney.add(busSalesOrderTrailerDetailsVos.get(0).getSingleFinalPrice().multiply(new BigDecimal(busSalesOrderTrailerDetailsVos.get(0).getTrailerCount()))); - }else if (busSalesOrderTrailerDetailsVos.size() == 2){ + } else if (busSalesOrderTrailerDetailsVos.size() == 2) { BigDecimal gc1 = busSalesOrderTrailerDetailsVos.get(0).getSingleFinalPrice().multiply(new BigDecimal(busSalesOrderTrailerDetailsVos.get(0).getTrailerCount())); BigDecimal gc2 = busSalesOrderTrailerDetailsVos.get(1).getSingleFinalPrice().multiply(new BigDecimal(busSalesOrderTrailerDetailsVos.get(1).getTrailerCount())); gcMoney = gcMoney.add(gc1).add(gc2); @@ -6136,10 +6156,10 @@ public class BusSalesOrderService extends MybatisBaseService busSalesOrderTrailerDetailsVos = busSalesOrderTrailerService.fetchAllByOrderSid(busSalesOrder.getSid()); //获取挂车金额 BigDecimal gcMoney = new BigDecimal("0"); - if ("1".equals(busSalesOrder.getPayTypeKey())){ - if (busSalesOrderTrailerDetailsVos.size() == 1){ + if ("1".equals(busSalesOrder.getPayTypeKey())) { + if (busSalesOrderTrailerDetailsVos.size() == 1) { gcMoney = gcMoney.add(busSalesOrderTrailerDetailsVos.get(0).getSingleFinalPrice().multiply(new BigDecimal(busSalesOrderTrailerDetailsVos.get(0).getTrailerCount()))); - }else if (busSalesOrderTrailerDetailsVos.size() == 2){ + } else if (busSalesOrderTrailerDetailsVos.size() == 2) { BigDecimal gc1 = busSalesOrderTrailerDetailsVos.get(0).getSingleFinalPrice().multiply(new BigDecimal(busSalesOrderTrailerDetailsVos.get(0).getTrailerCount())); BigDecimal gc2 = busSalesOrderTrailerDetailsVos.get(1).getSingleFinalPrice().multiply(new BigDecimal(busSalesOrderTrailerDetailsVos.get(1).getTrailerCount())); gcMoney = gcMoney.add(gc1).add(gc2); @@ -7559,7 +7579,7 @@ public class BusSalesOrderService extends MybatisBaseService busSalesOrderTrailerDetailsVos = busSalesOrderTrailerService.fetchAllByOrderSid(saleOrderSid); - if (null != busSalesOrderTrailerDetailsVos){ + if (null != busSalesOrderTrailerDetailsVos) { for (BusSalesOrderTrailerDetailsVo busSalesOrderTrailerDetailsVo : busSalesOrderTrailerDetailsVos) { - if (null != busSalesOrderTrailerDetailsVo){ + if (null != busSalesOrderTrailerDetailsVo) { BusSalesOrderTrailer newBusSalesOrderTrailer = new BusSalesOrderTrailer(); String makeupSid = newBusSalesOrderTrailer.getSid(); Date makeupCreateTime = newBusSalesOrderTrailer.getCreateTime(); @@ -8271,6 +8292,63 @@ public class BusSalesOrderService extends MybatisBaseService orders) { - baseMapper.saveList(orders); + baseMapper.saveList(orders); + } + + public PagerVo getSaleOrdersWx(PagerQuery pq) { + QueryWrapper qw = appCreateQueryWrapperWx(pq.getParams()); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), ""); + for (AppBusSalesOrderVo record : pagging.getRecords()) { + record.setShowFinancialBtn(false); + record.setShowStopBtn(false); + record.setShowContractBtn(false); + record.setShowBorrowBtn(false); + record.setShowInputBtn(false); + record.setShowApplyBtn(false); + if (StringUtils.isBlank(record.getClosingDate())) { + record.setClosingDate("-"); + } + if (StringUtils.isNotBlank(record.getCustomerImage())) { + record.setCustomerImage(fileUploadComponent.getUrlPrefix() + record.getCustomerImage()); + } + //已交定金 + String deposit = "-"; + BigDecimal depositBig = new BigDecimal("0"); + if (StringUtils.isNotBlank(record.getDepositAll())) { + //需补交订金 + if (StringUtils.isNotBlank(record.getMakeUpDeposit())) { + depositBig = new BigDecimal(record.getDepositAll()).subtract(new BigDecimal(record.getMakeUpDeposit())); + } else { + depositBig = new BigDecimal(record.getDepositAll()); + } + //将已交订金转为string + deposit = depositBig.toString(); + } + record.setDeposit(deposit); + //查询车型信息 + AppModelInfoVo appModelInfo = baseMapper.selectModelInfoByOrderSid(record.getSaleOrderSid()); + if (appModelInfo != null) { + if (StringUtils.isBlank(appModelInfo.getPrice())) { + appModelInfo.setPrice("-"); + } + //根据车型查询车型图片 + ResultBean imageString = baseVehicleModelAppendixFeign.selectImage(appModelInfo.getModelSid()); + if (imageString.getSuccess()) { + appModelInfo.setCarImage(imageString.getData().toString()); + } + record.setModelInfo(appModelInfo); + } + //是否保险 + String insuranceInfo = record.getInsuranceInfo(); + if (StringUtils.isBlank(insuranceInfo)) { + record.setInsuranceInfo("-"); + } + if (StringUtils.isBlank(record.getSaleOrderState())) { + record.setSaleOrderState("待提交"); + } + } + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; } } diff --git 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 index 4da467a42b..9953b4abae 100644 --- 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 @@ -43,10 +43,7 @@ import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; -import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; -import com.yxt.anrui.portal.api.sysuser.SysUserFeign; -import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo; -import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.portal.api.sysuser.*; import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; import com.yxt.anrui.portal.config.DictCommonType; import com.yxt.common.base.config.component.FileUploadComponent; @@ -935,6 +932,11 @@ public class CrmCustomerTempService extends MybatisBaseService().fail().setMsg("手机号不能为空"); + } else { + SysUser one = sysUserService.fetchByUserName(mobile); + if (null != one) { + return new ResultBean().fail().setMsg("手机号重复!`"); + } + } + if (userType == 0) { + return new ResultBean().fail().setMsg("用户类型不能为空"); + } + String password = mobile.substring(5, 11); + String md5 = Encodes.md5(password); + SysUser su = new SysUser(); + dto.fillEntity(su); + su.setUserName(mobile); + su.setPassword(md5); + sysUserService.save(su); + return rb.success(); + } + @Override public ResultBean delSysUserByMobile(String mobile) { int i = sysUserService.delSysUserByMobile(mobile); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java index 45238f1eea..d5597ef2c6 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java @@ -5226,6 +5226,8 @@ public class LoanRepaymentScheduleService extends MybatisBaseService o = new ArrayList<>(); if (Q.compareTo(BigDecimal.ZERO) == 0) { for (int i = 0; i < M1; i++) { + boolean pd = false; LoanRepaymentPlanDetails plan = m.get(i); LoanRepaymentHistory history = new LoanRepaymentHistory(); history.setCreateBySid(userSid); @@ -5845,6 +5851,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService 0) { + pd = true; plan.setPaymentInterest(L); plan.setOverdue(0); FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR(); @@ -5860,6 +5867,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService 0) { + pd = true; plan.setOverdue(0); FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR(); jr.setCreateBySid(userSid); @@ -5881,7 +5889,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService 0 || B.compareTo(BigDecimal.ZERO) > 0) { + if (pd) { planDetails.add(plan); } } @@ -5913,14 +5921,22 @@ public class LoanRepaymentScheduleService extends MybatisBaseService 0) { + pd = true; //垫款金额、垫资方逾期利息 D1 = T1.compareTo(m1i) >= 0 ? m1i : T1; - BigDecimal L1 = L.multiply(D1.divide(T, BigDecimal.ROUND_CEILING)); + BigDecimal L1 = BigDecimal.ZERO; + if (D1.compareTo(T) >= 0) { + L1 = T; + } else { + BigDecimal bigDecimal = D1.divide(T, 2, BigDecimal.ROUND_HALF_UP); + L1 = L.multiply(bigDecimal); + } T1 = T1.subtract(D1); p.setPaymentInterest(L1); p.setOverdue(0); @@ -5939,9 +5955,16 @@ public class LoanRepaymentScheduleService extends MybatisBaseService 0) { + pd = true; //资金占用费 temp = Q1.compareTo(m1i) >= 0 ? m1i : Q1; - BigDecimal B1 = B.multiply(temp.divide(Q, BigDecimal.ROUND_CEILING)); + BigDecimal B1 = BigDecimal.ZERO; + if (temp.compareTo(Q) >= 0) { + B1 = Q; + } else { + BigDecimal bigDecimal = temp.divide(Q, 2, BigDecimal.ROUND_HALF_UP); + B1 = B.multiply(bigDecimal); + } if (Q1.compareTo(m1i) < 0) { //生成 i 期还款记录，月还金额 m1i - Q1 LoanRepaymentHistory history = new LoanRepaymentHistory(); @@ -5983,11 +6006,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService 0 || Q1.compareTo(BigDecimal.ZERO) > 0) { - planDetails.add(p); - } - if (Q1.compareTo(BigDecimal.ZERO) == 0) { + } else if (Q1.compareTo(BigDecimal.ZERO) == 0) { LoanRepaymentHistory history = new LoanRepaymentHistory(); history.setCreateBySid(userSid); history.setDataTime(new Date()); @@ -6005,16 +6024,27 @@ public class LoanRepaymentScheduleService extends MybatisBaseService 0) { + pd = true; //垫款金额、垫资方逾期利息 D1 = T1.compareTo(m2i) >= 0 ? m2i : T1; - BigDecimal L1 = L.multiply(D1.divide(T, BigDecimal.ROUND_CEILING)); + BigDecimal L1 = BigDecimal.ZERO; + if (D1.compareTo(T) >= 0) { + L1 = T; + } else { + BigDecimal bigDecimal = D1.divide(T, 2, BigDecimal.ROUND_HALF_UP); + L1 = L.multiply(bigDecimal); + } T1 = T1.subtract(D1); p.setPaymentInterest(L1); p.setOverdue(0); @@ -6033,9 +6063,16 @@ public class LoanRepaymentScheduleService extends MybatisBaseService 0) { + pd = true; //资金占用费 temp = Q1.compareTo(m2i) >= 0 ? m2i : Q1; - BigDecimal B1 = B.multiply(temp.divide(Q, BigDecimal.ROUND_CEILING)); + BigDecimal B1 = BigDecimal.ZERO; + if (temp.compareTo(Q) >= 0) { + B1 = Q; + } else { + BigDecimal bigDecimal = temp.divide(Q, 2, BigDecimal.ROUND_HALF_UP); + B1 = B.multiply(bigDecimal); + } if (Q1.compareTo(m2i) < 0) { //生成 i 期还款记录，月还金额 m1i - Q1 LoanRepaymentHistory history = new LoanRepaymentHistory(); @@ -6077,11 +6114,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService 0 || Q1.compareTo(BigDecimal.ZERO) > 0) { - planDetails.add(p); - } - if (Q1.compareTo(BigDecimal.ZERO) == 0) { + } else if (Q1.compareTo(BigDecimal.ZERO) == 0) { LoanRepaymentHistory history = new LoanRepaymentHistory(); history.setCreateBySid(userSid); history.setDataTime(new Date()); @@ -6099,11 +6132,12 @@ public class LoanRepaymentScheduleService extends MybatisBaseService o = loanRepaymentPlanDetailsService.selByMainSidAndPolicyOrOther(schedule.getSid(), "1"); if (Q.compareTo(BigDecimal.ZERO) == 0) { for (int i = 0; i < M1; i++) { + boolean pd = false; LoanRepaymentPlanDetails plan = m.get(i); LoanRepaymentHistory history = new LoanRepaymentHistory(); history.setCreateBySid(userSid); @@ -6131,6 +6166,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService 0) { + pd = true; plan.setPaymentInterest(L); plan.setOverdue(0); FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR(); @@ -6145,6 +6181,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService 0) { + pd = true; plan.setOverdue(0); FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR(); jr.setCreateBySid(userSid); @@ -6165,7 +6202,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService 0 || B.compareTo(BigDecimal.ZERO) > 0) { + if (pd) { planDetails.add(plan); } } @@ -6215,14 +6252,22 @@ public class LoanRepaymentScheduleService extends MybatisBaseService 0) { + pd = true; //垫款金额、垫资方逾期利息 D1 = T1.compareTo(m1i) >= 0 ? m1i : T1; - BigDecimal L1 = L.multiply(D1.divide(T, BigDecimal.ROUND_CEILING)); + BigDecimal L1 = BigDecimal.ZERO; + if (D1.compareTo(T) >= 0) { + L1 = T; + } else { + BigDecimal bigDecimal = D1.divide(T, 2, BigDecimal.ROUND_HALF_UP); + L1 = L.multiply(bigDecimal); + } T1 = T1.subtract(D1); p.setPaymentInterest(L1); p.setOverdue(0); @@ -6241,9 +6286,16 @@ public class LoanRepaymentScheduleService extends MybatisBaseService 0) { + pd = true; //资金占用费 temp = Q1.compareTo(m1i) >= 0 ? m1i : Q1; - BigDecimal B1 = B.multiply(temp.divide(Q, BigDecimal.ROUND_CEILING)); + BigDecimal B1 = BigDecimal.ZERO; + if (temp.compareTo(Q) >= 0) { + B1 = Q; + } else { + BigDecimal bigDecimal = temp.divide(Q, 2, BigDecimal.ROUND_HALF_UP); + B1 = B.multiply(bigDecimal); + } if (Q1.compareTo(m1i) < 0) { //生成 i 期还款记录，月还金额 m1i - Q1 LoanRepaymentHistory history = new LoanRepaymentHistory(); @@ -6285,11 +6337,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService 0 || Q1.compareTo(BigDecimal.ZERO) > 0) { - planDetails.add(p); - } - if (Q1.compareTo(BigDecimal.ZERO) == 0) { + } else if (Q1.compareTo(BigDecimal.ZERO) == 0) { LoanRepaymentHistory history = new LoanRepaymentHistory(); history.setCreateBySid(userSid); history.setDataTime(new Date()); @@ -6307,16 +6355,27 @@ public class LoanRepaymentScheduleService extends MybatisBaseService 0) { + pd = true; //垫款金额、垫资方逾期利息 D1 = T1.compareTo(m2i) >= 0 ? m2i : T1; - BigDecimal L1 = L.multiply(D1.divide(T, BigDecimal.ROUND_CEILING)); + BigDecimal L1 = BigDecimal.ZERO; + if (D1.compareTo(T) >= 0) { + L1 = T; + } else { + BigDecimal bigDecimal = D1.divide(T, 2, BigDecimal.ROUND_HALF_UP); + L1 = L.multiply(bigDecimal); + } T1 = T1.subtract(D1); p.setPaymentInterest(L1); p.setOverdue(0); @@ -6335,9 +6394,16 @@ public class LoanRepaymentScheduleService extends MybatisBaseService 0) { + pd = true; //资金占用费 temp = Q1.compareTo(m2i) >= 0 ? m2i : Q1; - BigDecimal B1 = B.multiply(temp.divide(Q, BigDecimal.ROUND_CEILING)); + BigDecimal B1 = BigDecimal.ZERO; + if (temp.compareTo(Q) >= 0) { + B1 = Q; + } else { + BigDecimal bigDecimal = temp.divide(Q, 2, BigDecimal.ROUND_HALF_UP); + B1 = B.multiply(bigDecimal); + } if (Q1.compareTo(m2i) < 0) { //生成 i 期还款记录，月还金额 m1i - Q1 LoanRepaymentHistory history = new LoanRepaymentHistory(); @@ -6379,11 +6445,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService 0 || Q1.compareTo(BigDecimal.ZERO) > 0) { - planDetails.add(p); - } - if (Q1.compareTo(BigDecimal.ZERO) == 0) { + } else if (Q1.compareTo(BigDecimal.ZERO) == 0) { LoanRepaymentHistory history = new LoanRepaymentHistory(); history.setCreateBySid(userSid); history.setDataTime(new Date()); @@ -6401,6 +6463,10 @@ public class LoanRepaymentScheduleService extends MybatisBaseService> getSaleOrdersWx(@RequestBody PagerQuery pq); + /*-------------------------------------App销售订单接口------------------------------------------------*/ @ApiOperation("初始化销售订单状态") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java index eca7e1927f..a8686f24ff 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java @@ -15,6 +15,9 @@ import lombok.Data; public class BusOrderSalesVo implements Vo { private static final long serialVersionUID = 6162163732173109484L; + @ApiModelProperty("经销商") + private String dealer; + /** * 销售订单sid */ diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java index 6a24505f49..0d5bde0557 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java @@ -83,6 +83,12 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign { @Autowired AppBusSalesOrderService appBusSalesOrderService; + /************************************ 小程序订单接口 *********************************************/ + + @Override + public ResultBean> getSaleOrdersWx(PagerQuery pq) { + return appBusSalesOrderService.getSaleOrdersWx(pq); + } /************************************* 销售订单接口 *********************************************/ diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java index d3c5e5bddb..dd6d580af5 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java @@ -1021,4 +1021,12 @@ public class AppBusSalesOrderService { appSalesOrderTrailerDetailsVo.setContractFile(contractFiless); return rb.success().setData(appSalesOrderTrailerDetailsVo); } + + public ResultBean> getSaleOrdersWx(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerQuery pq = CoverUtils.getPagerQuery(pagerQuery); + ResultBean> resultBean = busSalesOrderFeign.getSaleOrdersWx(pq); + PagerVo vo = CoverUtils.selectPagerVo(resultBean.getData()); + return rb.success().setMsg("当前共查询到" + vo.getTotal() + "条记录").setData(vo); + } } \ No newline at end of file diff --git a/yxt-as-ui/src/api/warehouse/warehouse.js b/yxt-as-ui/src/api/warehouse/warehouse.js index e04753d56c..3cea8fde01 100644 --- a/yxt-as-ui/src/api/warehouse/warehouse.js +++ b/yxt-as-ui/src/api/warehouse/warehouse.js @@ -67,4 +67,12 @@ export default { }) }, + // 按角色（配件主管、配件计划员、仓库管理员）获取人员 + selMangerByRole: function(params) { + return request({ + url: '/wms/apiadmin/base/wmswarehouseinfo/selMangerByRole', + method: 'get', + params: params, + }) + }, } diff --git a/yxt-as-ui/src/views/maintenance/maintenanceOutbound/relation/chooseproducts.vue b/yxt-as-ui/src/views/maintenance/maintenanceOutbound/relation/chooseproducts.vue index c26bed2d9f..d7899d7996 100644 --- a/yxt-as-ui/src/views/maintenance/maintenanceOutbound/relation/chooseproducts.vue +++ b/yxt-as-ui/src/views/maintenance/maintenanceOutbound/relation/chooseproducts.vue @@ -53,7 +53,7 @@ - + @@ -192,8 +192,8 @@ } }, - toInfo(row){ - this.$emit('backData', row.sid) + toInfo(row) { + this.$emit('backData', row.sid) }, // 返回 handleReturn() { diff --git a/yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue b/yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue index fdb020d415..335b6c48c0 100644 --- a/yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue +++ b/yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue @@ -31,7 +31,7 @@ - +
* 选择所属库区
 + +
库位编码
+ + {{formobj.rackCode}} + + + + - + @@ -121,7 +130,7 @@ formobj: { sid: '', rackName: '', - rackCode: '', + rackCode: '由系统自动生成。格式：排-架-层-位。', warehouseName: '', warehouseSid: '', locationName: '', @@ -144,16 +153,6 @@ required: true, message: '请选择所属库区', trigger: 'change' - }], - rackName: [{ - required: true, - message: '库位名称不能为空', - trigger: 'blur' - }], - rackCode: [{ - required: true, - message: '库位编码不能为空', - trigger: 'blur' }] } } @@ -208,70 +207,6 @@ saveOrUpdate() { console.log('>>>>>>>>>saveOrUpdate', this.formobj) - // if (this.formobj.warehouseSid == '' || this.formobj.warehouseName == '') { - // this.$message({ - // showClose: true, - // type: 'warning', - // message: "请选择所属仓库" - // }) - // return - // } - - // if (this.formobj.locationSid == '' || this.formobj.locationSid == '') { - // this.$message({ - // showClose: true, - // type: 'warning', - // message: "请选择所属库区" - // }) - // return - // } - - - // if (this.formobj.rackName == '') { - // this.$message({ - // showClose: true, - // type: 'warning', - // message: "库位名称不能为空" - // }) - // return - // } - - - // if (this.formobj.rackCode == '') { - // this.$message({ - // showClose: true, - // type: 'warning', - // message: "库位编码不能为空" - // }) - // return - // } - - - var aaa = this.formobj.rackCode.split('-') - - console.log('>>>>>>>>>saveOrUpdate', aaa) - if (aaa.length != 4) { - this.$message({ - showClose: true, - type: 'warning', - message: '库位编码格式错误' - }) - return - } - - for (var i = 0; i < aaa.length; i++) { - if (aaa[i] == '') { - this.$message({ - showClose: true, - type: 'warning', - message: '库位编码格式错误' - }) - return - } - } - - - this.$refs['form_obj'].validate((valid) => { if (valid) { req.saveGoodsShelves(this.formobj) diff --git a/yxt-as-ui/src/views/warehouse/goodsShelves/index.vue b/yxt-as-ui/src/views/warehouse/goodsShelves/index.vue index 7e480d41e9..b531dc7a49 100644 --- a/yxt-as-ui/src/views/warehouse/goodsShelves/index.vue +++ b/yxt-as-ui/src/views/warehouse/goodsShelves/index.vue @@ -9,9 +9,9 @@
- + @@ -59,10 +59,11 @@ inactive-value="2" @change="enableChange(scope.row.sid,scope.row.isEnable)" /> - - + + +
@@ -171,9 +172,9 @@ this.sids = aa }, getwarehouse() { - var parpams = { - orgPath:window.sessionStorage.getItem('defaultOrgPath'), - } + var parpams = { + orgPath: window.sessionStorage.getItem('defaultOrgPath'), + } req2.getAllWarehouse(parpams).then(resp => { console.log('>>>>>>>>>getAllWarehouse', resp) this.warehouseList = resp.data diff --git a/yxt-as-ui/src/views/warehouse/warehouse/index.vue b/yxt-as-ui/src/views/warehouse/warehouse/index.vue index a1aa285e7b..9cbd5650af 100644 --- a/yxt-as-ui/src/views/warehouse/warehouse/index.vue +++ b/yxt-as-ui/src/views/warehouse/warehouse/index.vue @@ -53,7 +53,7 @@ - + diff --git a/yxt-as-ui/src/views/warehouse/warehouse/warehouseAdd.vue b/yxt-as-ui/src/views/warehouse/warehouse/warehouseAdd.vue index 6520d3ef62..f1449615c2 100644 --- a/yxt-as-ui/src/views/warehouse/warehouse/warehouseAdd.vue +++ b/yxt-as-ui/src/views/warehouse/warehouse/warehouseAdd.vue @@ -20,10 +20,11 @@ -
* 仓库编码
+
仓库编码
- + {{formobj.warehouseCode}} + @@ -39,7 +40,7 @@ -
* 仓库类型
+
仓库类型
@@ -61,7 +62,15 @@
仓库管理员
- + + + + + + + + @@ -98,7 +107,7 @@ - + @@ -168,7 +177,8 @@ -