Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -1485,15 +1485,31 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         appDeliveredDetailsVo.setContractId(busDeliveredApply.getContractNo());
         appDeliveredDetailsVo.setPublishInfo(busDeliveredApply.getApplyDept() + "-" + busDeliveredApply.getApplyName());
         appDeliveredDetailsVo.setCreateTime(DateUtil.format(busDeliveredApply.getCreateTime(), "yyyy-MM-dd"));
+        //pc发起人
+        ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(busDeliveredApply.getStaffUserSid());
+        if (!userVoResultBean.getSuccess()) {
+            return rb.setMsg(userVoResultBean.getMsg());
+        }
+        appDeliveredDetailsVo.setPcApplyName(busDeliveredApply.getApplyName());
+        appDeliveredDetailsVo.setPcApplySid(busDeliveredApply.getApplySid());
+        appDeliveredDetailsVo.setPcApplyDept(busDeliveredApply.getApplyDept());
+        appDeliveredDetailsVo.setPcApplyDeptSid(busDeliveredApply.getApplyDeptSid());
+        appDeliveredDetailsVo.setPcStaffSid(userVoResultBean.getData().getStaffSid());
+        List<BusDeliveredApplyDetails> detailsList = busDeliveredApplyDetailsService.selectByApplySid(sid);
+        detailsList.removeAll(Collections.singleton(null));
         if (StringUtils.isNotBlank(busDeliveredApply.getDistributorPrice())) {
             appDeliveredDetailsVo.setDistributorName(busDeliveredApply.getDistributorName() + ",单车中介费：" + busDeliveredApply.getDistributorPrice() + "元");
+            appDeliveredDetailsVo.setPcDistributorName(busDeliveredApply.getDistributorName());
+            appDeliveredDetailsVo.setPcDistributorPrice(busDeliveredApply.getDistributorPrice());
+            appDeliveredDetailsVo.setPcDistributorPriceAll(new BigDecimal(busDeliveredApply.getDistributorPrice()).multiply(new BigDecimal(detailsList.size())).toString());
         }
         if (StringUtils.isNotBlank(busDeliveredApply.getDistributorPriceTwo())) {
             appDeliveredDetailsVo.setDistributorNameTwo(busDeliveredApply.getDistributorNameTwo() + ",单车中介费：" + busDeliveredApply.getDistributorPriceTwo() + "元");
+            appDeliveredDetailsVo.setPcDistributorNameTwo(busDeliveredApply.getDistributorNameTwo());
+            appDeliveredDetailsVo.setPcDistributorPriceTwo(busDeliveredApply.getDistributorPriceTwo());
+            appDeliveredDetailsVo.setPcDistributorPriceTwoAll(new BigDecimal(busDeliveredApply.getDistributorPriceTwo()).multiply(new BigDecimal(detailsList.size())).toString());
         }
         List<AppCarListVo> carList = new ArrayList<>();
-        List<BusDeliveredApplyDetails> detailsList = busDeliveredApplyDetailsService.selectByApplySid(sid);
-        detailsList.removeAll(Collections.singleton(null));
         if (!detailsList.isEmpty()) {
             for (int i = 0; i < detailsList.size(); i++) {
                 BusDeliveredApplyDetails busDeliveredApplyDetails = detailsList.get(i);