修改统计bug和部分功能修改

Pu Zhibing

2025-03-26 cbf2486983b77a27af9968bbb362cb8d43789115

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopBalanceStatementClient.java

@@ -3,12 +3,15 @@
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.other.api.domain.ShopBalanceStatement;
import com.ruoyi.other.api.domain.ShopBalanceStatementCopy;
import com.ruoyi.other.api.factory.ShopBalanceStatementClientFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

import java.time.LocalDateTime;
import java.util.Collection;
import java.util.List;

@@ -27,6 +30,18 @@
   @PostMapping("/shop-balance-statement/saveShopBalanceStatement")
   void saveShopBalanceStatement(@RequestBody ShopBalanceStatement shopBalanceStatement);

   @PostMapping("/shop-balance-statement/saveShopBalanceStatementCopy")
   void saveShopBalanceStatementCopy(@RequestBody ShopBalanceStatementCopy shopBalanceStatement);

   @DeleteMapping("/shop-balance-statement/deleteShopBalanceStatementCopy")
   R<Boolean> deleteShopBalanceStatementCopy(@RequestParam("orderId") Long orderId, @RequestParam("type") List<Integer> type);
	
   @DeleteMapping("/shop-balance-statement/deleteShopBalanceStatementCopyByIds")
   R<Boolean> deleteShopBalanceStatementCopyByIds(@RequestParam("ids") List<Long> ids);
	
   @PostMapping("/shop-balance-statement/getShopBalanceStatementCopy")
   R<List<ShopBalanceStatementCopy>> getShopBalanceStatementCopy(@RequestParam("orderId") Long orderId, @RequestParam("type") List<Integer> type);


   /**
    * 获取门店余额流水
@@ -34,5 +49,9 @@
    * @return
    */
   @PostMapping("/shop-balance-statement/getShopBalanceStatementList")
   R<List<ShopBalanceStatement>> getShopBalanceStatementList(@RequestParam("types") Collection<Integer> types, @RequestParam("objectId") Long objectId);
   R<List<ShopBalanceStatement>> getShopBalanceStatementList(@RequestParam("types") Collection<Integer> types, @RequestParam(value = "objectId",required = false) Long objectId);

   @PostMapping("/shop-balance-statement/getShopBalanceStatementList2")
   R<List<ShopBalanceStatement>> getShopBalanceStatementList2(@RequestParam("type") Integer type, @RequestParam(value = "shopId") Integer shopId,
                                                @RequestParam(value = "date") LocalDateTime date);
}