Merge branch 'feature_chw_zjw' into dev-chw

ace-common/src/main/java/com/github/wxiaoqi/security/common/rest/CommonBaseController.java

 package com.github.wxiaoqi.security.common.rest;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
+import cn.hutool.poi.excel.ExcelUtil;
+import cn.hutool.poi.excel.ExcelWriter;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.context.BaseContextHandler;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.msg.TableResultResponse;
 import com.github.wxiaoqi.security.common.util.Query;
 import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.net.URLEncoder;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Supplier;
 
 /**
  * ${DESCRIPTION}
@@ -28,6 +38,13 @@ public class CommonBaseController {
         return request;
     }
 
+    @Autowired
+    public HttpServletResponse response;
+
+    public HttpServletResponse getResponse() {
+        return response;
+    }
+
     public String getCurrentUserName(){
         return BaseContextHandler.getUsername();
     }
@@ -44,4 +61,48 @@ public class CommonBaseController {
         }
     }
 
+    public void export(Logger log, Map<String, Object> headerAlias, Supplier<List<Map>> function, String fileName) throws  Exception {
+        HttpServletResponse httpServletResponse = getResponse();
+        ExcelWriter writer = ExcelUtil.getWriter(true);
+        if(StrUtil.isBlank(fileName)) {
+            fileName = System.currentTimeMillis()+ "";
+        }
+
+        try {
+
+            //封装表头
+            headerAlias.keySet().forEach(key -> {
+                writer.addHeaderAlias(key, headerAlias.get(key).toString());
+            });
+
+            log.info("======export==== ");
+
+            //处理数据
+            List<Map> list = function.get();
+            if (list.size() == 0) {
+                Map<String, Object> map = CollUtil.newHashMap();
+                headerAlias.keySet().forEach(key -> {
+                    writer.addHeaderAlias(key, "");
+                });
+                list.add(map);
+            }
+            log.info("list: {} ", JSONUtil.toJsonStr(list));
+            writer.write(list);
+            httpServletResponse.setContentType("application/octet-stream;charset=utf-8");
+            httpServletResponse.setHeader("Content-Disposition","attachment;filename="+ URLEncoder.encode(fileName+ ".xlsx","utf-8"));
+            writer.flush(httpServletResponse.getOutputStream());
+        }catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
+            throw ex;
+        }finally {
+            writer.close();
+        }
+    }
+
+    public <T>void exportBean(Logger log, T headerAlias, Supplier<List<Map>> function, String fileName) throws  Exception {
+        export(log, BeanUtil.beanToMap(headerAlias), ()->
+                        function.get()
+                , fileName);
+    }
+
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/rest/UserRestInterface.java

 package com.github.wxiaoqi.security.admin.feign.rest;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
+import cn.hutool.poi.excel.ExcelUtil;
+import cn.hutool.poi.excel.ExcelWriter;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
@@ -10,12 +15,17 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.DataInter;
 import com.github.wxiaoqi.security.common.vo.DataInterBean;
+import org.slf4j.Logger;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
 
 public interface UserRestInterface  {
     public UserFeign getUserFeign();

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

@@ -10,6 +10,7 @@ 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.order.entity.OrderRentVehicleDetail;
+import com.xxfc.platform.order.entity.inter.OrderDetail;
 import com.xxfc.platform.order.feign.OrderFeign;
 import com.xxfc.platform.order.pojo.dto.OrderDetailDTO;
 import lombok.extern.slf4j.Slf4j;
@@ -210,7 +211,28 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
         acceptDetailed.setStatus(0);
         insertSelective(acceptDetailed);
 
+        //添加保险
+        addInsure(orderDetailDTO,0);
 
+
+    }
+
+
+    public  void  addInsure(OrderDetailDTO orderDetailDTO,Integer status){
+        BigDecimal insureAmount = orderDetailDTO.getInsureAmount() == null ? BigDecimal.ZERO : orderDetailDTO.getInsureAmount();
+        if (insureAmount.compareTo(BigDecimal.ZERO) > 0){
+            Integer type = status == 1 ? 2 : 1;
+            BaseOrderAcceptDetailed acceptDetailed=new BaseOrderAcceptDetailed();
+            acceptDetailed.setOrderNo(orderDetailDTO.getOrderNo());
+            acceptDetailed.setOrderId(orderDetailDTO.getOrderId());
+            acceptDetailed.setOrderAmount(orderDetailDTO.getOrderAmount());
+            acceptDetailed.setDivisionAmount(insureAmount);
+            acceptDetailed.setDivisionType(9);
+            acceptDetailed.setAddTime(System.currentTimeMillis());
+            acceptDetailed.setStatus(status);
+            acceptDetailed.setType(type);
+            insertSelective(acceptDetailed);
+        }
     }
 
     public void payOrderFAccept(OrderWaterDTO orderWaterDTO,OrderDetailDTO orderDetailDTO) {
@@ -296,6 +318,8 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
                 payOrderFAccept(orderWaterDTO,orderDetailDTO);
             }
             othderAccept(orderDetailDTO);
+            //保险
+            addInsure(orderDetailDTO,1);
             log.info("订单完成分账----finishOrderWater--------orderId===" + orderId + "----amount====" + amount + "--orderType===" + orderType);
         }
 

xx-activity/xx-activity-server/pom.xml

@@ -23,6 +23,11 @@
             <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.redisson</groupId>
+            <artifactId>redisson-spring-boot-starter</artifactId>
+            <version>3.11.0</version>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -366,4 +366,10 @@ public class BaseOrder implements Serializable {
 
 	@Column(name = "is_appraise")
 	private Integer isAppraise;
+
+	@Column(name = "insure_pic")
+	private String insurePic;
+
+	@Column(name = "insure_status")
+	private Integer insureStatus;
 }

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

@@ -47,8 +47,13 @@ public class InsureUser implements Serializable {
     @Column(name = "id_card")
 	@ApiModelProperty(value = "身份证")
     private String idCard;
-	
-	    /**
+
+	//手机号
+	@Column(name = "phone")
+	@ApiModelProperty(value = "手机号")
+	private String phone;
+
+	/**
      *  创建时间
      */
     @Column(name = "crt_time")

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

