供应商 付款金额 负数问题

付款记录
购物车回滚库存问题
日库存记录 定时任务

eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopPurveyorTransactController.java

@@ -1,26 +1,15 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
 package cn.ysk.cashier.controller.shop;
 
 import cn.ysk.cashier.dto.shop.TbShopPurveyorTransactQueryCriteria;
+import cn.ysk.cashier.mybatis.entity.TbShopPurveyorTransactPay;
+import cn.ysk.cashier.mybatis.service.TbShopPurveyorTransactPayService;
 import cn.ysk.cashier.pojo.shop.TbShopPurveyorTransact;
 import cn.ysk.cashier.service.shop.TbShopPurveyorTransactService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
@@ -39,6 +28,8 @@ public class TbShopPurveyorTransactController {
 
     private final TbShopPurveyorTransactService tbShopPurveyorTransactService;
 
+    private final TbShopPurveyorTransactPayService transactPayService;
+
     /**
      * 供应商列表
      * @param criteria
@@ -77,6 +68,18 @@ public class TbShopPurveyorTransactController {
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
+    @GetMapping("/transactPayInfos")
+    @ApiOperation("付款记录")
+    public ResponseEntity<Object> transactPayInfos(@RequestParam Integer id,@RequestParam String type){
+        QueryWrapper<TbShopPurveyorTransactPay> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("transact_id", id);
+        if(StringUtils.isNotBlank(type)){
+            queryWrapper.like("pay_type", type);
+        }
+        queryWrapper.orderByDesc("create_time");
+        return new ResponseEntity<>(transactPayService.list(queryWrapper),HttpStatus.OK);
+    }
+
     @PostMapping
     @ApiOperation("新增帐目往来")
     public ResponseEntity<Object> createTbShopPurveyorTransact(@Validated @RequestBody TbShopPurveyorTransact resources){