Merge remote-tracking branch 'origin/dev-chw' into dev-chw

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

 package com.github.wxiaoqi.security.admin.vo;
 
+import com.github.wxiaoqi.security.admin.constant.enumerate.CompanyWalletSourceEnum;
 import com.github.wxiaoqi.security.admin.entity.BaseOrderRevenue;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * @author libin
@@ -12,6 +18,33 @@ import lombok.Data;
 @Data
 public class BaseOrderRevenueVo extends BaseOrderRevenue {
 
+    private BigDecimal withdrawAmount;
+
+    private String showTypeStr;
 
+    public String getShowTypeStr() {
+        String type = this.getType();
+        showTypeStr = "";
+        if (StringUtils.isNotBlank(type)) {
+            String[] values = type.split(",");
+            List<String> list = Arrays.asList(values);
+            if (list.contains(CompanyWalletSourceEnum.VEHICLE.getCode()+"")) {
+                if (list.contains(CompanyWalletSourceEnum.WATER.getCode()+"")){
+                    showTypeStr = "租赁费+上级拥金";
+                }else {
+                    showTypeStr = "租赁费";
+                }
+            } else if (list.contains(CompanyWalletSourceEnum.WATER.getCode()+"")) {
+                if (list.contains(CompanyWalletSourceEnum.VEHICLE.getCode()+"")){
+                    showTypeStr = "租赁费+上级拥金";
+                }else {
+                    showTypeStr = "上级拥金";
+                }
+            } else if (list.contains(CompanyWalletSourceEnum.REGULATION.getCode()+"")) {
+                showTypeStr = "违章金";
+            }
+        }
+        return showTypeStr;
+    }
 
 }

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

@@ -23,7 +23,7 @@ public class BaseCommissionRatioBiz extends BaseBiz<BaseCommissionRatioMapper, B
     public List<BaseCommissionRatio> getList(){
         Example example=new Example(BaseCommissionRatio.class);
         example.createCriteria().andEqualTo("status",1);
-        example.setOrderByClause("type desc");
+        example.setOrderByClause("type asc");
         return  mapper.selectByExample(example);
     }
 

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

@@ -2,16 +2,20 @@ 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;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -64,6 +68,20 @@ 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);
+    }
+
+
+    public BigDecimal sumAmount(BaseOrderRevenueFindDTO revenueFindDTO){
+        return  mapper.sumAmount(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.math.BigDecimal;
+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);
+
+
+    BigDecimal sumAmount(BaseOrderRevenueFindDTO revenueFindDTO);
 }
\ No newline at end of file

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/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.dto.BaseOrderRevenueFindDTO;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+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("列表")
+    public  ObjectRestResponse selectList(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));
+    }
+
+
+    @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

@@ -10,4 +10,56 @@
      </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>
+
+
+    <select id="sumAmount" resultType="BigDecimal"
+            parameterType="com.github.wxiaoqi.security.admin.dto.BaseOrderRevenueFindDTO">
+        SELECT IFNULL(SUM(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