123

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/CompanyWalletMapper.java

@@ -37,7 +37,7 @@ public interface CompanyWalletMapper extends Mapper<CompanyWallet>  {
     List<CompanyWalletVo> selectList(CompanyWalletDTO walletDTO);
 
 
-    @Select("SELECT IFNULL(SUM(amount),0)  FROM company_wallet_detail WHERE type=1 and company_id=#{companyId}  and from_unixtime(crt_time/1000,'%Y-%m-%d')=date_format(now(),'%Y-%m-%d')")
+    @Select("SELECT IFNULL(SUM(amount),0)  FROM base_order_revenue WHERE amount > 0 and is_del = 0 and  company_id=#{companyId}  and from_unixtime(crt_time/1000,'%Y-%m-%d')=date_format(now(),'%Y-%m-%d')")
     BigDecimal todayAmount(@Param("companyId") Integer companyId);
 
 

ace-modules/ace-admin/src/main/resources/mapper/BaseOrderRevenueMapper.xml

@@ -40,7 +40,7 @@
 
     <select id="sumAmount" resultType="BigDecimal"
             parameterType="com.github.wxiaoqi.security.admin.dto.BaseOrderRevenueFindDTO">
-        SELECT IFNULL(SUM(amount-cath_amount),0) as totalAmount FROM base_order_revenue
+        SELECT IFNULL(SUM(amount),0) as totalAmount FROM base_order_revenue
         <where>
             amount > 0 and is_del = 0
             <if test=" month != null and month != ''  ">