Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-26 a988a89e6b0cd75a5df4691eb8196c0ef9513a05

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopBalanceStatementController.java

@@ -9,6 +9,7 @@
import com.ruoyi.other.api.domain.Shop;
import com.ruoyi.other.api.domain.ShopBalanceStatement;
import com.ruoyi.other.dto.ShopBalanceDto;
import com.ruoyi.other.mapper.ShopBalanceStatementMapper;
import com.ruoyi.other.service.ShopBalanceStatementService;
import com.ruoyi.other.service.ShopService;
import com.ruoyi.other.vo.ShopCommissionStatisticsVO;
@@ -41,6 +42,13 @@
    private TokenService tokenService;
    @Resource
    private ShopBalanceStatementMapper shopBalanceStatementMapper;
    
    @Resource
    private ShopService shopService;
    
    
    
    

    /**
     * 门店分佣统计
@@ -68,8 +76,7 @@

    }

   @Resource
   private ShopService shopService;
   
    @GetMapping("/commissionStatistics/info")
    @ApiOperation(value = "门店余额明细上方数据", notes = "门店余额明细", tags = {"门店后台"})
    public R<ShopBalanceDto> shopCommissionStatisticsinfo(){
@@ -130,6 +137,16 @@
    public R<List<ShopBalanceStatement>> getList(@RequestBody ShopBalanceStatement shopBalanceStatement){
        return R.ok(shopBalanceStatementMapper.selectShopBalanceStatementList(shopBalanceStatement));
    }
    
    
    /**
     * 保存门店余额流水
     * @param shopBalanceStatement
     */
    @PostMapping("/saveShopBalanceStatement")
    public void saveShopBalanceStatement(@RequestBody ShopBalanceStatement shopBalanceStatement){
        shopBalanceStatementService.save(shopBalanceStatement);
    }

}