1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/TranSettlementReport.java

@@ -266,7 +266,11 @@ public class TranSettlementReport extends BaseModel<TranSettlementReport> {
     //记录
     @TableField(exist = false)
     private List<TranPriceApprove> tranPriceApproveList;
-
+    /**
+     * 发起人
+     */
+    @TableField(exist = false)
+    private String creater;
 
     @Override
     protected Serializable pkVal() {

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranSettlementReportServiceImpl.java

@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
 import com.winsea.svc.base.base.entity.CommonRoleResource;
+import com.winsea.svc.base.base.entity.CommonStaff;
 import com.winsea.svc.base.base.service.ICommonRoleResourceService;
+import com.winsea.svc.base.base.service.ICommonStaffService;
 import com.winsea.svc.base.security.entity.User;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.winsea.svc.base.workflow.entity.Workflow;
@@ -46,10 +48,6 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
     @SofaReference
     private ICommonRoleResourceService roleResourceService;
     @Autowired
-    private IDriverPayeeInfoService driverPayeeInfoService;
-    @Autowired
-    private IDriverViewInfoService driverViewInfoService;
-    @Autowired
     private IContractManagementInfoService contractManagementInfoService;
     @Autowired
     private ITranPriceApproveService tranPriceApproveService;
@@ -63,6 +61,8 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
     private IExpenseInfoService expenseInfoService;
     @Autowired
     private IBatchReviewInfoService batchReviewInfoService;
+    @Autowired
+    private ICommonStaffService staffService;
 
 
 
@@ -74,12 +74,15 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
      */
     @Override
     public List<TranSettlementReport> getTranSettlementReport(TranSettlementReport tranSettlementReport1) {
-
         List<TranSettlementReport> tranSettlementReports = this.selectList(new EntityWrapper<TranSettlementReport>()
         .eq("batch_id",tranSettlementReport1.getBatchId()));
         if(!CollectionUtils.isEmpty(tranSettlementReports)){
             for(int i=0;i<tranSettlementReports.size();i++){
                 TranSettlementReport tranSettlementReport= tranSettlementReports.get(i);
+                if(tranSettlementReport.getCreateUserId() != null){
+                    CommonStaff commonStaff = staffService.getInfo(tranSettlementReport.getCreateUserId());
+                    tranSettlementReport.setCreater(commonStaff.getStaffName());
+                }
                 TranCarInfo tranCarInfo=tranCarInfoService.selectById(tranSettlementReport.getCarId());
                 if (tranCarInfo!=null){
                     TranProcessInfo tranProcessInfo=tranProcessInfoService.selectById(tranCarInfo.getProcessId());
@@ -255,8 +258,8 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
             //1 修改扣款
             else if (tranSettlementReport.getFlag() == 1) {
                 tranSettlementReport1.setDeductionAmount(tranSettlementReport.getDeductionAmount());
-                tranSettlementReport1.setAmountIngPayable(tranSettlementReport1.getAmountIngPayable()-Float.valueOf(tranSettlementReport.getDeductionAmount()));
-                tranSettlementReport1.setAmountNotPayable(tranSettlementReport1.getAmountNotPayable()-Float.valueOf(tranSettlementReport.getDeductionAmount()));
+                tranSettlementReport1.setAmountIngPayable(tranSettlementReport1.getSettlementWeight()*tranSettlementReport1.getTransportPrice()-Float.valueOf(tranSettlementReport1.getDeductionAmount()));
+                tranSettlementReport1.setAmountNotPayable(tranSettlementReport1.getAmountIngPayable()-tranSettlementReport1.getAmountEdPayable());
                 //更改汽运结算信息
                 this.updateById(tranSettlementReport1);
                 return "OK";