今日收款，付款

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/vo/CollectionPayment.java

@@ -0,0 +1,31 @@
+package org.springblade.finance.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 首页 今日收款付款
+ */
+@Data
+public class CollectionPayment implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+	/**
+	 * 已收金额
+	 */
+	@ApiModelProperty(value = "已收金额")
+	private BigDecimal received;
+	/**
+	 * 待收金额
+	 */
+	@ApiModelProperty(value = "待收金额")
+	private BigDecimal toBeReceived;
+	/**
+	 * 未结单据
+	 */
+	@ApiModelProperty(value = "未结单据")
+	private Integer unsettledDocuments;
+}

blade-service/trade-finance/src/main/java/org/springblade/finance/controller/SettlementController.java

@@ -45,6 +45,7 @@ import org.springblade.finance.service.IInvoiceItemService;
 import org.springblade.finance.service.IItemsService;
 import org.springblade.finance.service.ISettlementService;
 import org.springblade.finance.tool.JdyTool;
+import org.springblade.finance.vo.CollectionPayment;
 import org.springblade.finance.vo.SettlementVO;
 import org.springblade.finance.vojo.Acc;
 import org.springblade.finance.vojo.Items;
@@ -55,6 +56,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -491,4 +494,32 @@ public class SettlementController extends BladeController {
 		return accService.list(accLambdaQueryWrapper);
 	}
 
+	//首页 查询今日收款
+	@GetMapping("/selMoneyToday")
+	public R selMoneyToday(Settlement settlement) {
+		settlement.setCreateStartDate(getTime(true));
+		settlement.setCreateEndDate(getTime(false));
+		//获得已收和待收金额
+		CollectionPayment payment = settlementService.selMoneyToday(settlement);
+
+		//获得未结单据
+		LambdaQueryWrapper<Settlement> settlementLambdaQueryWrapper = new LambdaQueryWrapper<>();
+		settlementLambdaQueryWrapper.eq(Settlement::getBillType, settlement.getBillType());
+		settlementLambdaQueryWrapper.eq(Settlement::getTenantId, AuthUtil.getTenantId());
+		settlementLambdaQueryWrapper.eq(Settlement::getIsDeleted, 0);
+		settlementLambdaQueryWrapper.eq(Settlement::getFinanceStatus, "待结算");
+		settlementLambdaQueryWrapper.between(StringUtils.isNotBlank(settlement.getCreateStartDate()) && StringUtils.isNotBlank(settlement.getCreateEndDate()), Settlement::getCreateTime, settlement.getCreateStartDate(), settlement.getCreateEndDate());
+		payment.setUnsettledDocuments(settlementService.count(settlementLambdaQueryWrapper));
+
+		return R.data(payment);
+	}
+
+	private String getTime(boolean init) {
+		String date = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+		if (init) {
+			return date + " 00:00:00";
+		}
+		return date + " 23:59:59";
+	}
+
 }

blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/SettlementMapper.java

@@ -19,9 +19,11 @@ package org.springblade.finance.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.finance.vojo.Settlement;
 import org.springblade.finance.vo.SettlementVO;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -41,4 +43,20 @@ public interface SettlementMapper extends BaseMapper<Settlement> {
 	 */
 	List<SettlementVO> selectSettlementPage(IPage page, SettlementVO settlement);
 
+
+	/**
+	 * 首页获取今日收款或付款
+	 * @param tenantId 租户id
+	 * @param createStartDate 今日开始时间
+	 * @param createEndDate 今日结束时间
+	 * @param financeStatus 订单状态
+	 * @param billType 订单类型
+	 * @return
+	 */
+	BigDecimal selMoneyToday(@Param("tenantId") String tenantId,
+						  @Param("createStartDate") String createStartDate,
+						  @Param("createEndDate") String createEndDate,
+						  @Param("financeStatus") String financeStatus,
+							 @Param("billType") String billType);
+
 }

blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/SettlementMapper.xml

