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

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

@@ -17,4 +17,19 @@ public class CompanyApplyVo extends CompanyInfoApply {
     @ApiModelProperty("商家名称")
     private String branchName;
 
+    @ApiModelProperty("是否支付")
+    private  Integer isPay;
+
+
+    @ApiModelProperty("状态：0-待审核；1-审核成功；2-驳回;3-未支付")
+    private  Integer applyStatus;
+
+
+    public  Integer  getApplyStatus(){
+        Integer applyStatus = super.getStatus();
+        if ( applyStatus != null &&  applyStatus == 0 && isPay != null &&  isPay  == 0){
+            applyStatus = 3;
+        }
+        return  applyStatus;
+    }
 }

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

@@ -4,6 +4,7 @@ package com.github.wxiaoqi.security.admin.biz;
 
 import com.github.wxiaoqi.security.admin.entity.CompanyInfoOrder;
 import com.github.wxiaoqi.security.admin.mapper.CompanyInfoOrderMapper;
+import com.github.wxiaoqi.security.admin.vo.CompanyApplyVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.util.OrderUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -35,6 +36,18 @@ public class CompanyInfoOrderBiz extends BaseBiz<CompanyInfoOrderMapper, Company
         return  selectList(companyInfoOrder);
     }
 
+    public void  isPay(CompanyApplyVo companyApplyVo){
+        BigDecimal payAmount=companyApplyVo.getPayAmount() == null ? BigDecimal.ZERO : companyApplyVo.getPayAmount();
+        BigDecimal realAmount = mapper.payAmount(companyApplyVo.getId());
+        Integer isPay = 0;
+        if (payAmount.compareTo(realAmount) == 1){
+            isPay = 1;
+        }
+        companyApplyVo.setIsPay(isPay);
+
+
+    }
+
 
 
 

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

 package com.github.wxiaoqi.security.admin.mapper;
 
 import com.github.wxiaoqi.security.admin.entity.CompanyInfoOrder;
+import org.apache.ibatis.annotations.Select;
 import tk.mybatis.mapper.additional.idlist.SelectByIdListMapper;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.math.BigDecimal;
+
 public interface CompanyInfoOrderMapper extends Mapper<CompanyInfoOrder>, SelectByIdListMapper<CompanyInfoOrder,Long> {
+
+
+    @Select("SELECT IFNULL(SUM(real_amount),0) FROM company_info_order WHERE branch_apply_id=#{branchApplyId} and pay_status =1")
+    BigDecimal payAmount(Long branchApplyId);
 }
\ No newline at end of file

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

@@ -59,7 +59,9 @@ public class AppCompanyInfoController extends BaseController<CompanyInfoApplyBiz
             companyApplyFindDTO.setUserId(getCurrentUserIdInt());
             List<CompanyApplyVo> list = baseBiz.getList(companyApplyFindDTO);
             if (list.size() > 0){
-                return  ObjectRestResponse.succ(list.get(0));
+                CompanyApplyVo companyApplyVo = list.get(0);
+                companyInfoOrderBiz.isPay(companyApplyVo);
+                return  ObjectRestResponse.succ(companyApplyVo);
             }
         }
         return ObjectRestResponse.succ();

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehiclePlatCataBiz.java

@@ -203,11 +203,11 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
      * @param limit
      * @return
      */
-    public ObjectRestResponse getCascades(Integer page, Integer limit, Integer sort, Integer goodsType) {
+    public ObjectRestResponse getCascades(Integer page, Integer limit, Integer sort, Integer goodsType, String name) {
         try {
             //标签列表页面
             if (sort == null || sort == 0) {
-                return getPage(page, limit, goodsType);
+                return getPage(page, limit, goodsType, name);
             }
 
             //增加车型页面
@@ -239,7 +239,7 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
     }
 
     @Cache(key = RedisKey.BRANCH_COMPANY_CATA_PAGE)
-    private ObjectRestResponse getPage(Integer page, Integer limit, Integer goodsType) {
+    private ObjectRestResponse getPage(Integer page, Integer limit, Integer goodsType, String name) {
         //获取一级标签
         WeekendSqls<VehiclePlatCata> weekendSqls = WeekendSqls.<VehiclePlatCata>custom();
         if(null != goodsType){
@@ -247,6 +247,9 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
         }
         weekendSqls.andEqualTo(VehiclePlatCata::getParentId, 0)
                 .andEqualTo(VehiclePlatCata::getState, 0);
+        if (StringUtils.isNotBlank(name)) {
+            weekendSqls.andLike(VehiclePlatCata::getName, "%" + name + "%");
+        }
         Example example = Example.builder(VehiclePlatCata.class)
                 .where(weekendSqls)
                 .orderByAsc("rank")

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleCataController.java

@@ -98,7 +98,7 @@ public class VehicleCataController extends VehicleBaseController<VehiclePlatCata
           ,@PathVariable Integer limit
           ,@PathVariable Integer sort){
 
-        return   baseBiz.getCascades(page,limit,sort,null);
+        return   baseBiz.getCascades(page,limit,sort,null, null);
     }
 
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/admin/BgVehicleCataController.java

@@ -90,7 +90,7 @@ public class BgVehicleCataController extends VehicleBaseController<VehiclePlatCa
      */
     @GetMapping(value = "/operation/getCascades")
     public ObjectRestResponse getCascades(PageDTO dto){
-        return baseBiz.getCascades(dto.getPage(), dto.getLimit(), dto.getSort(), dto.getGoodsType());
+        return baseBiz.getCascades(dto.getPage(), dto.getLimit(), dto.getSort(), dto.getGoodsType(), dto.getName());
     }
 
     /**
@@ -103,13 +103,14 @@ public class BgVehicleCataController extends VehicleBaseController<VehiclePlatCa
     @GetMapping(value = "/business/getCascades")
     public ObjectRestResponse getBusinessCascades(PageDTO dto){
         dto.setSort(1);
-        return baseBiz.getCascades(dto.getPage(), dto.getLimit(), dto.getSort(), dto.getGoodsType());
+        return baseBiz.getCascades(dto.getPage(), dto.getLimit(), dto.getSort(), dto.getGoodsType(), dto.getName());
     }
 
     @Data
     public static class PageDTO extends PageParam {
         Integer sort;
         Integer goodsType;
+        String name;
     }