czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

出入退货单 金额为负数

This commit is contained in:
wangw 2024-06-28 15:45:41 +08:00
parent b04661d0a9
commit 0623562cd0
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,21 +15,16 @@
*/
package cn.ysk.cashier.controller.shop;
import cn.hutool.core.date.DateTime;
import cn.ysk.cashier.annotation.Log;
import cn.ysk.cashier.dto.shop.TbShopPurveyorTransactQueryCriteria;
import cn.ysk.cashier.pojo.shop.TbShopPurveyorTransact;
import cn.ysk.cashier.service.shop.TbShopPurveyorTransactService;
import cn.ysk.cashier.dto.shop.TbShopPurveyorTransactQueryCriteria;
import org.springframework.data.domain.Pageable;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.*;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
/**
* @website https://eladmin.vip

4
eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopPurveyorTransactRepository.java
View File

@ -52,6 +52,6 @@ public interface TbShopPurveyorTransactRepository extends JpaRepository<TbShopPu
Page<PurveyorTransactVO> queryTransactDate(String type, String shopId, String name, Pageable page);
@Query(value = "SELECT IFNULL(count(b.id),0) AS waitNumber FROM tb_shop_purveyor_transact b WHERE" +
" b.purveyor_id = :purveyorId AND (:type IS NULL OR b.type = :type) AND b.`status`= :status",nativeQuery = true)
Map<String,Object> findByStatusSum(@Param("purveyorId") String purveyorId,@Param("type")String type,@Param("status")Integer status);
" b.purveyor_id = :purveyorId AND (:type IS NULL OR b.type = :type) AND b.`status`= 0",nativeQuery = true)
Map<String,Object> findByStatusSum(@Param("purveyorId") String purveyorId,@Param("type")String type);
}

12
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockOperateServiceImpl.java
View File

@ -188,9 +188,15 @@ public class TbProductStockOperateServiceImpl implements TbProductStockOperateSe
purveyorTransact.setRemark(resources.getRemark());
purveyorTransact.setCreatedAt(times);
purveyorTransact.setUpdatedAt(times);
purveyorTransact.setTotalAmount(resources.getTotalAmount());
purveyorTransact.setPaidAmount(resources.getPaidAmount());
purveyorTransact.setWaitAmount(resources.getTotalAmount().subtract(resources.getPaidAmount()));
if("reject".equals(resources.getType())){
purveyorTransact.setTotalAmount(resources.getTotalAmount().negate());
purveyorTransact.setPaidAmount(resources.getPaidAmount());
purveyorTransact.setWaitAmount((resources.getTotalAmount().subtract(resources.getPaidAmount())).negate());
}else{
purveyorTransact.setTotalAmount(resources.getTotalAmount());
purveyorTransact.setPaidAmount(resources.getPaidAmount());
purveyorTransact.setWaitAmount((resources.getTotalAmount().subtract(resources.getPaidAmount())));
}
if (resources.getTotalAmount().compareTo(resources.getPaidAmount()) <= 0) {
purveyorTransact.setStatus(1);
} else {

2
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopPurveyorTransactServiceImpl.java
View File

@ -63,7 +63,7 @@ public class TbShopPurveyorTransactServiceImpl implements TbShopPurveyorTransact
@Override
public Map<String, Object> queryTransactSum(TbShopPurveyorTransactQueryCriteria criteria) {
Map<String, Object> bySum = tbShopPurveyorTransactRepository.findBySum(criteria.getPurveyorId(), criteria.getType());
Map<String, Object> byStatusSum = tbShopPurveyorTransactRepository.findByStatusSum(criteria.getPurveyorId(), criteria.getType(), 0);
Map<String, Object> byStatusSum = tbShopPurveyorTransactRepository.findByStatusSum(criteria.getPurveyorId(), criteria.getType());
Map<String, Object> sumMap = new HashMap<>(bySum);
sumMap.put("waitNumber", byStatusSum.get("waitNumber"));
return sumMap;