提交营收列表

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/BaseOrderRevenueVo.java

@@ -3,6 +3,8 @@ package com.github.wxiaoqi.security.admin.vo;
 import com.github.wxiaoqi.security.admin.entity.BaseOrderRevenue;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @author libin
  * @version 1.0
@@ -12,6 +14,8 @@ import lombok.Data;
 @Data
 public class BaseOrderRevenueVo extends BaseOrderRevenue {
 
+    private BigDecimal withdrawAmount;
+
 
 
 }

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

@@ -2,10 +2,13 @@ package com.github.wxiaoqi.security.admin.biz;
 
 
 
+import com.github.wxiaoqi.security.admin.dto.BaseOrderRevenueFindDTO;
 import com.github.wxiaoqi.security.admin.dto.OrderWaterDTO;
 import com.github.wxiaoqi.security.admin.entity.*;
 import com.github.wxiaoqi.security.admin.mapper.BaseOrderRevenueMapper;
+import com.github.wxiaoqi.security.admin.vo.BaseOrderRevenueVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -64,6 +67,15 @@ public class BaseOrderRevenueBiz extends BaseBiz<BaseOrderRevenueMapper, BaseOrd
     }
 
 
+    public PageDataVO<BaseOrderRevenueVo> selectList(BaseOrderRevenueFindDTO revenueFindDTO) {
+        return PageDataVO.pageInfo(revenueFindDTO.getPage(), revenueFindDTO.getLimit(), () -> getList(revenueFindDTO));
+    }
+
+    public List<BaseOrderRevenueVo> getList(BaseOrderRevenueFindDTO revenueFindDTO){
+        return  mapper.selectList(revenueFindDTO);
+    }
+
+
 
 
 }

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

 package com.github.wxiaoqi.security.admin.mapper;
 
 
+import com.github.wxiaoqi.security.admin.dto.BaseOrderRevenueFindDTO;
 import com.github.wxiaoqi.security.admin.entity.BaseOrderRevenue;
+import com.github.wxiaoqi.security.admin.vo.BaseOrderRevenueVo;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.additional.idlist.SelectByIdListMapper;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.util.List;
+
 public interface BaseOrderRevenueMapper extends Mapper<BaseOrderRevenue>, SelectByIdListMapper<BaseOrderRevenue,Integer> {
 
 
 
     BaseOrderRevenue infoByOrderNo(@Param("orderNo") String orderNo, @Param("type")String type,@Param("companyId")Integer companyId);
+
+
+    List<BaseOrderRevenueVo> selectList(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;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author Administrator
+ */
+@Slf4j
+@RestController
+@RequestMapping("app/revenue")
+@RequiredArgsConstructor(onConstructor_ = {@Autowired})
+@Api(tags = {"营收明细"})
+public class AppOrderRevenueController extends BaseController<BaseOrderRevenueBiz> {
+
+
+
+
+
+
+    @GetMapping("selectList")
+    @ApiModelProperty("列表")
+    @IgnoreUserToken
+    public  ObjectRestResponse info(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.selectList(orderRevenueFindDTO));
+    }
+
+
+
+}

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

@@ -10,4 +10,31 @@
      </if>
  </select>
 
+
+    <select id="selectList" resultType="com.github.wxiaoqi.security.admin.vo.BaseOrderRevenueVo"
+            parameterType="com.github.wxiaoqi.security.admin.dto.BaseOrderRevenueFindDTO">
+       SELECT *,(amount-cath_amount) as withdrawAmount 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>
+        order by upd_time desc
+    </select>
+
 </mapper>
\ No newline at end of file