财务修改bug

blade-service-api/trade-finance-api/src/main/java/com/trade/finance/entity/Items.java

@@ -176,4 +176,14 @@ public class Items implements Serializable {
 		@ApiModelProperty(value = "参考号（进口和出口 主提单号）")
 		private String srcBillNo;
 
+
+		@ApiModelProperty(value = "付款类型: 采购 销售 收货 发货")
+		private String itemType;
+
+	/**
+	 * 来源主表（业务模块 主表 id）
+	 */
+	@ApiModelProperty(value = "来源主表（业务模块 主表 id）")
+	@TableField("Src_parent_id")
+	private Long srcParentId;
 }

blade-service-api/trade-finance-api/src/main/java/com/trade/finance/entity/Settlement.java

@@ -205,5 +205,8 @@ public class Settlement  implements Serializable {
 	@TableField(exist = false)
 	private List<Map<String,Object>> customerModel;
 
+	@ApiModelProperty(value = "清核状态")
+	private String checkStatus;
+
 
 }

blade-service/trade-finance/src/main/java/com/trade/finance/service/impl/SettlementServiceImpl.java

@@ -40,6 +40,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -141,15 +142,19 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 	@Transactional
 	public void apply(List<Items> itemsList, String billType)
 	{
-           Settlement settlement=new Settlement();
+		BigDecimal total = itemsList.stream().filter(e -> e.getAmount() != null).map(Items::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+		Settlement settlement=new Settlement();
 		   settlement.setBillType(billType);
 		   settlement.setCorpId(itemsList.get(0).getCorpId());
+		   settlement.setSrcOrderno(itemsList.get(0).getSrcOrderno());
 		   //todo 系统编号暂时按时间戳, 后续按正式
 		   settlement.setSysNo(String.valueOf(System.currentTimeMillis()));
 		   settlement.setCreateTime(new Date());
+		   settlement.setAmount(total);
 		   settlement.setTenantId(AuthUtil.getTenantId());
 		   settlement.setCreateUser(AuthUtil.getUserId());
 		   settlement.setStatus(0);
+		   settlement.setCheckStatus("未请核");
 		   baseMapper.insert(settlement);
 
 		   itemsList.forEach(e->{
@@ -177,6 +182,8 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 				  Acc acc=new Acc();
                   BeanUtils.copyProperties(e,acc);
 				  acc.setAccSysNo(e.getSrcOrderno());
+				  acc.setSrcParentId(e.getSrcParentId());
+				  acc.setBillType(e.getItemType());
 				  acc.setBillType(settlement.getBillType());
 				  acc.setCreateTime(new Date());
 				  acc.setStatus(0);
@@ -184,6 +191,8 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 				  accMapper.insert(acc);
 			});
 		}
+		settlement.setCheckStatus("请核成功");
+		baseMapper.updateById(settlement);
 	}
 
 }