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

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/WalletCathListDTO.java

@@ -43,4 +43,7 @@ public class WalletCathListDTO {
 
     @ApiModelProperty("单号")
     private String cono;
+
+    @ApiModelProperty(value = "用户账号")
+    private String accountNumber;
 }

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

@@ -40,4 +40,7 @@ public class WalletCathAdminVo {
     @ApiModelProperty("单号")
     private String cono;
 
+    @ApiModelProperty(value = "用户账号")
+    private String accountNumber;
+
 }

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

@@ -84,6 +84,7 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
                     .memberLevel(userMemberSaveDTO.getMemberLevel())
                     .totalNumber(userMemberSaveDTO.getTotalNumber())
                     .rentFreeDays(userMemberSaveDTO.getRentFreeDays())
+                    .memberName(userMemberSaveDTO.getMemberName())
                     .discount(level == null ? 0 : level.getDiscount() == null ? 0 : level.getDiscount())
                     .status(phoneAndUserIdMap == null ? 0 : (phoneAndUserIdMap.get(userMemberSaveDTO.getPhone()) == null ? 0 : 1))
                     .crtId(userId)

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

 package com.github.wxiaoqi.security.admin.rest;
 
+import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.admin.biz.*;
 import com.github.wxiaoqi.security.admin.entity.*;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
@@ -40,6 +41,10 @@ public class PublicController {
 
     @Autowired
     private AppUserDetailBiz detailBiz;
+
+    @Autowired
+    private AppUserLoginBiz appUserLoginBiz;
+
     @Autowired
     private BaseUserMemberBiz userMemberBiz;
 
@@ -85,6 +90,23 @@ public class PublicController {
         return ObjectRestResponse.succ(getAppUserInfoById(id));
     }
 
+    @RequestMapping(value = "/app/userinfo-by-username", method = RequestMethod.GET)
+    public @ResponseBody
+    ObjectRestResponse<AppUserDTO> userDetailByUsername(String name) throws Exception {
+        AppUserLogin appUserLogin;
+        if (StrUtil.isBlank(name)) {
+            throw new BaseException(ResultCode.NOTEXIST_CODE
+                    , new HashSet<String>() {{add("用户名不存在！");}});
+        }else {
+            appUserLogin = appUserLoginBiz.selectOne(new AppUserLogin(){{setUsername(name);}});
+            if(null == appUserLogin) {
+                throw new BaseException(ResultCode.NOTEXIST_CODE
+                        , new HashSet<String>() {{add("用户名不存在！");}});
+            }
+        }
+        return ObjectRestResponse.succ(getAppUserInfoById(appUserLogin.getId()));
+    }
+
     private AppUserDTO getAppUserInfoById(Integer userid) throws IllegalAccessException, InvocationTargetException {
         AppUserDTO userDTO=new AppUserDTO();
         //获取用户基础信息

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

@@ -14,7 +14,8 @@
         wc.stauts,
         wc.crt_time AS `crtTime`,
         wc.finish_time AS `finishTime`,
-        wc.cono
+        wc.cono,
+        wc.account_number AS `accountNumber`
         FROM
         (SELECT * FROM `my_wallet_cath` <if test="state != null">
         WHERE `stauts`=#{state}

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/Utils/OrderDateUtils.java

+package com.xxfc.platform.order.Utils;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+public class OrderDateUtils {
+
+    public static String getFirstDayOfMonth(int year, int month) {
+        String monthStr = String.valueOf(month);
+        return year + "-" + monthStr + "-" + "01";
+    }
+
+    /**
+     *  get the last date of given month and year
+     *  @param year
+     *  @param month
+     *  @return
+     *     
+     */
+
+
+    public static  String getLastDayOfMonth(int year, int month) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.YEAR, year);
+        calendar.set(Calendar.MONTH, month - 1);
+        calendar.set(Calendar.DATE, 1);
+        calendar.add(Calendar.MONTH, 1);
+        calendar.add(Calendar.DAY_OF_YEAR, -1);
+        return calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1) + "-" +
+                calendar.get(Calendar.DAY_OF_MONTH);
+    }
+
+    /**
+     *  get Calendar of given year
+     *  @param year
+     *  @return
+     *     
+     */
+
+
+    private static Calendar getCalendarFormYear(int year) {
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
+        cal.set(Calendar.YEAR, year);
+        return cal;
+    }
+
+    /**
+     *  get start date of given week no of a year
+     *  @param year
+     *  @param weekNo
+     *  @return
+     *     
+     */
+
+
+    public static  String getStartDayOfWeekNo(int year, int weekNo) {
+        Calendar cal = getCalendarFormYear(year);
+        cal.set(Calendar.WEEK_OF_YEAR, weekNo);
+        return cal.get(Calendar.YEAR) + "-" + (cal.get(Calendar.MONTH) + 1) + "-" +
+                cal.get(Calendar.DAY_OF_MONTH);
+
+    }
+
+    /**
+     *  get the end day of given week no of a year.
+     *  @param year
+     *  @param weekNo
+     *  @return
+     *     
+     */
+    public static String getEndDayOfWeekNo(int year, int weekNo) {
+        Calendar cal = getCalendarFormYear(year);
+        cal.set(Calendar.WEEK_OF_YEAR, weekNo);
+        cal.add(Calendar.DAY_OF_WEEK, 6);
+        return cal.get(Calendar.YEAR) + "-" + (cal.get(Calendar.MONTH) + 1) + "-" +
+                cal.get(Calendar.DAY_OF_MONTH);
+    }
+
+    public static String timeStampConversionToString(Long time) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        Date date = new Date(time);
+        return simpleDateFormat.format(date);
+    }
+
+    public static Long ConvertingStringsToTimestamps(String time) throws ParseException {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        return simpleDateFormat.parse(time).getTime();
+    }
+
+    public static Integer getTodayOfWeek() {
+        Calendar cal = Calendar.getInstance();
+        cal.setFirstDayOfWeek(Calendar.MONDAY);
+        cal.setTimeInMillis(System.currentTimeMillis());
+        return cal.get(Calendar.WEEK_OF_YEAR);
+    }
+
+    public static Integer getTodayOfMonth() {
+        Calendar cal = Calendar.getInstance();
+        cal.setTimeInMillis(System.currentTimeMillis());
+        return cal.get(Calendar.MONTH)+1;
+    }
+
+    public static Integer getThisYear() {
+        Calendar cal = Calendar.getInstance();
+        cal.setTimeInMillis(System.currentTimeMillis());
+        return cal.get(Calendar.YEAR);
+    }
+}

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/OrderInquiryType.java