@@ -39,4 +39,28 @@
         select * from finance_settlement where is_deleted = 0
     </select>
 
+    <select id="selMoneyToday"  resultType="BigDecimal">
+        SELECT
+        ROUND( IFNULL( SUM( amount ), 0 ), 2 ) AS amount
+        FROM
+        finance_settlement
+        WHERE
+        is_deleted = 0
+        <if test="tenantId!=null and tenantId != ''">
+            AND tenant_id = #{tenantId}
+        </if>
+        <if test="financeStatus!=null and financeStatus != ''">
+            AND finance_status = #{financeStatus}
+        </if>
+        <if test="createStartDate!=null and createStartDate != ''">
+            AND create_time &gt;= #{createStartDate}
+        </if>
+        <if test="createEndDate!=null and createEndDate != ''">
+            AND create_time &lt;= #{createEndDate}
+        </if>
+        <if test="billType!=null and billType != ''">
+            AND bill_type = #{billType}
+        </if>
+    </select>
+
 </mapper>

blade-service/trade-finance/src/main/java/org/springblade/finance/service/ISettlementService.java

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.springblade.finance.dto.SettlementDTO;
 import org.springblade.finance.tool.JdyTool;
 import org.springblade.finance.vo.SettlementVO;
+import org.springblade.finance.vo.CollectionPayment;
 import org.springblade.finance.vojo.Items;
 import org.springblade.finance.vojo.Settlement;
 
@@ -84,4 +85,11 @@ public interface ISettlementService extends IService<Settlement> {
 
 	List<JdyTool.Employee> getEmployeeList(String accountName, String search) throws Exception;
 
+	/**
+	 * 首页获取今日收款或付款
+	 * @param settlement
+	 * @return
+	 */
+	CollectionPayment selMoneyToday(Settlement settlement);
+
 }

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

@@ -54,13 +54,13 @@ import org.springblade.finance.enums.SettlementEnum;
 import org.springblade.finance.mapper.*;
 import org.springblade.finance.service.ISettlementService;
 import org.springblade.finance.tool.JdyTool;
+import org.springblade.finance.vo.CollectionPayment;
 import org.springblade.finance.vo.SettlementVO;
 import org.springblade.finance.vojo.*;
 import org.springblade.mocha.entity.BusinessOverpaymentItem;
 import org.springblade.mocha.entity.Overpayment;
 import org.springblade.mocha.feign.IBusinessOverpaymentClient;
 import org.springblade.purchase.sales.entity.Order;
-import org.springblade.purchase.sales.entity.OrderEnum;
 import org.springblade.purchase.sales.entity.OrderFees;
 import org.springblade.purchase.sales.entity.OrderItems;
 import org.springblade.purchase.sales.feign.IOrderDescClient;
@@ -72,7 +72,6 @@ import org.springblade.system.user.feign.IUserClient;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.stringtemplate.v4.ST;
 
 import javax.net.ssl.*;
 import java.io.*;
@@ -2005,6 +2004,21 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		return new HashMap();
 	}*/
 
+	/**
+	 * 首页获取今日收款或付款
+	 * @param settlement
+	 * @return
+	 */
+	@Override
+	public CollectionPayment selMoneyToday(Settlement settlement) {
+		CollectionPayment collectionPayment = new CollectionPayment();
+		// 获取已收或已付金额
+		collectionPayment.setReceived(baseMapper.selMoneyToday(AuthUtil.getTenantId(),settlement.getCreateStartDate(),settlement.getCreateEndDate(),"结算完成",settlement.getBillType()));
+		// 获取待收或代付金额
+		collectionPayment.setToBeReceived(baseMapper.selMoneyToday(AuthUtil.getTenantId(),settlement.getCreateStartDate(),settlement.getCreateEndDate(),"待结算",settlement.getBillType()));
+		return collectionPayment;
+	}
+
 
 	public String doGet(String url, Map<String, String> urlParams)
 		throws IOException {