Browse Source

支付连表查询

v1.0
Yen 2 years ago
parent
commit
68a6928563
  1. 4
      src/main/java/com/qs/serve/modules/erp/mapper/ErpDispatchDataMapper.java
  2. 3
      src/main/java/com/qs/serve/modules/excel/controller/DateCheckApplyController.java
  3. 29
      src/main/java/com/qs/serve/modules/excel/entity/DataPayMainInfo.java
  4. 3
      src/main/java/com/qs/serve/modules/excel/service/DateCheckApplyService.java
  5. 15
      src/main/java/com/qs/serve/modules/excel/service/impl/DateCheckApplyServiceImpl.java
  6. 3
      src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java
  7. 12
      src/main/java/com/qs/serve/modules/vtb/mapper/VtbVerForPayReportMapper.java

4
src/main/java/com/qs/serve/modules/erp/mapper/ErpDispatchDataMapper.java

@ -37,8 +37,8 @@ public interface ErpDispatchDataMapper extends BaseMapper<ErpDispatchData> {
@InterceptorIgnore(tenantLine = "1")
@Select("SELECT inv_code FROM `erp_dispatch_data` where `date` > #{lastTowMonth}")
List<String> selectLast2MonthInvCode(@Param("lastTowMonth") LocalDate lastTowMonth);
@Select("SELECT inv_code FROM `erp_dispatch_data` where `date` > #{lastTowMonth} and cus_code = #{cusCode}")
List<String> selectLast2MonthInvCode(@Param("lastTowMonth") LocalDate lastTowMonth,@Param("cusCode")String cusCode);
}

3
src/main/java/com/qs/serve/modules/excel/controller/DateCheckApplyController.java