+package com.xxfc.platform.order.contant.enumerate;
+
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+
+public enum OrderInquiryType {
+    DAY(1,"按天分类"),WEEK(2,"按周分类"),MONTH(3,"按月分类");
+    /**
+     * 编码
+     */
+    private Integer code;
+    /**
+     * 类型描述
+     */
+    private String desc;
+
+    OrderInquiryType(Integer code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+}

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/MembersOrder.java

+package com.xxfc.platform.order.entity;
+
+import com.xxfc.platform.order.pojo.Member;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class MembersOrder {
+
+    /**
+     * 时间段按日(yyyy-MM-dd)/周(yyyy-ww) /月(yyyy-MM)
+     */
+    private String period;
+
+    List<Member> members;
+
+
+}

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderStatistics.java

@@ -21,7 +21,7 @@ public class OrderStatistics {
     /**
      * 历史交总金额
      */
-    @ApiModelProperty(value = "历史交总金额")
+    @ApiModelProperty(value = "历史交易总金额")
     private BigDecimal totalGmv;
 
     /**

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/Member.java

+package com.xxfc.platform.order.pojo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 每日、每周或每月不同会员的总数据
+ * @author Administrator
+ */
+@Data
+public class Member {
+    /**
+     * 金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 会员等级
+     */
+    private Integer level;
+
+    /**
+     * 购买次数
+     */
+    private Integer number;
+
+    /**
+     * 会员名
+     */
+    private String memberName;
+
+}

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/MembersOrderDto.java

+package com.xxfc.platform.order.pojo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 每日、每周、每月会员购买数据
+ * @author Administrator
+ */
+@Data
+public class MembersOrderDto {
+
+    /**
+     * 时间段
+     */
+    private String timeSlot;
+
+    /**
+     * 时间段总数据
+     *
+     */
+    private BigDecimal totalPayment;
+
+    /**
+     * 时间段内不同会员数据
+     */
+    private List<Member> members;
+
+
+}

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/OrderQuery.java

+package com.xxfc.platform.order.pojo;
+
+import lombok.Data;
+
+/**
+ * 会员订单统计条件
+ * @author Administrator
+ */
+@Data
+public class   OrderQuery {
+
+    private  Integer page=1;
+    private  Integer limit=10;
+
+    /**
+     * 查询开始时间
+     */
+    private  Long startTime;
+
+    /**
+     * 查询结束时间
+     */
+    private  Long endTime;
+    /**
+     * 1.按每日统计,2.按每周统计,3.按每月统计
+     */
+    private  Integer type=1;
+
+}

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/CancelOrderDTO.java

@@ -7,4 +7,7 @@ import lombok.Data;
 public class CancelOrderDTO {
     @ApiModelProperty(value = "取消原因")
     private String cancelReason;
+
+    @ApiModelProperty(value = "app用户id")
+    private String appUserId;
 }
\ No newline at end of file

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/RentVehicleBO.java

@@ -42,4 +42,9 @@ public class RentVehicleBO extends OrderRentVehicleDetail implements OrderDetail
 
     @ApiModelProperty(value = "随车物品", hidden = true)
     private List<OrderAccompanyDTO> accompanyItems;
+
+    /**
+     * 创建用户 -1+后台用户id 后台系统
+     */
+    String crtUser;
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/add/AddOrderCommonDTO.java

@@ -8,7 +8,7 @@ public class AddOrderCommonDTO {
     /**
      *
      */
-    @ApiModelProperty(value = "下单来源，1--app；2--小程序")
+    @ApiModelProperty(value = "下单来源，1--app；2--小程序；3--后台")
     private Integer orderOrigin;
 
 

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

@@ -632,7 +632,8 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
 
     public Query initQuery(String no) {
         QueryOrderDetailDTO qodd = new QueryOrderDetailDTO();
-        qodd.setCrtUser(Integer.valueOf(BaseContextHandler.getUserID()));
+        //qodd.setCrtUser(Integer.valueOf(BaseContextHandler.getUserID()));
+        qodd.setUserId(Integer.valueOf(BaseContextHandler.getUserID()));
         qodd.setNo(no);
         qodd.setLimit(1);
         qodd.setPage(1);

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

@@ -2,17 +2,17 @@ package com.xxfc.platform.order.biz;
 
 import cn.hutool.json.JSONUtil;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
-import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.google.common.collect.Lists;
 import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.entity.DailyMembersOrderStatistics;
+import com.xxfc.platform.order.entity.MembersOrder;
 import com.xxfc.platform.order.entity.OrderAccount;
 import com.xxfc.platform.order.entity.OrderStatistics;
 import com.xxfc.platform.order.mapper.DailyMembersOrderStatisticsMapper;
+import com.xxfc.platform.order.pojo.OrderQuery;
 import com.xxfc.platform.order.pojo.account.OrderAccountDTO;
 import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,13 +20,11 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import tk.mybatis.mapper.entity.Example;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 每日购买会员订单统计
@@ -120,4 +118,13 @@ public class DailyMembersOrderStatisticsBiz extends BaseBiz<DailyMembersOrderSta
     public OrderStatistics findAll(Integer companyId) {
         return mapper.monthOrderTotal(companyId);
     }
+
+    /**
+     * 根据时间按年月日分组
+     * @param query
+     * @return
+     */
+    public List<MembersOrder> getMemberOrderStatistics(OrderQuery query) {
+       return mapper.getMemberOrderStatistics(query);
+    }
 }

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.core.date.DateUtil;
+import cn.hutool.db.PageResult;
+import com.github.pagehelper.Page;
+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.ObjectRestResponse;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Ordering;
+import com.xxfc.platform.order.Utils.OrderDateUtils;
+import com.xxfc.platform.order.contant.enumerate.OrderInquiryType;
+import com.xxfc.platform.order.entity.MembersOrder;
 import com.xxfc.platform.order.entity.OrderStatistics;
 import com.xxfc.platform.order.mapper.OrderStatisticsMapper;
 import com.xxfc.platform.order.pojo.HomePageOrderData;
+import com.xxfc.platform.order.pojo.Member;
+import com.xxfc.platform.order.pojo.MembersOrderDto;
+import com.xxfc.platform.order.pojo.OrderQuery;
+import org.apache.commons.lang3.StringUtils;
+import org.assertj.core.util.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Objects;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**
@@ -39,7 +58,7 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat
                 setAdditionalIndemnity(vehicle.getTotalCompensation()
                         .add(vehicle.getTotalForfeit())
                         .add(vehicle.getTotalDefaultMoney())
-                        .add(vehicle.getTotalExpenditure().subtract(vehicle.getTotalGmv().subtract(vehicle.getTotalReturnGmv())))
+                        .add(vehicle.getTotalExpenditure().subtract(vehicle.getTotalGmv()).add(vehicle.getTotalReturnGmv()))
                 );
             }};
             orderStatistics.add(data);
@@ -63,15 +82,127 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat
         }
 
 
+        result.setTotalOrders(orderStatistics.stream().map(HomePageOrderData::getTotalOrders).filter(o -> Objects.nonNull(o)).reduce(BigDecimal.ZERO, BigDecimal::add));
 
+        result.setTotalOutstandingDeposit(orderStatistics.stream().map(HomePageOrderData::getTotalOutstandingDeposit).filter(o -> Objects.nonNull(o)).reduce(BigDecimal.ZERO, BigDecimal::add));
 
-        result.setTotalOrders(orderStatistics.stream().map(HomePageOrderData::getTotalOrders).filter(o-> Objects.nonNull(o)).reduce(BigDecimal.ZERO, BigDecimal::add));
+        result.setAdditionalIndemnity(orderStatistics.stream().map(HomePageOrderData::getAdditionalIndemnity).filter(o -> Objects.nonNull(o)).reduce(BigDecimal.ZERO, BigDecimal::add));
 
-        result.setTotalOutstandingDeposit(orderStatistics.stream().map(HomePageOrderData::getTotalOutstandingDeposit).filter(o-> Objects.nonNull(o)).reduce(BigDecimal.ZERO, BigDecimal::add));
+        return result;
+    }
 