@@ -38,7 +38,18 @@ public class OrderPersonInsurance implements Serializable {
     @Column(name = "order_id")
 	@ApiModelProperty(value = "基础订单id")
     private Integer orderId;
-	
+
+	public void setOrderId(Integer orderId) {
+		this.orderId = orderId;
+	}
+
+	/**
+	 *  基础订单编号
+	 */
+	@Column(name = "order_no")
+	@ApiModelProperty(value = "基础订单编号")
+	private String orderNo;
+
 	    /**
      *  姓名
      */
@@ -87,6 +98,20 @@ public class OrderPersonInsurance implements Serializable {
 	@Column(name = "end_time")
 	@ApiModelProperty(value = "结束时间")
 	private Long endTime;
+
+	/**
+	 *  支付时间
+	 */
+	@Column(name = "pay_time")
+	@ApiModelProperty(value = "支付时间")
+	private Long paytime;
+
+	/**
+	 *  退款时间
+	 */
+	@Column(name = "refund_time")
+	@ApiModelProperty(value = "退款时间")
+	private Long refundTime;
 	
 	    /**
      *  订单的天数

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

@@ -99,6 +99,10 @@ public class OrderDetailDTO {
     private BigDecimal chageAmount =BigDecimal.ZERO;
 
 
+    @ApiModelProperty("保险金额")
+    private BigDecimal insureAmount =BigDecimal.ZERO;
+
+
     @ApiModelProperty("分账金额")
     private BigDecimal acceptAmount;
 

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

@@ -115,7 +115,7 @@ public class RentVehicleBO extends OrderRentVehicleDetail implements OrderDetail
     private String endDateTimeStr;
 
     private Integer needPersonInsurance;
-    private List<OrderPersonInsurance> insurances;
+    private List<OrderPersonInsurance> insurances = CollUtil.newArrayList();
     private List<OrderPersonInsurance> confirmInsurances = CollUtil.newArrayList();
 
     public void initDate() {

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

 package com.xxfc.platform.order.pojo.order.add;
 
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.xxfc.platform.order.entity.OrderPersonInsurance;
 import com.xxfc.platform.order.pojo.OrderAccompanyDTO;
 import io.swagger.annotations.ApiModelProperty;
@@ -138,8 +139,8 @@ public class AddRentVehicleDTO extends AddOrderCommonDTO{
     public static final int GOODS_DEPOSIT_TYPE_DOWN = 2;
 
     private Integer needPersonInsurance = SYS_FALSE;
-    private String insureusersStr;
-    private List<OrderPersonInsurance> insurances;
+    private String insureUserIds;
+    private AppUserDTO appUserDTO;
 
     public void setStartTime(Long startTime) {
         this.startTime = startTime;

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

+package com.xxfc.platform.order.pojo.personinsurance;
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import com.xxfc.platform.order.entity.OrderPersonInsurance;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class BgPageDTO extends PageParam {
+    private String no;
+    private String insurePic;
+    private List<OrderPersonInsurance> insuranceList;
+}

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

+package com.xxfc.platform.order.pojo.personinsurance;
+
+import com.xxfc.platform.order.entity.OrderPersonInsurance;
+import lombok.Data;
+
+import javax.persistence.Column;
+import java.util.List;
+
+@Data
+public class BgPageVO {
+    private String no;
+    private String insurePic;
+    private List<OrderPersonInsurance> insuranceList;
+}

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

@@ -2,6 +2,9 @@ package com.xxfc.platform.order.biz;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
@@ -32,6 +35,7 @@ import com.xxfc.platform.order.pojo.price.CostDetailExtend;
 import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.feign.ThirdFeign;
+//import com.xxfc.platform.universal.utils.DateUtil;
 import com.xxfc.platform.universal.vo.OrderRefundVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -344,12 +348,21 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
         return deductGoodsAmount;
     }
 
-    public void calculatePersonInsurance(Long timeLag, OrderPersonInsurance opi) {
+    public void calculatePersonInsurance(Long startLong, Long endLong, OrderPersonInsurance opi) {
+        DateTime startDateBegin = DateUtil.beginOfDay(DateUtil.date(startLong));
+        DateTime endDateEnd = DateUtil.endOfDay(DateUtil.date(endLong));
+
         opi.setAmount(BigDecimal.ZERO);
         opi.setStatus(-1);
         //获取天
-        Integer remainder = Long.valueOf(timeLag%(1000L * 60L * 60L * 24L)).intValue();
-        Integer dayLag = Long.valueOf(timeLag/(1000L * 60L * 60L * 24L)).intValue() + remainder > 0? 1: 0;
+//        Integer remainder = Long.valueOf(timeLag%(1000L * 60L * 60L * 24L)).intValue();
+//        Integer dayLag = Long.valueOf(timeLag/(1000L * 60L * 60L * 24L)).intValue() + remainder > 0? 1: 0;
+        Long dayLag = DateUtil.between(startDateBegin, endDateEnd, DateUnit.DAY);
+        if(!DateUtil.beginOfDay(DateUtil.date()).equals(startDateBegin)) {
+            dayLag += 1L;
+        }else {
+            startDateBegin = DateUtil.offsetDay(startDateBegin, 1);
+        }
 
         Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
         Set<Dictionary> personInsurances = dictionaryMap.get(DictionaryKey.APP_ORDER+ "_"+ RENT_PERSON_INSURANCE).getChildrens();
@@ -369,6 +382,8 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
                 opi.setAmount(new BigDecimal(dic.getDetail()));
                 opi.setStatus(STATUS_TOPAY);
                 opi.setInsuranceDay(Integer.valueOf(names[1]));
+                opi.setStartTime(startDateBegin.getTime());
+                opi.setEndTime(endDateEnd.getTime());
                 break;
             }
         }
@@ -894,7 +909,16 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
 
 
     public static void main(String[] args) {
-        IntervalUtil.staticIsInTheInterval("1", "[1,2]");
-        System.out.println("123");
+//        IntervalUtil.staticIsInTheInterval("1", "[1,2]");
+//        System.out.println("123");
+        String dateStr1 = "2017-03-01 22:33:23";
+        Date date1 = DateUtil.beginOfDay(DateUtil.parse(dateStr1));
+
+        String dateStr2 = "2017-04-01 23:33:23";
+        Date date2 = DateUtil.endOfDay(DateUtil.parse(dateStr2));
+
+//相差一个月，31天
+        long betweenDay = DateUtil.between(date1, date2, DateUnit.DAY);
+        System.out.println(betweenDay);
     }
 }
\ No newline at end of file

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

@@ -89,6 +89,13 @@ public class OrderDetailBiz{
         List<OrderItem> orderItems = orderItemBiz.selectList(orderItem);
         //不计免赔
         BigDecimal damageSafeAmount = orderItems.stream().filter(x->x.getType()==102).map(OrderItem::getRealAmount).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
+
+        Integer insureStatus = baseOrder.getInsureStatus() == null ? 0 : baseOrder.getInsureStatus();
+
+        BigDecimal insureAmount = BigDecimal.ZERO;
+        if ((insureStatus == 1 && baseOrder.getStatus() .equals(OrderStatusEnum.ORDER_TOSTART.getCode())) ||insureStatus == 2 )
+            insureAmount = orderItems.stream().filter(x->x.getType()==104).map(OrderItem::getRealAmount).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
+
         OrderRentVehicleDetail vehicleDetail=orderRentVehicleDetails.get(0);
         //获取营收明细dto
         OrderDetailDTO orderDetailDTO = new OrderDetailDTO();
@@ -99,6 +106,7 @@ public class OrderDetailBiz{
         orderDetailDTO.setOrderId(baseOrder.getId());
         orderDetailDTO.setUserId(baseOrder.getUserId());
         orderDetailDTO.setOrderNo(baseOrder.getNo());
+        orderDetailDTO.setInsureAmount(insureAmount);
         orderDetailDTO.setGoodsDepositType(vehicleDetail.getGoodsDepositType());
         if (accountDetail !=  null){
             List<OrderAccountDeduction> deductions = accountDetail.getDeductions();

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

 package com.xxfc.platform.order.biz;
 
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.order.pojo.personinsurance.BgPageDTO;
+import com.xxfc.platform.order.pojo.personinsurance.BgPageVO;
 import org.springframework.stereotype.Service;
 
 import com.xxfc.platform.order.entity.OrderPersonInsurance;
 import com.xxfc.platform.order.mapper.OrderPersonInsuranceMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 
+import java.util.List;
+
 /**
  * 订单人身保险
  *
@@ -15,4 +20,20 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
  */
 @Service
 public class OrderPersonInsuranceBiz extends BaseBiz<OrderPersonInsuranceMapper, OrderPersonInsurance> {
+
+    public PageDataVO<BgPageVO> selectOrderInfo(BgPageDTO dto) {
+        PageDataVO<BgPageVO> pageList = PageDataVO.pageInfo(dto.initQuery(), ()-> mapper.selectOrderInfo(dto));
+
+        pageList.getData().forEach(vo -> {
+            vo.setInsuranceList(selectList(new OrderPersonInsurance(){{
+                setOrderNo(vo.getNo());
+            }}));
+        });
+
+        return pageList;
+    }
+
+    public List<OrderPersonInsurance> selectInsuranceInfo(BgPageDTO dto) {
+        return mapper.selectInsuranceInfo(dto);
+    }
 }
\ No newline at end of file

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

 package com.xxfc.platform.order.biz;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
@@ -8,12 +9,16 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.util.result.JsonResultUtil;
 import com.xxfc.platform.order.biz.inner.OrderCalculateBiz;
+import com.xxfc.platform.order.entity.InsureUser;
+import com.xxfc.platform.order.entity.OrderPersonInsurance;
 import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
 import com.xxfc.platform.order.mapper.OrderRentVehicleDetailMapper;
 import com.xxfc.platform.order.pojo.order.OrderFullDTO;
 import com.xxfc.platform.order.pojo.order.OrderFullVO;
 import com.xxfc.platform.order.pojo.order.RentVehicleBO;
 import com.xxfc.platform.order.pojo.order.add.AddRentVehicleDTO;
+import com.xxfc.platform.universal.entity.IdInformation;
+import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import com.xxfc.platform.vehicle.pojo.BookVehicleVO;
@@ -22,12 +27,14 @@ import lombok.extern.slf4j.Slf4j;
 import org.mockito.internal.util.collections.Sets;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestBody;
 import tk.mybatis.mapper.entity.Example;
 
 import java.util.List;
 import java.util.Map;
 
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
+
 /**
  * 租车订单详情
  *
@@ -43,10 +50,15 @@ public class OrderRentVehicleBiz extends BaseBiz<OrderRentVehicleDetailMapper, O
     BaseOrderBiz baseOrderBiz;
     @Autowired
     VehicleFeign vehicleFeign;
+    @Autowired
+    ThirdFeign thirdFeign;
 
     @Autowired
     OrderCalculateBiz orderCalculateBiz;
 
+    @Autowired
+    InsureUserBiz insureUserBiz;
+
 
     public List<OrderRentVehicleDetail> listByOrderId(Integer orderId) {
         return mapper.listByOrderId(orderId);
@@ -145,6 +157,46 @@ public class OrderRentVehicleBiz extends BaseBiz<OrderRentVehicleDetailMapper, O
         bo.setTickerNo(StrUtil.isNotBlank(vo.getTickerNos())?
                 StrUtil.splitTrim(vo.getTickerNos(), ","):null);
         bo.setAccompanyItems(vo.getAccompanyItems());
+
+        if(SYS_TRUE == vo.getNeedPersonInsurance() && StrUtil.isNotBlank(vo.getInsureUserIds())){
+            String buyInsureIdCard = "";
+            String buyInsureName = "";
+            IdInformation idInformation = thirdFeign.getOneByUserId(vo.getAppUserDTO().getUserid());
+            if(null == idInformation) {
+                List<InsureUser> insureUsers = insureUserBiz.selectList(new InsureUser(){{
+                    setUserid(vo.getAppUserDTO().getUserid());
+                    setPhone(vo.getAppUserDTO().getUsername());
+                    setIsdel(SYS_FALSE);
+                }});
+                if(CollUtil.isEmpty(insureUsers)) {
+                    throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, Sets.newSet("无法获取投保人信息"));
+                }else{
+                    buyInsureIdCard = insureUsers.get(0).getIdCard();
+                    buyInsureName = insureUsers.get(0).getName();
+                }
+
+            }else {
+                buyInsureIdCard = idInformation.getIdNumber();
+                buyInsureName = idInformation.getName();
+            }
+
+            for(String insureUserId: vo.getInsureUserIds().split(",")) {
+                InsureUser insureUser = insureUserBiz.selectById(Integer.valueOf(insureUserId));
+                if(null == insureUser) {
+                    throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, Sets.newSet("保险人不存在"));
+                }else {
+                    String finalBuyInsureIdCard = buyInsureIdCard;
+                    String finalBuyInsureName = buyInsureName;
+                    bo.getInsurances().add(new OrderPersonInsurance(){{
+                        setBuyInsureIdCard(finalBuyInsureIdCard);
+                        setBuyInsureName(finalBuyInsureName);
+                        setBuyInsurePhone(vo.getAppUserDTO().getUsername());
+                        setIdCard(insureUser.getIdCard());
+                        setName(insureUser.getName());
+                    }});
+                }
+            }
+        }
         return bo;
     }
 

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

 package com.xxfc.platform.order.mapper;
 
 import com.xxfc.platform.order.entity.OrderPersonInsurance;
+import com.xxfc.platform.order.pojo.personinsurance.BgPageDTO;
+import com.xxfc.platform.order.pojo.personinsurance.BgPageVO;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.util.List;
+
 /**
  * 订单人身保险
  * 
@@ -11,5 +15,7 @@ import tk.mybatis.mapper.common.Mapper;
  * @date 2020-11-26 18:56:21
  */
 public interface OrderPersonInsuranceMapper extends Mapper<OrderPersonInsurance> {
-	
+
+    public List<BgPageVO> selectOrderInfo(BgPageDTO dto);
+    public List<OrderPersonInsurance> selectInsuranceInfo(BgPageDTO dto);
 }

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

@@ -56,7 +56,7 @@ public class InsureUserController extends BaseController<InsureUserBiz, InsureUs
                 insureUser1.setIsdel(0);
                 insureUser1=baseBiz.selectOne(insureUser1);
                 if(insureUser1!=null){
-                    return  ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"保险人证件号一样");
+                    return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"保险人证件号一样");
                 }
                 insureUser.setUserid(userid);
                 insureUser.setCrtTime(System.currentTimeMillis());

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