@ -10,6 +10,7 @@ import com.qs.serve.common.util.Assert;
import com.qs.serve.modules.excel.common.DataSupplierSo;
import com.qs.serve.modules.excel.entity.DataCheckApplyDetailInfo;
import com.qs.serve.modules.excel.entity.DataCheckApplyMainInfo;
import com.qs.serve.modules.excel.entity.DataPayMainInfo;
import com.qs.serve.modules.excel.service.DateCheckApplyService;
import com.qs.serve.modules.sys.entity.SysConfig;
import com.qs.serve.modules.sys.service.SysConfigService;
@ -96,7 +97,7 @@ public class DateCheckApplyController {
@RepeatSubmit
@GetMapping("/getPayJoinList")
@SysLog(module = SystemModule.Verification, title = "客户支付帐", biz = BizType.EXPORT)
public R<DataCheckApplyDetailInfo> getPayJoinList(DataSupplierSo param){
public R<DataPayMainInfo> getPayJoinList(DataSupplierSo param){
return R.ok();
}

29
src/main/java/com/qs/serve/modules/excel/entity/DataPayMainInfo.java

@ -0,0 +1,29 @@
package com.qs.serve.modules.excel.entity;
import com.qs.serve.common.model.dto.PageVo;
import com.qs.serve.modules.vtb.entity.dto.PayPaymentItemExtend;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/**
* @author YenHex
* @since 2023/11/16
*/
@Data
public class DataPayMainInfo {
/**
* 已支付
*/
private BigDecimal payAmt;
PageVo pageInfo;
List<?> list;
}

3
src/main/java/com/qs/serve/modules/excel/service/DateCheckApplyService.java

@ -4,6 +4,7 @@ import com.qs.serve.common.model.dto.PageVo;
import com.qs.serve.modules.excel.common.DataSupplierSo;
import com.qs.serve.modules.excel.entity.DataCheckApplyDetailInfo;
import com.qs.serve.modules.excel.entity.DataCheckApplyMainInfo;
import com.qs.serve.modules.excel.entity.DataPayMainInfo;
import com.qs.serve.modules.vtb.entity.dto.PayPaymentItemExtend;
import com.qs.serve.modules.vtb.entity.so.PayPaymentItemExtendSo;
@ -28,6 +29,6 @@ public interface DateCheckApplyService {
DataCheckApplyMainInfo getDataCheckApplyMainInfo(DataSupplierSo param);
PageVo<PayPaymentItemExtend> pagePayPaymentItems(PayPaymentItemExtendSo extendSo);
DataPayMainInfo pagePayPaymentItems(PayPaymentItemExtendSo extendSo);
}

15
src/main/java/com/qs/serve/modules/excel/service/impl/DateCheckApplyServiceImpl.java

@ -13,6 +13,7 @@ import com.qs.serve.modules.excel.common.DataSupplierSo;
import com.qs.serve.modules.excel.entity.DataCheckApplyDetailInfo;
import com.qs.serve.modules.excel.entity.DataCheckApplyDetailItem;
import com.qs.serve.modules.excel.entity.DataCheckApplyMainInfo;
import com.qs.serve.modules.excel.entity.DataPayMainInfo;
import com.qs.serve.modules.excel.service.DateCheckApplyService;
import com.qs.serve.modules.pay.common.PaymentType;
import com.qs.serve.modules.pay.entity.PayPaymentItem;
@ -250,15 +251,19 @@ public class DateCheckApplyServiceImpl implements DateCheckApplyService {
@Override
public PageVo<PayPaymentItemExtend> pagePayPaymentItems(PayPaymentItemExtendSo extendSo) {
public DataPayMainInfo pagePayPaymentItems(PayPaymentItemExtendSo extendSo) {
DataPayMainInfo mainInfo = new DataPayMainInfo();
Long count = payReportMapper.countPayItemList(extendSo);
RowParam rowParam = new RowParam(true);
PageVo<PayPaymentItemExtend> pageVo = new PageVo<>();
pageVo.initPageByTotal(count);
mainInfo.setPageInfo(pageVo);
if(count>0){
List<PayPaymentItemExtend> list = payReportMapper.selectPayItemList(extendSo);
pageVo.setList(list);
//统计支付金额
BigDecimal payAmt = payReportMapper.sumPayItemListAmt(extendSo);
mainInfo.setPayAmt(payAmt);
List<PayPaymentItemExtend> list = payReportMapper.selectPayItemList(extendSo,new RowParam(true));
mainInfo.setList(list);
}
return pageVo;
return mainInfo;
}
}

3
src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java

@ -105,8 +105,7 @@ public class GoodsSpuController {
@PostMapping("listLast2Month")
public R<List<GoodsSpu>> listLast2Month(@RequestBody @Valid GoodsHisOrderQuery query){
LocalDate date = LocalDate.now().plusMonths(-2);
List<String> invCodes = dispatchDataMapper.selectLast2MonthInvCode(date);
List<String> invCodes = dispatchDataMapper.selectLast2MonthInvCode(date,query.getSupplierCode());
if(CollectionUtil.isNotEmpty(invCodes)){
List<GoodsSku> goodsSkus = goodsSkuService.getByCodes(invCodes);
List<Long> goodsSpuIds = goodsSkus.stream().map(GoodsSku::getSpuId).distinct().collect(Collectors.toList());

12
src/main/java/com/qs/serve/modules/vtb/mapper/VtbVerForPayReportMapper.java

@ -1,5 +1,6 @@
package com.qs.serve.modules.vtb.mapper;
import com.qs.serve.common.model.dto.RowParam;
import com.qs.serve.modules.vtb.entity.dto.PayPaymentItemExtend;
import com.qs.serve.modules.vtb.entity.dto.VtbActivityCheckDTO;
import com.qs.serve.modules.vtb.entity.dto.VtbVerificationDTO;
@ -8,6 +9,7 @@ import com.qs.serve.modules.vtb.entity.so.VtbActivityCheckSo;
import com.qs.serve.modules.vtb.entity.so.VtbVerificationCheckSo;
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
import java.util.List;
/**
@ -41,11 +43,19 @@ public interface VtbVerForPayReportMapper {
Long countPayItemList(@Param("query")Object param);
/**
* 统计支付金额
* @param param
* @return
*/
BigDecimal sumPayItemListAmt(@Param("query")Object param);
/**
* 查询支付 left 核销 left 活动
* @param param
* @return
*/
List<PayPaymentItemExtend> selectPayItemList(@Param("query") PayPaymentItemExtendSo param);
List<PayPaymentItemExtend> selectPayItemList(@Param("query") PayPaymentItemExtendSo param, @Param("pageInfo")RowParam rowParam);
}

Loading…
Cancel
Save