-        result.setAdditionalIndemnity(orderStatistics.stream().map(HomePageOrderData::getAdditionalIndemnity).filter(o-> Objects.nonNull(o)).reduce(BigDecimal.ZERO, BigDecimal::add));
+    public Object getMemberOrderStatistics(List<BaseUserMemberLevel> memberLevels, OrderQuery query) throws ParseException {
+
+        List<MembersOrder> membersOrderList = membersBiz.getMemberOrderStatistics(query);
+
+        //按每天分类
+        if (CollectionUtil.isEmpty(membersOrderList)) {
+            return null;
+        }
+        //按每天分类
+        if (CollectionUtil.isEmpty(memberLevels)) {
+            throw new BaseException("获取不到会员信息");
+        }
+        //获取会员等级对应的名称
+        HashMap<Integer, String> map = Maps.newHashMap();
+        for (BaseUserMemberLevel memberLevel : memberLevels) {
+            map.put(memberLevel.getLevel(), memberLevel.getName());
+        }
+        //按查询条件获取统计信息
+        ArrayList<MembersOrderDto> arrayList = Lists.newArrayList();
+        if (OrderInquiryType.DAY.getCode().equals(query.getType())) {
+            for (MembersOrder mb : membersOrderList) {
+                MembersOrderDto mbdto = new MembersOrderDto();
+                //设置时间段
+                mbdto.setTimeSlot(mb.getPeriod());
+                TotalPaymentAndMemberName(map, mb, mbdto);
+                arrayList.add(mbdto);
+            }
+        } else {
+            for (int i = 0; i < membersOrderList.size(); i++) {
+                MembersOrder mb = membersOrderList.get(i);
+                String period = mb.getPeriod();
+                if (StringUtils.isBlank(period)) {
+                    continue;
+                }
+                MembersOrderDto mbdto = new MembersOrderDto();
+                String[] periods = mb.getPeriod().split("-");
+                String startDay = null;
+                String endDay = null;
+                Integer time = null;
+                if (OrderInquiryType.WEEK.getCode().equals(query.getType())) {
+                    startDay = OrderDateUtils.getStartDayOfWeekNo(Integer.parseInt(periods[0]), Integer.parseInt(periods[1]));
+                    endDay = OrderDateUtils.getEndDayOfWeekNo(Integer.parseInt(periods[0]), Integer.parseInt(periods[1]));
+                    //获取今天是今年的第几周
+                    time = OrderDateUtils.getTodayOfWeek();
+                }
+               Integer  thisYear =OrderDateUtils.getThisYear();
+                if (OrderInquiryType.MONTH.getCode().equals(query.getType())) {
+                    startDay = OrderDateUtils.getFirstDayOfMonth(Integer.parseInt(periods[0]), Integer.parseInt(periods[1]));
+                    endDay = OrderDateUtils.getLastDayOfMonth(Integer.parseInt(periods[0]), Integer.parseInt(periods[1]));
+                    //获取今天是今年的第几个月
+                    time = OrderDateUtils.getTodayOfMonth();
+                }
+
+                if (i == 0 && query.getStartTime() != null) {
+                    startDay = OrderDateUtils.timeStampConversionToString(query.getStartTime());
+                }
+                //获取当前的年.周(年.月)小数
+                double today=Double.parseDouble(thisYear+"."+time);
+
+                if (i == (membersOrderList.size() - 1)) {
+                    //查询到的最后一条数据年.周(年.月)小数
+                    double date = Double.parseDouble(Integer.parseInt(periods[0]) + "." + Integer.parseInt(periods[1]));
+                    if (date == today) {
+                        endDay = OrderDateUtils.timeStampConversionToString(System.currentTimeMillis());
+                    } else if (date < today) {
+                        //获取最后一条数据,周末日期
+                        Long end = OrderDateUtils.ConvertingStringsToTimestamps(endDay);
+                        //查询的结束日期
+                        Long endTime = query.getEndTime();
+                        if (endTime != null && end > endTime) {
+                            endDay = OrderDateUtils.timeStampConversionToString(query.getEndTime());
+                        }
+                    }
+                }
+                if (StringUtils.isNotBlank(startDay) && StringUtils.isNotBlank(endDay)) {
+                    mbdto.setTimeSlot(startDay + "~" + endDay);
+                } else {
+                    mbdto.setTimeSlot("");
+                }
+                TotalPaymentAndMemberName(map, mb, mbdto);
+                arrayList.add(mbdto);
+            }
+        }
+
+        //进行分页处理
+
+           return    arrayList;
+
+//        return pagingProcessing(query, arrayList);
 
-        return result;
     }
 
+    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) {
+
+        BigDecimal totalPayment =BigDecimal.ZERO;
+        List<Member> members = mb.getMembers();
+        //设置时间段购买会员总金额和不同的会员名称
+        if (CollectionUtil.isNotEmpty(members)) {
+            mbdto.setMembers(members);
+            for (Member member : members) {
+                member.setMemberName(map.get(member.getLevel()));
+                totalPayment = totalPayment.add(member.getAmount()==null?BigDecimal.ZERO:member.getAmount());
+            }
+        }
+        mbdto.setTotalPayment(totalPayment);
+    }
 }

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

@@ -13,6 +13,7 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.activity.user.UserInfoBiz;
 import com.xxfc.platform.order.biz.inner.OrderCalculateBiz;
+import com.xxfc.platform.order.biz.inner.OrderMsgBiz;
 import com.xxfc.platform.order.contant.enumerate.CrosstownTypeEnum;
 import com.xxfc.platform.order.contant.enumerate.DepositRefundStatus;
 import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
@@ -73,6 +74,8 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
     BaseOrderBiz baseOrderBiz;
     @Autowired
     OrderItemBiz orderItemBiz;
+    @Autowired
+    OrderMsgBiz orderMsgBiz;
 
     public OrderVehicleCrosstown get(Integer id) {
         return selectById(id);
@@ -287,12 +290,13 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             }
             BeanUtil.copyProperties(orderVehicleCrosstownDto, oldValue.get(0), CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
             getOrderLicense(orderVehicleCrosstownDto);
-            handleOrderStatus(baseOrder, orderRentVehicleDetail, oldValue.get(0));
+            handleOrderStatus(baseOrder, orderRentVehicleDetail, oldValue.get(0), appUserDTO);
             updateSelectiveByIdRe(oldValue.get(0));
             RestResponse<Vehicle> response = vehicleFeign.findById(orderRentVehicleDetail.getVehicleId());
             if (response.getData() != null) {
                 orderVehicleCrosstownDto.setVehicleNumberPlat(response.getData().getNumberPlate());
             }
+
             return ObjectRestResponse.succ(oldValue.get(0));
         } else if (oldValue.size() <= 0) {
             orderVehicleCrosstownDto.setDeductionCost(amount);
@@ -304,7 +308,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             getOrderLicense(orderVehicleCrosstownDto);
             orderVehicleCrosstownBiz.insertSelective(orderVehicleCrosstownDto);
             OrderVehicleCrosstown orderVehicleCrosstown = orderVehicleCrosstownBiz.selectOne(orderVehicleCrosstownDto);
-            handleOrderStatus(baseOrder, orderRentVehicleDetail, orderVehicleCrosstown);
+            handleOrderStatus(baseOrder, orderRentVehicleDetail, orderVehicleCrosstown, appUserDTO);
             orderVehicleCrosstownBiz.updateSelectiveByIdRe(orderVehicleCrosstown);
             RestResponse<Vehicle> response = vehicleFeign.findById(orderRentVehicleDetail.getVehicleId());
             if (response.getData() != null) {
@@ -312,15 +316,16 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             }
             return ObjectRestResponse.succ(orderVehicleCrosstownDto);
         }
+
         return ObjectRestResponse.createDefaultFail();
     }
