123

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseOrderRevenueBiz.java

@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -76,6 +77,11 @@ public class BaseOrderRevenueBiz extends BaseBiz<BaseOrderRevenueMapper, BaseOrd
     }
 
 
+    public BigDecimal sumAmount(BaseOrderRevenueFindDTO revenueFindDTO){
+        return  mapper.sumAmount(revenueFindDTO);
+    }
+
+
 
 
 }

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

@@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.additional.idlist.SelectByIdListMapper;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 public interface BaseOrderRevenueMapper extends Mapper<BaseOrderRevenue>, SelectByIdListMapper<BaseOrderRevenue,Integer> {
@@ -18,4 +19,7 @@ public interface BaseOrderRevenueMapper extends Mapper<BaseOrderRevenue>, Select
 
 
     List<BaseOrderRevenueVo> selectList(BaseOrderRevenueFindDTO revenueFindDTO);
+
+
+    BigDecimal sumAmount(BaseOrderRevenueFindDTO revenueFindDTO);
 }
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppOrderRevenueController.java

 package com.github.wxiaoqi.security.admin.rest;
 
 import com.github.wxiaoqi.security.admin.biz.BaseOrderRevenueBiz;
-import com.github.wxiaoqi.security.admin.biz.BranchCompanyBiz;
-import com.github.wxiaoqi.security.admin.biz.BranchCompanyGiveBiz;
 import com.github.wxiaoqi.security.admin.dto.BaseOrderRevenueFindDTO;
-import com.github.wxiaoqi.security.admin.dto.CompanySearchDTO;
-import com.github.wxiaoqi.security.admin.entity.BranchCompany;
-import com.github.wxiaoqi.security.admin.entity.BranchCompanyGive;
-import com.github.wxiaoqi.security.admin.vo.CompanySearchVO;
-import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
-import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
-import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.RequiredArgsConstructor;
@@ -38,8 +29,7 @@ public class AppOrderRevenueController extends BaseController<BaseOrderRevenueBi
 
     @GetMapping("selectList")
     @ApiModelProperty("列表")
-    @IgnoreUserToken
-    public  ObjectRestResponse info(BaseOrderRevenueFindDTO orderRevenueFindDTO) {
+    public  ObjectRestResponse selectList(BaseOrderRevenueFindDTO orderRevenueFindDTO) {
         if (orderRevenueFindDTO.getCompanyId() == null || orderRevenueFindDTO.getCompanyId() == 0){
             List<Integer> companyIds = getBusinessUserCompanyIds();
             if (companyIds != null && companyIds.size() > 0){
@@ -50,5 +40,18 @@ public class AppOrderRevenueController extends BaseController<BaseOrderRevenueBi
     }
 
 
+    @GetMapping("sumAmount")
+    @ApiModelProperty("总营收")
+    public  ObjectRestResponse sumAmount(BaseOrderRevenueFindDTO orderRevenueFindDTO) {
+        if (orderRevenueFindDTO.getCompanyId() == null || orderRevenueFindDTO.getCompanyId() == 0){
+            List<Integer> companyIds = getBusinessUserCompanyIds();
+            if (companyIds != null && companyIds.size() > 0){
+                orderRevenueFindDTO.setCompanyId(companyIds.get(0));
+            }
+        }
+        return ObjectRestResponse.succ(baseBiz.sumAmount(orderRevenueFindDTO));
+    }
+
+
 
 }

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

@@ -37,4 +37,29 @@
         order by upd_time desc
     </select>
 
+
+    <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
+        <where>
+            amount > 0 and is_del = 0
+            <if test=" month != null and month != ''  ">
+                and from_unixtime(upd_time/1000,'%Y-%m')=#{month}
+            </if>
+            <if test=" status != null ">
+                <choose>
+                    <when test="status == 1">
+                        and `status` in (1,3)
+                    </when>
+                    <otherwise>
+                        and `status`=#{status}
+                    </otherwise>
+                </choose>
+            </if>
+            <if test=" companyId != null ">
+                and `company_id`=#{companyId}
+            </if>
+        </where>
+    </select>
+
 </mapper>
\ No newline at end of file