Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev

ace-common/src/main/java/com/github/wxiaoqi/security/common/msg/auth/PageResult.java

+package com.github.wxiaoqi.security.common.msg.auth;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class PageResult<M> {
+    /** 页码 */
+    private Integer page;
+    /** 每页结果数 */
+    private Integer pageSize;
+    /** 总页数 */
+    private Integer totalPage;
+    /** 总数 */
+    private Integer total;
+
+    private List<M> list=new ArrayList<>();
+
+    private PageResult(){
+
+    }
+
+    private PageResult(int page, int pageSize, int totalPage, int total, List<M> list) {
+        this.page = page;
+        this.pageSize = pageSize;
+        this.totalPage = totalPage;
+        this.total = total;
+        this.list = list;
+    }
+
+    public static PageResult  nowPageResult(Integer page, Integer limit, List totalList) {
+        page=page!=null?page:1;
+        limit=limit!=null?limit:10;
+        //总条数
+        Integer total=0;
+        //总页数
+        Integer totalPage=0;
+        //当前页面数据条数
+        Integer pageSize=0;
+        //当前页面数据集合
+        List list = new ArrayList();
+        if (totalList!=null&&totalList.size()!=0){
+            total= totalList.size();
+            totalPage = (total / limit) + 1;
+            //每页的起始索引
+            Integer pageNo = (page - 1) * limit;
+
+            if (pageNo + limit > total) {
+                list = totalList.subList(pageNo, total);
+            } else {
+                list = totalList.subList(pageNo, pageNo + limit);
+            }
+            pageSize=list.size();
+        }
+        return new PageResult(page,pageSize,totalPage,total,list);
+    }
+}

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderStatisticsBiz.java

 package com.xxfc.platform.order.biz;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.db.PageResult;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.msg.auth.PageResult;
 import com.google.common.collect.Maps;
 import com.xxfc.platform.order.Utils.OrderDateUtils;
 import com.xxfc.platform.order.contant.enumerate.OrderInquiryType;
@@ -89,7 +89,7 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat
         return result;
     }
 
-    public List<MembersOrderDto> getMemberOrderStatistics(List<BaseUserMemberLevel> memberLevels, OrderQuery query) throws ParseException {
+    public PageResult getMemberOrderStatistics(List<BaseUserMemberLevel> memberLevels, OrderQuery query) throws ParseException {
 
         List<MembersOrder> membersOrderList = membersBiz.getMemberOrderStatistics(query);
 
@@ -175,18 +175,13 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat
 
         //进行分页处理
 
-        return arrayList;
+     return   PageResult.nowPageResult(query.getPage(),query.getLimit(),arrayList);
+
 
 //        return pagingProcessing(query, arrayList);
 
     }
 
-    private PageResult pagingProcessing(OrderQuery query, ArrayList<MembersOrderDto> arrayList) {
-        PageResult pageResult = (PageResult) arrayList;
-        pageResult.setPage(query.getPage());
-        pageResult.setPageSize(query.getLimit());
-        return pageResult;
-    }
 
 
     private void TotalPaymentAndMemberName(HashMap<Integer, String> map, MembersOrder mb, MembersOrderDto mbdto) {
@@ -204,11 +199,6 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat
         mbdto.setTotalPayment(totalPayment);
     }
 
-    public Object downloadExcel() {
-
-
-        return null;
-    }
 
     public List<HashMap<Object, Object>> getRows(List<MembersOrderDto> list, List<BaseUserMemberLevel> memberLevels) {
         ArrayList<HashMap<Object, Object>> rows = Lists.newArrayList();

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java

@@ -225,9 +225,8 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             vehicleDepartureVo.setCheckManTel(orderVehicleCrosstownDto.getLicensePhone());
             try {
                 RestResponse restResponse = vehicleFeign.departureBySmall(vehicleDepartureVo);
-                log.info("返回信息： " + restResponse);
+                log.info("返回信息： " + restResponse.toString());
             } catch (Exception e) {
-                e.printStackTrace();
                 return ObjectRestResponse.createFailedResult(1001, e.getMessage());
             }
         } else if (orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.ARRIVE.getCode() || orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.FIXED_LOSS.getCode()) { //还车
@@ -243,9 +242,9 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 vehicleArrivalVo.setRecycleManTel("13565235623");
             }
             try {
-                vehicleFeign.arrivalBySmall(vehicleArrivalVo);
+                RestResponse restResponse = vehicleFeign.arrivalBySmall(vehicleArrivalVo);
+                log.info("返回信息： " + restResponse.toString());
             } catch (Exception e) {
-                e.printStackTrace();
                 return ObjectRestResponse.createFailedResult(500, e.getMessage());
             }
         }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java

@@ -359,13 +359,6 @@ public class BackStageOrderController extends CommonBaseController implements Us
         return ObjectRestResponse.succ();
     }
 
-    @PostMapping("/updateEndCompany")
-    @ResponseBody
-    public ObjectRestResponse updateEndCompany(@RequestBody OrderRentVehicleDetail orderRentVehicleDetail) {
-        return baseOrderBiz.save(orderRentVehicleDetail);
-    }
-
-
     @Data
     public static class ChangeVehicleDTO {
         String no;

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/background/OrderStatisticsController.java

@@ -174,7 +174,7 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
         // 通过工具类创建writer，默认创建xls格式
         ExcelWriter writer = ExcelUtil.getWriter(true);
         List<BaseUserMemberLevel> memberLevels = userFeign.levels();
-        List<MembersOrderDto> list = baseBiz.getMemberOrderStatistics(memberLevels, query);
+        List<MembersOrderDto> list = baseBiz.getMemberOrderStatistics(memberLevels, query).getList();
         List<HashMap<Object, Object>> rows = baseBiz.getRows(list, memberLevels);
 
         // 一次性写出内容，使用默认样式，强制输出标题

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/weixin/constant/AliNeedPayErrorEnum.java

@@ -11,7 +11,8 @@ import lombok.AllArgsConstructor;
 @AllArgsConstructor
 public enum AliNeedPayErrorEnum {
 
-    SYSTEM_ERROR("系统繁忙","系统繁忙");
+    SYSTEM_ERROR("系统繁忙","系统繁忙"),
+    PAYER_BALANCE_NOT_ENOUGH("余额不足","余额不足");
     private  String desc;
     private String reason;
 

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java

@@ -425,7 +425,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> implements In
             log.info("转账调用失败");
             String subCode = response.getSubCode();
             if (aliNeedPayErrorCodes.contains(subCode)) {
-                throw new BaseException("支付宝账号余额不足",PaySubErrorCodeEnum.PAY_NEED_ERROR.getSubCode());
+                throw new BaseException(AliNeedPayErrorEnum.valueOf(subCode).getDesc(),PaySubErrorCodeEnum.PAY_NEED_ERROR.getSubCode());
             }
             throw new BaseException("支付宝转账失败：【错误码:" + response.getSubCode() + " 错误信息:" + response.getSubMsg() + "】",PaySubErrorCodeEnum.PAY_ERROR.getSubCode());
         }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/common/RestResponse.java

@@ -70,4 +70,11 @@ public class RestResponse<T> extends BaseResponse {
         return restResponse;
     }
 
+    @Override
+    public String toString() {
+        return "RestResponse{" +
+                "data=" + data +
+                ", code=" + code +
+                '}';
+    }
 }