-
-    private void handleOrderStatus(BaseOrder baseOrder, OrderRentVehicleDetail orderRentVehicleDetail, OrderVehicleCrosstown orderVehicleCrosstown) {
+    private void handleOrderStatus(BaseOrder baseOrder, OrderRentVehicleDetail orderRentVehicleDetail, OrderVehicleCrosstown orderVehicleCrosstown, AppUserDTO appUserDTO) {
         //交车完成 设置订单状态为出行中
         BigDecimal totalAmount = orderRentVehicleDetail.getDeposit();
         if (baseOrder.getStatus() == OrderStatusEnum.ORDER_TOSTART.getCode()) {//交车
             baseOrder.setStatus(OrderStatusEnum.ORDER_WAIT.getCode());
             baseOrder = baseOrderBiz.updateSelectiveByIdReT(baseOrder);
+            orderMsgBiz.handelMsgWait(orderRentVehicleDetail, null, null, baseOrder, appUserDTO);
         } else if (baseOrder.getStatus() == OrderStatusEnum.ORDER_WAIT.getCode()) { //还车
             if (orderVehicleCrosstown.getType() == CrosstownTypeEnum.ARRIVE.getCode()) {//不定损直接还车
                 //添加非定损记录

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

@@ -235,8 +235,8 @@ public class OrderMsgBiz {
                         sms2BgUser(startCompanyDetail.getVehiceServicePhone(), startCompanyDetail, endCompanyDetail, orvd, otd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_D, smsParams);
 
                         //后台发送消息(收车人)
-                        smsParams.clear();
-                        sms2BgUser(endCompanyDetail.getVehiceServicePhone(), startCompanyDetail, endCompanyDetail, orvd, otd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_E, smsParams);
+//                        smsParams.clear();
+//                        sms2BgUser(endCompanyDetail.getVehiceServicePhone(), startCompanyDetail, endCompanyDetail, orvd, otd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_E, smsParams);
 
                     }else {
                         log.error("通知短信异常，开始公司id 不存在或者为0 订单号：{}", baseOrder.getId());
@@ -338,7 +338,7 @@ public class OrderMsgBiz {
     }
 
     /**
-     * 取消订单处理提醒短信的发送
+     * 订单出发提前提醒短信的发送
      * @param orvd
      * @param baseOrder
      * @param appUserDTO
@@ -371,6 +371,39 @@ public class OrderMsgBiz {
         }
     }
 
+    /**
+     * 订单出发后提醒短信的发送
+     * @param orvd
+     * @param baseOrder
+     * @param appUserDTO
+     */
+    public void handelMsgWait(OrderRentVehicleDetail orvd, OrderTourDetail otd, OrderMemberDetail omd, BaseOrder baseOrder, AppUserDTO appUserDTO) {
+        try {
+            OrderTypeEnum orderTypeEnum = OrderTypeEnum.codeAndDesc.get(baseOrder.getType());
+            List<String> smsParams = new ArrayList<String>();
+            switch (orderTypeEnum) {
+                case RENT_VEHICLE:
+                    CompanyDetail startCompanyDetail = vehicleFeign.getCompanyDetail(orvd.getStartCompanyId()).getData();
+                    CompanyDetail endCompanyDetail = vehicleFeign.getCompanyDetail(orvd.getEndCompanyId()).getData();
+                    if(null != orvd.getEndCompanyId() && !SYS_FALSE.equals(orvd.getEndCompanyId())) {
+                        //后台发送消息(收车人)
+                        sms2BgUser(endCompanyDetail.getVehiceServicePhone(), startCompanyDetail, endCompanyDetail, orvd, otd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_E, smsParams);
+                    }else {
+                        log.error("通知后台客户短信异常，结束公司id 不存在或者为0 订单号：{}", baseOrder.getId());
+                    }
+                    break;
+                case TOUR:
+                    break;
+                case MEMBER:
+                    break;
+                default:
+                    break;
+            }
+        }catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+    }
+
     /**
      * 订单完成后处理押金提醒短信的发送
      * @param baseOrder
@@ -616,8 +649,8 @@ public class OrderMsgBiz {
             case SmsTemplateDTO.PAY_E :
                 smsParams.add(appUserDTO.getRealname());
                 smsParams.add(appUserDTO.getUsername());
-                smsParams.add(DateUtil.formatDateTime(DateUtil.date(orvd.getStartTime())));
-                smsParams.add(sCompany.getName());
+                smsParams.add(DateUtil.formatDateTime(DateUtil.date(orvd.getEndTime())));
+                smsParams.add(eCompany.getName());
                 smsParams.add(baseOrder.getName());
                 break;
             case SmsTemplateDTO.CANCEL_E :

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/jobhandler/RemindMsgJobHandler.java

@@ -33,7 +33,7 @@ import static com.github.wxiaoqi.security.common.constant.CommonConstants.*;
 import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
 /**
- * 跨平台Http任务
+ * 订单出车短信提前提醒
  *
  * @author xuxueli 2018-09-16 03:48:34
  */

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/DailyMembersOrderStatisticsMapper.java

 package com.xxfc.platform.order.mapper;
 
 import com.xxfc.platform.order.entity.DailyMembersOrderStatistics;
+import com.xxfc.platform.order.entity.MembersOrder;
 import com.xxfc.platform.order.entity.OrderStatistics;
+import com.xxfc.platform.order.pojo.OrderQuery;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 
@@ -18,4 +20,7 @@ public interface DailyMembersOrderStatisticsMapper extends Mapper<DailyMembersOr
 
     OrderStatistics monthOrderTotal(@Param("companyId") Integer companyId);
 
+
+
+    List<MembersOrder> getMemberOrderStatistics(OrderQuery query);
 }

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

@@ -149,7 +149,8 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         if (StringUtils.isBlank(BaseContextHandler.getUserID())) {
             throw new BaseException(ResultCode.AJAX_WECHAT_NOTEXIST_CODE);
         }
-        dto.setCrtUser(Integer.valueOf(BaseContextHandler.getUserID()));
+        //dto.setCrtUser(Integer.valueOf(BaseContextHandler.getUserID()));
+        dto.setUserId(Integer.valueOf(BaseContextHandler.getUserID()));
         Query query = new Query(dto);
         PageDataVO<OrderPageVO> pages = PageDataVO.pageInfo(query, () -> baseOrderBiz.pageByParm(query.getSuper()));
         pages.getData().parallelStream().forEach(data -> data.setQrcodeStr(qrcodePrefix));
@@ -248,16 +249,33 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         if (StringUtils.isBlank(BaseContextHandler.getUserID())) {
             throw new BaseException(ResultCode.AJAX_WECHAT_NOTEXIST_CODE);
         }
+        cancelCommon(no, cancelOrderDto, BaseContextHandler.getUserID());
+        return ObjectRestResponse.succ();
+    }
+
+    @RequestMapping(value = "/back-stage/cancel/{no}", method = RequestMethod.POST)
+    @ResponseBody
+    @ApiOperation(value = "取消订单")
+    @IgnoreClientToken
+    public ObjectRestResponse bgCancel(@PathVariable String no, @RequestBody CancelOrderDTO cancelOrderDto) {
+        //查询列表数据
+        if (StringUtils.isBlank(cancelOrderDto.getAppUserId())) {
+            throw new BaseException(ResultCode.AJAX_WECHAT_NOTEXIST_CODE);
+        }
+        cancelCommon(no, cancelOrderDto, cancelOrderDto.getAppUserId());
+        return ObjectRestResponse.succ();
+    }
+
+    private void cancelCommon(String no, CancelOrderDTO cancelOrderDto, String userId) {
         BaseOrder dbBaseOrder = baseOrderBiz.selectOne(new BaseOrder() {{
             setNo(no);
         }});
-        if (null == dbBaseOrder || !BaseContextHandler.getUserID().equals(dbBaseOrder.getUserId().toString())) {
+        if (null == dbBaseOrder || !userId.equals(dbBaseOrder.getUserId().toString())) {
             throw new BaseException(ResultCode.NOTEXIST_CODE);
 
         }
         dbBaseOrder.setCancelReason(cancelOrderDto.getCancelReason());
         orderCancelBiz.cancel(dbBaseOrder);
-        return ObjectRestResponse.succ();
     }
 
     @RequestMapping(value = "/app/unauth/notifyUrl", method = RequestMethod.GET)

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

@@ -3,6 +3,7 @@ package com.xxfc.platform.order.rest;
 import cn.hutool.core.bean.BeanUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
+import com.github.wxiaoqi.security.common.context.BaseContextHandler;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.order.biz.OrderMemberDetailBiz;
@@ -45,6 +46,7 @@ public class OrderMemberController extends BaseController<OrderMemberDetailBiz,O
 
 //        bo.setMemberLevelId(bo.getBaseUserMemberLevel().getId());
 
+        bo.setAppUserDTO(userFeign.userDetailByToken(BaseContextHandler.getToken()).getData());
         //查询优惠券
         orderMemberService.createOrder(bo);
         return ObjectRestResponse.succ(bo.getOrder());

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

@@ -157,12 +157,11 @@ public class OrderRefundController extends BaseController<OrderRefundBiz,OrderRe
         orpv.setRealAmount(orderPageVO.getRealAmount());
         orpv.setRefundAmount(totalRefundAmount);
         if(orderPageVO.getStatus().equals(OrderStatusEnum.ORDER_UNPAY.getCode())
-                || orderPageVO.getStatus().equals(OrderStatusEnum.ORDER_CRT.getCode())) {
+                || orderPageVO.getStatus().equals(OrderStatusEnum.ORDER_CRT.getCode())
+                || totalDeductAmount.compareTo(BigDecimal.ZERO) <= 0) {
             orpv.setRefundDesc("是否确定取消订单");
-        }else if(totalDeductAmount.compareTo(BigDecimal.ZERO) > 0) {
-            orpv.setRefundDesc(StrUtil.format("本次取消操作需要扣除{}元违约金，实际退款金额为{}元，您确定要取消订单吗？", totalDeductAmount, totalRefundAmount));
         }else {
-            orpv.setRefundDesc("取消操作可能会产生额外费用，是否确定取消订单");
+            orpv.setRefundDesc(StrUtil.format("本次取消操作需要扣除{}元违约金，实际退款金额为{}元，您确定要取消订单吗？", totalDeductAmount, totalRefundAmount));
         }
         return ObjectRestResponse.succ(orpv);
     }

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

@@ -73,6 +73,7 @@ public class OrderRentVehicleController extends CommonBaseController {
                 RentVehicleBO bo = initRentVehicleBO(dto);
 
                 bo.setAppUserDTO(userFeign.userDetailById(dto.getAppUserId()).getData());
+                bo.setCrtUser("-1"+ BaseContextHandler.getUserID());
                 orderRentVehicleService.createOrder(bo);
                 return ObjectRestResponse.succ(bo.getOrder());
         }

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

@@ -7,6 +7,7 @@ import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
+import com.github.wxiaoqi.security.common.context.BaseContextHandler;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.order.biz.OrderTourDetailBiz;
@@ -58,6 +59,7 @@ public class OrderTourController extends BaseController<OrderTourDetailBiz,Order
     @ApiOperation(value = "确认旅游订单")
     public ObjectRestResponse<BaseOrder> add(@RequestBody AddTourDTO vo){
         TourBO bo = BeanUtil.toBean(vo, TourBO.class);
+        bo.setAppUserDTO(userFeign.userDetailByToken(BaseContextHandler.getToken()).getData());
         bo.setTickerNo(StrUtil.isNotBlank(vo.getTickerNos())? Arrays.asList(vo.getTickerNos().split(",")):null);
         orderTourService.createOrder(bo);
         return ObjectRestResponse.succ(bo.getOrder());

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

 package com.xxfc.platform.order.rest.background;
 
+import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.order.biz.DailyMembersOrderStatisticsBiz;
 import com.xxfc.platform.order.biz.DailyTravelOrderStatisticsBiz;
@@ -13,13 +15,18 @@ import com.xxfc.platform.order.biz.DailyVehicleOrderStatisticsBiz;
 import com.xxfc.platform.order.biz.OrderStatisticsBiz;
 import com.xxfc.platform.order.entity.OrderStatistics;
 import com.xxfc.platform.order.pojo.HomePageOrderData;
+import com.xxfc.platform.order.pojo.OrderQuery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author Administrator
@@ -56,7 +63,7 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
     /**
      * 数据权限
      */
-    private final  Integer DATA_AUTHORITY=1;
+    private final Integer DATA_AUTHORITY = 1;
 
     @Autowired
     private DailyVehicleOrderStatisticsBiz vehicleBiz;
@@ -68,6 +75,7 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
     @Autowired
     private DailyMembersOrderStatisticsBiz membersBiz;
 
+
     @ApiOperation("获取订单统计数据")
     @GetMapping("/findAll/{type}")
     public ObjectRestResponse findAll(@PathVariable Integer type) {
@@ -83,13 +91,13 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
             UserDTO user = userDTOObjectRestResponse.getData();
 
             Integer companyId = user.getCompanyId();
-            if (DATA_AUTHORITY.equals(user.getDataAll())){
-                companyId=null;
+            if (DATA_AUTHORITY.equals(user.getDataAll())) {
+                companyId = null;
             }
 
             if (TYPE_VEHICLE.equals(type)) {
                 OrderStatistics vehicle = vehicleBiz.findAll(companyId);
-                return ObjectRestResponse.succ(new HomePageOrderData(){{
+                return ObjectRestResponse.succ(new HomePageOrderData() {{
                     setTotalOrders(vehicle.getTotalGmv().subtract(vehicle.getTotalReturnGmv()));
                     setAdditionalIndemnity(vehicle.getTotalCompensation()
                             .add(vehicle.getTotalForfeit())
@@ -100,14 +108,14 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
             }
             if (TYPE_TOUR.equals(type)) {
                 OrderStatistics tour = TravelBiz.findAll(companyId);
-                return ObjectRestResponse.succ(new HomePageOrderData(){{
+                return ObjectRestResponse.succ(new HomePageOrderData() {{
                     setTotalOrders(tour.getTotalGmv().subtract(tour.getTotalReturnGmv()));
                     setAdditionalIndemnity(tour.getTotalDefaultMoney());
                 }});
             }
             if (TYPE_MEMBER.equals(type)) {
                 OrderStatistics member = membersBiz.findAll(companyId);
-                return ObjectRestResponse.succ(new HomePageOrderData(){{
+                return ObjectRestResponse.succ(new HomePageOrderData() {{
                     setTotalOrders(member.getTotalGmv());
 
                 }});
@@ -125,5 +133,16 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
 
     }
 
+    @PostMapping("/order")
+    @ApiOperation(value = "会员统计")
+    public ObjectRestResponse getMemberOrderStatisticsData(@RequestBody OrderQuery query) throws ParseException {
+
+        //获取会员等级信息
+        List<BaseUserMemberLevel> memberLevels = userFeign.levels();
+        //获取会员订单统计信息
+        return ObjectRestResponse.succ( baseBiz.getMemberOrderStatistics(memberLevels,query));
+
+    }
+
 
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/AbstractOrderHandle.java

 package com.xxfc.platform.order.service;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.context.BaseContextHandler;
@@ -64,7 +66,7 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
      * 创建基础订单
      * @return
      */
-    public BaseOrder createBaseOrder(Integer orderOrigin, Integer appUserId) {
+    public BaseOrder createBaseOrder(Integer orderOrigin, AppUserDTO appUserDTO) {
         BaseOrder baseOrder = new BaseOrder();
 
         //设置下单来源
@@ -85,14 +87,14 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
         baseOrder.setVersion(VERSION_INITIAL);
 
         //设置用户id
-        baseOrder.setUserId(appUserId);
-        baseOrder.setMemberLevel(getAppUser().getMemberLevel());
+        baseOrder.setUserId(appUserDTO.getUserid());
+        baseOrder.setMemberLevel(appUserDTO.getMemberLevel());
         return baseOrder;
     }
 
     public void initDetail(Detail detail) {
-        Integer appUserId = (null == detail.getAppUserDTO())? Integer.valueOf(BaseContextHandler.getUserID()): detail.getAppUserDTO().getId();
-        BaseOrder order = createBaseOrder(detail.getOrderOrigin(), appUserId);
+//        Integer appUserId = (null == detail.getAppUserDTO())? Integer.valueOf(BaseContextHandler.getUserID()): detail.getAppUserDTO().getUserid();
+        BaseOrder order = createBaseOrder(detail.getOrderOrigin(), detail.getAppUserDTO());
         detail.setOrder(order);
     }
 
@@ -119,10 +121,11 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
         detail.setOrderId(detail.getOrder().getId());
         detailBiz.insertSelective(detail);
         detail.getOrder().setDetailId(detail.getId());
-        int updateResult =baseOrderBiz.updateSelectiveByIdRe(detail.getOrder());
-        if(updateResult > 0) {
-            detail.getOrder().setVersion(detail.getOrder().getVersion() + 1);
-        }
+//        int updateResult =baseOrderBiz.updateSelectiveByIdRe(detail.getOrder());
+//        if(updateResult > 0) {
+//            detail.getOrder().setVersion(detail.getOrder().getVersion() + 1);
+//        }
+        detail.setOrder(baseOrderBiz.updateSelectiveByIdReT(detail.getOrder()));
 
         //插入item
         if(null != detail.getItems() && detail.getItems().size() > 0) {

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java

@@ -196,6 +196,11 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         accompanyItem.setOrderId(bo.getOrder().getId());
         orderItemBiz.insertSelective(accompanyItem);
 
+        //设置后台系统创建人
+        if(StrUtil.isNotBlank(bo.getCrtUser())) {
+            bo.getOrder().setCrtUser(bo.getCrtUser());
+        }
+
         super.handleDetail(bo);
 
         //发送定时取消订单(数据字典设置--5分钟)

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -75,6 +75,9 @@
             <if test="crtUser != null">
                 and crt_user = #{crtUser}
             </if>
+            <if test="userId != null">
+                and user_id = #{userId}
+            </if>
             <if test="crtCompanyId != null">
                 and crt_company_id = #{crtCompanyId}
             </if>
@@ -127,6 +130,9 @@
                 </foreach>
 
             </if>
+            <if test="userId != null">
+                and b.user_id = #{userId}
+            </if>
             <if test="status != null">
                 and b.status = #{status}
             </if>

xx-order/xx-order-server/src/main/resources/mapper/DailyMembersOrderStatisticsMapper.xml

@@ -38,4 +38,51 @@
     <!--        DATE_FORMAT(one_day,'%Y-%c')=DATE_FORMAT(DATE_SUB(NOW(),interval 1 day),'%Y-%c')-->
 
     <!--    </select>-->
+
+    <select id="getMemberOrderStatistics" parameterType="com.xxfc.platform.order.pojo.OrderQuery"
+            resultMap="order">
+    SELECT
+    <if test="type==2">
+        DATE_FORMAT(date( FROM_UNIXTIME( a.crt_time / 1000 ) ),'%Y-%v') AS period,
+    </if>
+    <if test="type==3">
+        DATE_FORMAT(date( FROM_UNIXTIME( a.crt_time / 1000 ) ),'%Y-%m') AS period,
+    </if>
+	date( FROM_UNIXTIME( a.crt_time / 1000 ) ) AS period,
+	count( a.id ) AS number,
+	SUM( a.account_amount ) AS amount,
+	d.member_level AS level
+    FROM
+	order_account a
+	LEFT JOIN base_order b ON a.order_id = b.id
+	LEFT JOIN order_member_detail d ON d.order_id = b.id
+    WHERE
+	a.account_status = 1
+	AND a.account_type = 101
+	AND b.type = 3
+	<if test="startTime != null">
+        AND a.crt_time &gt;= #{startTime}
+    </if>
+    <if test="endTime != null">
+        AND  a.crt_time &lt;= #{endTime}
+    </if>
+    GROUP BY
+    <if test="type==2">
+        DATE_FORMAT(date( FROM_UNIXTIME( a.crt_time / 1000 ) ),'%Y-%v'),
+    </if>
+    <if test="type==3">
+        DATE_FORMAT(date( FROM_UNIXTIME( a.crt_time / 1000 ) ),'%Y-%m'),
+    </if>
+
+	date( FROM_UNIXTIME( a.crt_time / 1000 ) ),
+	d.member_level
+    </select>
+    <resultMap id="order" type="com.xxfc.platform.order.entity.MembersOrder">
+        <result column="period"  property="period"></result>
+         <collection property="members" ofType="com.xxfc.platform.order.pojo.Member">
+             <result column="number"  property="number"></result>
+             <result column="amount"  property="amount"></result>
+             <result column="level"  property="level"></result>
+         </collection>
+    </resultMap>
 </mapper>
\ No newline at end of file

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/SummitActivityBiz.java

@@ -113,6 +113,7 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
     public void publishSummitActivityById(Integer id, Integer state) {
         SummitActivity summitActivity = new SummitActivity();
         summitActivity.setIsPublish(state);
+        summitActivity.setUpdTime(Instant.now().toEpochMilli());
         summitActivity.setId(id);
         mapper.updateByPrimaryKeySelective(summitActivity);
     }
@@ -121,6 +122,7 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
         SummitActivity summitActivity = new SummitActivity();
         summitActivity.setIsShow(state);
         summitActivity.setId(id);
+        summitActivity.setUpdTime(Instant.now().toEpochMilli());
         mapper.updateByPrimaryKeySelective(summitActivity);
     }
 
@@ -128,6 +130,7 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
         SummitActivity summitActivity = new SummitActivity();
         summitActivity.setIsHomePage(state);
         summitActivity.setId(id);
+        summitActivity.setUpdTime(Instant.now().toEpochMilli());
         mapper.updateByPrimaryKeySelective(summitActivity);
     }
 
@@ -135,6 +138,7 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
         SummitActivity summitActivity = new SummitActivity();
         summitActivity.setIsOpenReg(state);
         summitActivity.setId(id);
+        summitActivity.setUpdTime(Instant.now().toEpochMilli());
         mapper.updateByPrimaryKeySelective(summitActivity);
     }
 
@@ -142,6 +146,7 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
         SummitActivity summitActivity = new SummitActivity();
         summitActivity.setIsDel(1);
         summitActivity.setId(id);
+        summitActivity.setUpdTime(Instant.now().toEpochMilli());
         mapper.updateByPrimaryKeySelective(summitActivity);
     }
 
@@ -162,6 +167,7 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
         SummitActivity summitActivity = new SummitActivity();
         summitActivity.setId(id);
         summitActivity.setRank(rank);
+        summitActivity.setUpdTime(Instant.now().toEpochMilli());
         mapper.updateByPrimaryKeySelective(summitActivity);
     }
 

xx-universal/xx-universal-api/pom.xml

@@ -83,6 +83,12 @@
             <artifactId>jiguang-common</artifactId>
             <version>1.1.1</version>
         </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/api/BaseAuthentication.java

-package com.xxfc.platform.universal.api;
-
-
-import com.xxfc.platform.universal.api.pojo.Authentication;
-import com.xxfc.platform.universal.entity.IdInformation;
-
-/**
- * 调用外部接口实现类。调用不同的外部接口，需要编写不同了类实现该类
- */
-public interface BaseAuthentication {
-
-    Authentication getAuthentication(IdInformation idInformation);
-
-}

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/api/impl/FQAuthentication.java

-package com.xxfc.platform.universal.api.impl;
-
-import com.xxfc.platform.universal.api.BaseAuthentication;
-import com.xxfc.platform.universal.api.pojo.Authentication;
-import com.xxfc.platform.universal.entity.IdInformation;
-
-public class FQAuthentication implements BaseAuthentication {
-    @Override
-    public Authentication getAuthentication(IdInformation idInformation) {
-
-        return null;
-    }
-}

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/api/pojo/Authentication.java

-package com.xxfc.platform.universal.api.pojo;
-
-public class Authentication {
-}

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/utils/HttpUtils.java

+package com.xxfc.platform.universal.utils;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpDelete;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.conn.ClientConnectionManager;
+import org.apache.http.conn.scheme.Scheme;
+import org.apache.http.conn.scheme.SchemeRegistry;
+import org.apache.http.conn.ssl.SSLSocketFactory;
+import org.apache.http.entity.ByteArrayEntity;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.message.BasicNameValuePair;
+
+public class HttpUtils {
+	
+	/**
+	 * get
+	 * 
+	 * @param host
+	 * @param path
+	 * @param method
+	 * @param headers
+	 * @param querys
+	 * @return
+	 * @throws Exception
+	 */
+	public static HttpResponse doGet(String host, String path, String method, 
+			Map<String, String> headers, 
+			Map<String, String> querys)
+            throws Exception {    	
+    	HttpClient httpClient = wrapClient(host);
+
+    	HttpGet request = new HttpGet(buildUrl(host, path, querys));
+        for (Map.Entry<String, String> e : headers.entrySet()) {
+        	request.addHeader(e.getKey(), e.getValue());
+        }
+        
+        return httpClient.execute(request);
+    }
+	
+	/**
+	 * post form
+	 * 
+	 * @param host
+	 * @param path
+	 * @param method
+	 * @param headers
+	 * @param querys
+	 * @param bodys
+	 * @return
+	 * @throws Exception
+	 */
+	public static HttpResponse doPost(String host, String path, String method, 
+			Map<String, String> headers, 
+			Map<String, String> querys, 
+			Map<String, String> bodys)
+            throws Exception {    	
+    	HttpClient httpClient = wrapClient(host);
+
+    	HttpPost request = new HttpPost(buildUrl(host, path, querys));
+        for (Map.Entry<String, String> e : headers.entrySet()) {
+        	request.addHeader(e.getKey(), e.getValue());
+        }
+
+        if (bodys != null) {
+            List<NameValuePair> nameValuePairList = new ArrayList<NameValuePair>();
+
+            for (String key : bodys.keySet()) {
+                nameValuePairList.add(new BasicNameValuePair(key, bodys.get(key)));
+            }
+            UrlEncodedFormEntity formEntity = new UrlEncodedFormEntity(nameValuePairList, "utf-8");
+            formEntity.setContentType("application/x-www-form-urlencoded; charset=UTF-8");
+            request.setEntity(formEntity);
+        }
+
+        return httpClient.execute(request);
+    }	
+	
+	/**
+	 * Post String
+	 * 
+	 * @param host
+	 * @param path
+	 * @param method
+	 * @param headers
+	 * @param querys
+	 * @param body
+	 * @return
+	 * @throws Exception
+	 */
+	public static HttpResponse doPost(String host, String path, String method, 
+			Map<String, String> headers, 
+			Map<String, String> querys, 
+			String body)
+            throws Exception {    	
+    	HttpClient httpClient = wrapClient(host);
+
+    	HttpPost request = new HttpPost(buildUrl(host, path, querys));
+        for (Map.Entry<String, String> e : headers.entrySet()) {
+        	request.addHeader(e.getKey(), e.getValue());
+        }
+
+        if (StringUtils.isNotBlank(body)) {
+        	request.setEntity(new StringEntity(body, "utf-8"));
+        }
+
+        return httpClient.execute(request);
+    }
+	
+	/**
+	 * Post stream
+	 * 
+	 * @param host
+	 * @param path
+	 * @param method
+	 * @param headers
+	 * @param querys
+	 * @param body
+	 * @return
+	 * @throws Exception
+	 */
+	public static HttpResponse doPost(String host, String path, String method, 
+			Map<String, String> headers, 
+			Map<String, String> querys, 
+			byte[] body)
+            throws Exception {    	
+    	HttpClient httpClient = wrapClient(host);
+
+    	HttpPost request = new HttpPost(buildUrl(host, path, querys));
+        for (Map.Entry<String, String> e : headers.entrySet()) {
+        	request.addHeader(e.getKey(), e.getValue());
+        }
+
+        if (body != null) {
+        	request.setEntity(new ByteArrayEntity(body));
+        }
+
+        return httpClient.execute(request);
+    }
+	
+	/**
+	 * Put String
+	 * @param host
+	 * @param path
+	 * @param method
+	 * @param headers
+	 * @param querys
+	 * @param body
+	 * @return
+	 * @throws Exception
+	 */
+	public static HttpResponse doPut(String host, String path, String method, 
+			Map<String, String> headers, 
+			Map<String, String> querys, 
+			String body)
+            throws Exception {    	
+    	HttpClient httpClient = wrapClient(host);
+
+    	HttpPut request = new HttpPut(buildUrl(host, path, querys));
+        for (Map.Entry<String, String> e : headers.entrySet()) {
+        	request.addHeader(e.getKey(), e.getValue());
+        }
+
+        if (StringUtils.isNotBlank(body)) {
+        	request.setEntity(new StringEntity(body, "utf-8"));
+        }
+
+        return httpClient.execute(request);
+    }
+	
+	/**
+	 * Put stream
+	 * @param host
+	 * @param path
+	 * @param method
+	 * @param headers
+	 * @param querys
+	 * @param body
+	 * @return
+	 * @throws Exception
+	 */
+	public static HttpResponse doPut(String host, String path, String method, 
+			Map<String, String> headers, 
+			Map<String, String> querys, 
+			byte[] body)
+            throws Exception {    	
+    	HttpClient httpClient = wrapClient(host);
+
+    	HttpPut request = new HttpPut(buildUrl(host, path, querys));
+        for (Map.Entry<String, String> e : headers.entrySet()) {
+        	request.addHeader(e.getKey(), e.getValue());
+        }
+
+        if (body != null) {
+        	request.setEntity(new ByteArrayEntity(body));
+        }
+
+        return httpClient.execute(request);
+    }
+	
+	/**
+	 * Delete
+	 *  
+	 * @param host
+	 * @param path
+	 * @param method
+	 * @param headers
+	 * @param querys
+	 * @return
+	 * @throws Exception
+	 */
+	public static HttpResponse doDelete(String host, String path, String method, 
+			Map<String, String> headers, 
+			Map<String, String> querys)
+            throws Exception {    	
+    	HttpClient httpClient = wrapClient(host);
+
+    	HttpDelete request = new HttpDelete(buildUrl(host, path, querys));
+        for (Map.Entry<String, String> e : headers.entrySet()) {
+        	request.addHeader(e.getKey(), e.getValue());
+        }
+        
+        return httpClient.execute(request);
+    }
+	
+	private static String buildUrl(String host, String path, Map<String, String> querys) throws UnsupportedEncodingException {
+    	StringBuilder sbUrl = new StringBuilder();
+    	sbUrl.append(host);
+    	if (!StringUtils.isBlank(path)) {
+    		sbUrl.append(path);
+        }
+    	if (null != querys) {
+    		StringBuilder sbQuery = new StringBuilder();
+        	for (Map.Entry<String, String> query : querys.entrySet()) {
+        		if (0 < sbQuery.length()) {
+        			sbQuery.append("&");
+        		}
+        		if (StringUtils.isBlank(query.getKey()) && !StringUtils.isBlank(query.getValue())) {
+        			sbQuery.append(query.getValue());
+                }
+        		if (!StringUtils.isBlank(query.getKey())) {
+        			sbQuery.append(query.getKey());
+        			if (!StringUtils.isBlank(query.getValue())) {
+        				sbQuery.append("=");
+        				sbQuery.append(URLEncoder.encode(query.getValue(), "utf-8"));
+        			}        			
+                }
+        	}
+        	if (0 < sbQuery.length()) {
+        		sbUrl.append("?").append(sbQuery);
+        	}
+        }
+    	
+    	return sbUrl.toString();
+    }
+	
+	private static HttpClient wrapClient(String host) {
+		HttpClient httpClient = new DefaultHttpClient();
+		if (host.startsWith("https://")) {
+			sslClient(httpClient);
+		}
+		
+		return httpClient;
+	}
+	
+	private static void sslClient(HttpClient httpClient) {
+        try {
+            SSLContext ctx = SSLContext.getInstance("TLS");
+            X509TrustManager tm = new X509TrustManager() {
+                public X509Certificate[] getAcceptedIssuers() {
+                    return null;
+                }
+                public void checkClientTrusted(X509Certificate[] xcs, String str) {
+                	
+                }
+                public void checkServerTrusted(X509Certificate[] xcs, String str) {
+                	
+                }
+            };
+            ctx.init(null, new TrustManager[] { tm }, null);
+            SSLSocketFactory ssf = new SSLSocketFactory(ctx);
+            ssf.setHostnameVerifier(SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
+            ClientConnectionManager ccm = httpClient.getConnectionManager();
+            SchemeRegistry registry = ccm.getSchemeRegistry();
+            registry.register(new Scheme("https", 443, ssf));
+        } catch (KeyManagementException ex) {
+            throw new RuntimeException(ex);
+        } catch (NoSuchAlgorithmException ex) {
+        	throw new RuntimeException(ex);
+        }
+    }
+}
\ No newline at end of file

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

@@ -302,7 +302,23 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
                 "utf-8", SystemConfig.ALIPAY_PUBLIC_KEY, AlipayConstants.SIGN_TYPE_RSA2);
         return alipayClient;
     }
-
+    //balance	余额
+    //moneyFund	余额宝
+    //coupon	红包
+    //pcredit	花呗
+    //pcreditpayInstallment	花呗分期
+    //creditCard	信用卡
+    //creditCardExpress	信用卡快捷
+    //creditCardCartoon	信用卡卡通
+    //credit_group	信用支付类型（包含信用卡卡通、信用卡快捷、花呗、花呗分期）
+    //debitCardExpress	借记卡快捷
+    //mcard	商户预存卡
+    //pcard	个人预存卡
+    //promotion	优惠（包含实时优惠+商户优惠）
+    //voucher	营销券
+    //point	积分
+    //mdiscount	商户优惠
+    //bankPay
     //支付宝APP支付方法
     private String appOrderPay(AlipayClient alipayClient, OrderPayVo orderPayVo, String notifyUrl) {
         BigDecimal realAmount = new BigDecimal(orderPayVo.getAmount().toString()).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_UP);
@@ -311,6 +327,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
         request.setBizContent("{" +
                 "\"total_amount\":\"" + realAmount + "\"," +
                 "\"subject\":\"" + orderPayVo.getSubject() + "\"," +
+                "\"enable_pay_channels\":\"balance,coupon,creditCard,creditCardExpress,creditCardCartoon,pcredit,credit_group,moneyFund,debitCardExpress\"," +
                 "\"out_trade_no\":\"" + orderPayVo.getTradeNo() + "\"" +
                 "  }");
         request.setNotifyUrl(notifyUrl);

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

+package com.xxfc.platform.universal.biz;
+
+import lombok.Data;
+
+/**
+ * 用户信息类
+ * @author Administrator
+ */
+@Data
+public class UserMessage {
+    private String name;
+    private String idNumber;
+}

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/CertificationService.java

@@ -7,8 +7,10 @@ import com.github.wxiaoqi.security.admin.feign.UserFeign;
 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 com.xxfc.platform.universal.biz.UserMessage;
 import com.xxfc.platform.universal.entity.IdInformation;
 import com.xxfc.platform.universal.mapper.IdInformationMapper;
+import com.xxfc.platform.universal.service.authenticationInterface.UserAuthentication;
 import com.xxfc.platform.universal.utils.CertifHttpUtils;
 import com.xxfc.platform.universal.utils.Validation;
 import lombok.extern.slf4j.Slf4j;
@@ -21,6 +23,7 @@ import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -31,9 +34,16 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 
+/**
+ * 认证业务
+ * @author Administrator
+ */
 @Service
 @Slf4j
 public class CertificationService {
+    @Autowired
+   private UserAuthentication authentication;
+
     /**
      * 认证相关的数据
      */
@@ -209,17 +219,20 @@ public class CertificationService {
         }
 
         //map携带身份证和姓名进行认证
-        Map<String, String> authMap = new HashMap<>();
-        authMap.put(idCardName, (String) frontData.get(numberName));
-        authMap.put(cName, (String) frontData.get(cName));
-        //3.调用接口进行认证
-        String result = certificate(authMap);
+//        Map<String, String> authMap = new HashMap<>();
+//        authMap.put(idCardName, (String) frontData.get(numberName));
+//        authMap.put(cName, (String) frontData.get(cName));
+//        //3.调用接口进行认证
+//
+//        boolean result = certificate(authMap);
+        boolean result = authentication.certificate(new UserMessage(){{
+            setIdNumber(number);
+            setName(name);
+        }} );
         log.info("----认证结果result=========" + result);
         //认证返回的参数是否为空
-        if (!StringUtils.isBlank(result)) {
-            Map<String, Object> map = (Map<String, Object>) JSONObject.parse(result);
-            log.info("----certifRet=========" + certifRet);
-            if (MapUtil.isNotEmpty(map) || certifResultCode.equals(map.get(certifRet))) {
+
+            if (result) {
                 //认证成功后存入保存到数据库
                 //获得身份证正面记录的身份证号和真实姓名
                 //设置姓名
@@ -257,9 +270,6 @@ public class CertificationService {
 //                    return ObjectRestResponse.succ(objRR.getData());
 //                }
             }
-        }
-
-
         return ObjectRestResponse.createFailedResult(ResultCode.INCOMPLETE_DATA,"网络异常,请稍后再试");
 
 
@@ -267,7 +277,8 @@ public class CertificationService {
 
 
     //认证
-    public String certificate(Map<String, String> querys) {
+    //认证
+    public boolean certificate(Map<String, String> querys) {
         Map<String, String> headers = new HashMap<String, String>();
         headers.put("Authorization", "APPCODE " + cAppcode);
         try {
@@ -280,15 +291,27 @@ public class CertificationService {
              */
             //获取response的body
             if (statusCode == 200) {
-                return EntityUtils.toString(response.getEntity());
+                String result = EntityUtils.toString(response.getEntity());
+                log.info("----认证结果result=========" + result);
+                //认证返回的参数是否为空
+                if (!StringUtils.isBlank(result)) {
+                    Map<String, Object> map = (Map<String, Object>) JSONObject.parse(result);
+                    log.info("----certifRet=========" + certifRet);
+                    if (MapUtil.isNotEmpty(map) || certifResultCode.equals(map.get(certifRet))) {
+                        return true;
+                    }
+                }
             }
+            return false;
         } catch (Exception e) {
             e.printStackTrace();
+            return false;
         }
-        return null;
+
     }
 
 
+
     //身份证照片解析
     public String imageParse(String imageUrl, String type) {
         Map<String, String> headers = new HashMap<String, String>();
@@ -317,10 +340,7 @@ public class CertificationService {
         } catch (Exception e) {
             e.printStackTrace();
         }
-
         return null;
-
-
     }
 
 

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/authenticationInterface/UserAuthentication.java

+package com.xxfc.platform.universal.service.authenticationInterface;
+
+import com.xxfc.platform.universal.biz.UserMessage;
+
+import java.util.Map;
+
+/**
+ * 用户认证类
+ * @author Administrator
+ */
+public interface UserAuthentication {
+     /**
+      * 用户认证方法
+      * @param message
+      * @return
+      */
+     boolean certificate(UserMessage message) ;
+}

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/authenticationInterface/impl/BJCYAuthentication.java

+package com.xxfc.platform.universal.service.authenticationInterface.impl;
+
+import cn.hutool.core.map.MapUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.xxfc.platform.universal.biz.UserMessage;
+import com.xxfc.platform.universal.service.authenticationInterface.UserAuthentication;
+import com.xxfc.platform.universal.utils.CertifHttpUtils;
+import com.xxfc.platform.universal.utils.HttpUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.StatusLine;
+import org.apache.http.util.EntityUtils;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 调用北京畅游互联科技有限公司接口
+ *
+ * @author Administrator
+ */
+@Service
+@Slf4j
+@Primary
+public class BJCYAuthentication implements UserAuthentication {
+    private final String host = "http://aliyunverifyidcard.haoservice.com";
+    private final String path = "/idcard/VerifyIdcardv2";
+    private final String method = "GET";
+    private final String appcode = "ee7710ce92054cae9f6c040f6864e6a7";
+    private final String tokenHead = "Authorization";
+    private final String token="APPCODE " + appcode;
+    private final String cardNo ="cardNo";
+    private final String realName ="realName";
+    private final Integer  resultCode=0;
+    private final String ret="error_code";
+    @Override
+    public boolean certificate(UserMessage message) {
+        Map<String, String> headers = new HashMap<String, String>();
+        headers.put(tokenHead, token);
+        Map<String, String> querys = new HashMap<String, String>();
+        querys.put(cardNo, message.getIdNumber());
+        querys.put(realName, message.getName());
+        try {
+            HttpResponse response = HttpUtils.doGet(host, path, method, headers, querys);
+            StatusLine statusLine = response.getStatusLine();
+            log.error(response.toString());
+            int statusCode = statusLine.getStatusCode();
+            log.error(statusCode+"");
+            //获取response的body
+            if (statusCode == 200) {
+                String result = EntityUtils.toString(response.getEntity());
+                log.info("----认证结果result=========" + result);
+                //认证返回的参数是否为空
+                if (!StringUtils.isBlank(result)) {
+                    Map<String, Object> map = (Map<String, Object>) JSONObject.parse(result);
+                    log.info("----certifRet=========" + map);
+                    if (MapUtil.isNotEmpty(map) || resultCode.equals(map.get(ret))) {
+                        return true;
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+}
+

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/authenticationInterface/impl/XCFQAuthentication.java

+package com.xxfc.platform.universal.service.authenticationInterface.impl;
+
+
+import cn.hutool.core.map.MapUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.xxfc.platform.universal.biz.UserMessage;
+import com.xxfc.platform.universal.service.authenticationInterface.UserAuthentication;
+import com.xxfc.platform.universal.utils.CertifHttpUtils;
+import com.xxfc.platform.universal.utils.HttpUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.StatusLine;
+import org.apache.http.util.EntityUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 调用四川涪擎认证接口
+ *
+ * @author Administrator
+ */
+@Service
+@Slf4j
+public class XCFQAuthentication implements UserAuthentication {
+
+    private String cAppcode="acea1c8811f748b3a65815f11db357c4";
+
+    /**
+     * 认证相关的数据
+     */
+    private String cHost = "https://idcert.market.alicloudapi.com";
+
+
+    private String cPath = "/idcard";
+
+
+    private String cMethod = "GET";
+
+    //响应:认证错误码字段名
+    private String certifRet = "status";
+
+    //响应:认证通过码
+    private String certifResultCode = "01";
+
+
+    //请求:身份证号字段名
+    private String idCardName = "idCard";
+
+    //请求:用户姓名字段名
+    private String cName = "name";
+
+    @Override
+    public boolean certificate(UserMessage message) {
+        //map携带身份证和姓名进行认证
+
+        Map<String, String> querys = new HashMap<>();
+        querys.put(idCardName, message.getIdNumber());
+        querys.put(cName, message.getName());
+
+        Map<String, String> headers = new HashMap<String, String>();
+        headers.put("Authorization", "APPCODE " + cAppcode);
+        try {
+            log.info("----querys=========" + querys);
+            HttpResponse response = HttpUtils.doGet(cHost, cPath, cMethod, headers, querys);
+            StatusLine statusLine = response.getStatusLine();
+            int statusCode = statusLine.getStatusCode();
+            /**
+             * 状态码: 200 正常；400 URL无效；401 appCode错误； 403 次数用完； 500 API网管错误
+             */
+            //获取response的body
+            if (statusCode == 200) {
+                String result = EntityUtils.toString(response.getEntity());
+                log.info("----认证结果result=========" + result);
+                //认证返回的参数是否为空
+                if (!StringUtils.isBlank(result)) {
+                    Map<String, Object> map = (Map<String, Object>) JSONObject.parse(result);
+                    log.info("----certifRet=========" + certifRet);
+                    if (MapUtil.isNotEmpty(map) || certifResultCode.equals(map.get(certifRet))) {
+                        return true;
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+}