@@ -70,9 +70,9 @@ public class OrderRentVehicleController extends CommonBaseController {
         @ResponseBody
         @ApiOperation(value = "确认租车订单")
         public ObjectRestResponse<BaseOrder> add(@RequestBody AddRentVehicleDTO vo){
+            vo.setAppUserDTO(userFeign.userDetailByToken(BaseContextHandler.getToken()).getData());
             RentVehicleBO bo = orderRentVehicleBiz.initRentVehicleBO(vo);
 //            vo.setDayNum(orderCalculateBiz.getIncludeDays(vo.getStartTime(), vo.getEndTime()));
-            bo.setAppUserDTO(userFeign.userDetailByToken(BaseContextHandler.getToken()).getData());
             orderRentVehicleService.createOrder(bo);
             return ObjectRestResponse.succ(bo.getOrder());
 //                return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "系统维护，请联系客服线下租车: 4000-369-369！");
@@ -82,9 +82,9 @@ public class OrderRentVehicleController extends CommonBaseController {
         @ResponseBody
         @ApiOperation(value = "后台人员为客户下租车订单")
         public ObjectRestResponse<BaseOrder> backStagedd(@RequestBody BgAddRentDTO dto){
+                dto.setAppUserDTO(userFeign.userDetailById(dto.getAppUserId()).getData());
                 RentVehicleBO bo = orderRentVehicleBiz.initRentVehicleBO(dto);
 //                bo.setDayNum(orderCalculateBiz.getIncludeDays(dto.getStartTime(), dto.getEndTime()));
-                bo.setAppUserDTO(userFeign.userDetailById(dto.getAppUserId()).getData());
                 bo.setCrtUser("-1"+ BaseContextHandler.getUserID());
                 //设置-1表示查询所有的车
                 //bo.setUseType(-1);

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

@@ -221,10 +221,10 @@ public class ShuntApplyController extends BaseController<ShuntApplyBiz, ShuntApp
         dto.setEndTime(shuntApply.getEndTime());
         dto.setStartCompanyId(shuntApply.getStartCompanyId());
         dto.setEndCompanyId(shuntApply.getEndCompanyId());
+        dto.setAppUserDTO(userFeign.userDetailByToken(BaseContextHandler.getToken()).getData());
         RentVehicleBO bo = orderRentVehicleBiz.initRentVehicleBO(dto);
         bo.setOrderSign(BaseOrder.ORDER_SIGN_APPLY);
         bo.setBookRecordId(shuntApply.getBookRecordId());
-        bo.setAppUserDTO(userFeign.userDetailByToken(BaseContextHandler.getToken()).getData());
         orderRentVehicleService.applyCreateOrder(bo, shuntApply.getOrderNo());
         baseBiz.updateSelectiveById(new ShuntApply(){{
             setId(shuntApply.getId());

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

@@ -198,9 +198,9 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
         dto.setVehicleId(specialRent.getVehicleId());
         dto.setStartCompanyId(specialRent.getStartCompanyId());
         dto.setEndCompanyId(specialRent.getEndCompanyId());
+        dto.setAppUserDTO(getAppUser());
         RentVehicleBO bo = orderRentVehicleBiz.initRentVehicleBO(dto);
         bo.setOrderSign(BaseOrder.ORDER_SIGN_SPECIAL);
-        bo.setAppUserDTO(getAppUser());
         bo.setSpecialUnitPrice(specialRent.getUnitPrice());
         bo.setBookRecordId(specialRent.getBookRecordId());
         orderRentVehicleService.specialCreateOrder(bo, specialRent.getOrderNo());

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

@@ -205,7 +205,7 @@
 //    @RequestMapping(value = "/steward/myApplyList", method = RequestMethod.GET)
 //    @ResponseBody
 //    @ApiOperation(value = "我的申请")
-//    public ObjectRestResponse myApplyList(PageDTO dto) {
+//    public ObjectRestResponse myApplyList(BgPageDTO dto) {
 //        UserDTO userDTO = getAdminUserInfo();
 //        PageDataVO<ShuntApplyController.ShuntApplyVO> pages = PageDataVO.pageInfo(dto.initQuery(), () -> baseBiz.selectByWeekend(w -> {
 //            w.andEqualTo(ShuntApply::getConfirmUserId, userDTO.getId());
@@ -244,7 +244,7 @@
 //    }
 //
 //    @Data
-//    public static class PageDTO extends PageParam {
+//    public static class BgPageDTO extends PageParam {
 //        String multiStatus;
 //    }
 //

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

+package com.xxfc.platform.order.rest.background;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.msg.TableResultResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.util.Query;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.order.biz.BaseOrderBiz;
+import com.xxfc.platform.order.biz.OrderPersonInsuranceBiz;
+import com.xxfc.platform.order.entity.BaseOrder;
+import com.xxfc.platform.order.entity.OrderPersonInsurance;
+import com.xxfc.platform.order.pojo.personinsurance.BgPageDTO;
+import com.xxfc.platform.order.pojo.personinsurance.BgPageVO;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import zipkin2.Call;
+
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/background/orderPersonInsurance")
+@Slf4j
+public class PgOrderPersonInsuranceController extends BaseController<OrderPersonInsuranceBiz, OrderPersonInsurance> {
+    @Autowired
+    BaseOrderBiz baseOrderBiz;
+
+    @ApiOperation("查询分页")
+    @RequestMapping(value = "/pageList",method = RequestMethod.GET)
+    @ResponseBody
+    public ObjectRestResponse<PageDataVO<BgPageVO>> pageList(BgPageDTO dto){
+        return ObjectRestResponse.succ(baseBiz.selectOrderInfo(dto));
+    }
+
+    @ApiOperation("修改图片")
+    @RequestMapping(value = "/editPic",method = RequestMethod.GET)
+    @ResponseBody
+    public ObjectRestResponse editPic(BgPageDTO dto){
+        baseOrderBiz.updateByWeekendSelective(new BaseOrder(){{
+            setInsurePic(dto.getInsurePic());
+        }}, w -> {
+            w.andEqualTo(BaseOrder::getNo, dto.getNo());
+            return w;
+        });
+        return ObjectRestResponse.succ();
+    }
+
+    @RequestMapping(value="/bg/pageExport", method = RequestMethod.GET)
+    public void bgPageExport(BgPageDTO dto) throws Exception{
+        PageExportDTO head = new PageExportDTO(){{
+            setOrderNo("订单编号");
+            setName("姓名");
+            setIdCard("身份证号");
+            setRentDateStr("租期");
+            setAmountStr("保险档次");
+            setPayTimeStr("下单时间");
+            setRefundTimeStr("退保时间");
+            setStatusStr("状态");
+        }};
+        exportBean(log, head, () -> {
+            List<OrderPersonInsurance> bgList = baseBiz.selectInsuranceInfo(dto);
+            List<Map> list = CollUtil.newArrayList();
+            bgList.forEach(vo -> {
+                //OrderNo Name IdCard
+                PageExportDTO ped = BeanUtil.toBean(vo, PageExportDTO.class);
+                switch (vo.getStatus()) {
+                    case OrderPersonInsurance.STATUS_PAY:
+                        ped.setStatusStr("已购买");
+                        ped.setRefundTimeStr("");
+                        break;
+                    case OrderPersonInsurance.STATUS_CNL:
+                        ped.setStatusStr("已退保");
+                        ped.setRefundTimeStr(DateUtil.date(vo.getRefundTime()).toString());
+                    default:
+                        ped.setStatusStr("");
+                        ped.setRefundTimeStr("");
+                        break;
+                }
+
+                ped.setAmountStr(vo.getAmount()+ "元");
+                String startStr = DateUtil.date(vo.getStartTime()).toDateStr();
+                String endStr = DateUtil.date(vo.getEndTime()).toDateStr();
+                ped.setRentDateStr(startStr+ "-"+ endStr);
+                ped.setPayTimeStr(DateUtil.date(vo.getPaytime()).toString());
+                list.add(BeanUtil.beanToMap(ped,false, true));
+            });
+            return list;
+        },"保险导出");
+    }
+
+    @Data
+    static class PageExportDTO {
+        private String orderNo;
+        private String name;
+        private String idCard;
+        private String rentDateStr;
+        private String amountStr;
+        private String payTimeStr;
+        private String refundTimeStr;
+        private String statusStr;
+    }
+
+}
\ No newline at end of file

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

@@ -335,8 +335,10 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
 
             //插入人身保险列表
             if(SYS_TRUE == bo.getNeedPersonInsurance()){
+                bo.getOrder().setInsureStatus(SYS_TRUE);
                 for(OrderPersonInsurance opi : bo.getConfirmInsurances()) {
                     opi.setOrderId(bo.getOrder().getId());
+                    opi.setOrderNo(bo.getOrder().getNo());
                     orderPersonInsuranceBiz.insertSelective(opi);
                 }
             }
@@ -563,7 +565,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
             for(OrderPersonInsurance opi : detail.getInsurances()) {
                 opi.setOrderDay(detail.getDayNum());
                 //计算天数
-                orderAccountBiz.calculatePersonInsurance(detail.getEndTime() - detail.getStartTime(), opi);
+                orderAccountBiz.calculatePersonInsurance(detail.getStartTime(), detail.getEndTime(), opi);
                 if(STATUS_TOPAY == opi.getStatus()) {
                     detail.getConfirmInsurances().add(BeanUtil.toBean(opi, OrderPersonInsurance.class));
                     OrderItem personInsuranceOrderItem = orderItemBiz.initOrderItem(opi.getAmount(), 1, "人身保险", null, ItemTypeEnum.PERSON_INSURANCE, JSONUtil.toJsonStr(opi));
@@ -740,7 +742,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
             for(OrderPersonInsurance opi : detail.getInsurances()) {
                 opi.setOrderDay(detail.getDayNum());
                 //计算天数
-                orderAccountBiz.calculatePersonInsurance(detail.getEndTime() - detail.getStartTime(), opi);
+                orderAccountBiz.calculatePersonInsurance(detail.getStartTime(), detail.getEndTime(), opi);
                 if(STATUS_TOPAY == opi.getStatus()) {
                     detail.getConfirmInsurances().add(BeanUtil.toBean(opi, OrderPersonInsurance.class));
                     OrderItem personInsuranceOrderItem = orderItemBiz.initOrderItem(opi.getAmount(), 1, "人身保险", null, ItemTypeEnum.PERSON_INSURANCE, JSONUtil.toJsonStr(opi));

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

@@ -19,4 +19,53 @@
         <result property="updUser" column="upd_user"/>
     </resultMap>
 
+    <select id="selectOrderInfo" resultType="com.xxfc.platform.order.pojo.personinsurance.BgPageVO">
+        select distinct ob.no, ob.insure_pic
+
+        <include refid="commonFromWhere"></include>
+
+        order by
+            ob.no desc
+    </select>
+
+    <select id="selectInsuranceInfo" resultType="com.xxfc.platform.order.entity.OrderPersonInsurance">
+        select opi.*
+
+        <include refid="commonFromWhere"></include>
+
+        order by
+            ob.no desc
+    </select>
+
+    <sql id="commonFromWhere">
+        from order_person_insurance opi
+        left join order_base ob on opi.id = ob.order_id
+        <where>
+            and ob.has_pay = 1
+            <if test="keyWord != null">
+                and (
+                ob.no like concat('%',#{keyWord},'%') or opi.name like concat('%',#{keyWord},'%')
+                )
+            </if>
+            <if test="price != null">
+                and opi.amount = #{price}
+            </if>
+            <if test="status != null">
+                and opi.status = #{status}
+            </if>
+            <if test="orderStartTime != null">
+                and opi.pay_time &gt;= #{orderStartTime}
+            </if>
+            <if test="orderEndTime != null">
+                and ob.pay_time &lt;= #{orderEndTime}
+            </if>
+            <if test="refundStartTime != null">
+                and opi.refund_time &gt;= #{refundStartTime}
+            </if>
+            <if test="refundEndTime != null">
+                and ob.refund_time &lt;= #{refundEndTime}
+            </if>
+        </where>
+    </sql>
+
 </mapper>
\ No newline at end of file