Merge branch 'feature_chw_zjw' into dev-chw

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

@@ -377,6 +377,6 @@ public class BaseOrder implements Serializable {
 	@Column(name = "insure_status")
 	private Integer insureStatus;
 
-	@Column(name = "insure_amount")
-	private BigDecimal insureAmount;
+	@Column(name = "person_insure_amount")
+	private BigDecimal personInsureAmount;
 }

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

@@ -96,6 +96,7 @@ public class OrderDetailBiz{
         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));
 
+        goodsAmount = goodsAmount.subtract(insureAmount);
         OrderRentVehicleDetail vehicleDetail=orderRentVehicleDetails.get(0);
         //获取营收明细dto
         OrderDetailDTO orderDetailDTO = new OrderDetailDTO();

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

@@ -161,15 +161,35 @@ public class OrderRentVehicleBiz extends BaseBiz<OrderRentVehicleDetailMapper, O
         if(SYS_TRUE == vo.getNeedPersonInsurance() && StrUtil.isNotBlank(vo.getInsureUserIds())){
             String buyInsureIdCard = "";
             String buyInsureName = "";
+            String buyInsurePhone = vo.getAppUserDTO().getUsername();
             IdInformation idInformation = thirdFeign.getOneByUserId(vo.getAppUserDTO().getUserid());
             if(null == idInformation) {
+                String finalBuyInsurePhone = buyInsurePhone;
                 List<InsureUser> insureUsers = insureUserBiz.selectList(new InsureUser(){{
                     setUserid(vo.getAppUserDTO().getUserid());
-                    setPhone(vo.getAppUserDTO().getUsername());
+                    setPhone(finalBuyInsurePhone);
                     setIsdel(SYS_FALSE);
                 }});
                 if(CollUtil.isEmpty(insureUsers)) {
-                    throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, Sets.newSet("无法获取投保人信息"));
+                    List<InsureUser> insureUsers2 = insureUserBiz.selectByWeekend(w -> {
+                        w.andEqualTo(InsureUser::getUserid, vo.getAppUserDTO().getUserid());
+                        w.andEqualTo(InsureUser::getIsdel, SYS_FALSE);
+                        w.andIsNotNull(InsureUser::getPhone);
+                        return w;
+                    });
+                    if(CollUtil.isEmpty(insureUsers2)) {
+                        List<InsureUser> insureUsers3 = insureUserBiz.selectByWeekend(w -> {
+                            w.andEqualTo(InsureUser::getUserid, vo.getAppUserDTO().getUserid());
+                            w.andEqualTo(InsureUser::getIsdel, SYS_FALSE);
+                            return w;
+                        });
+                        buyInsureIdCard = insureUsers3.get(0).getIdCard();
+                        buyInsureName = insureUsers3.get(0).getName();
+                    }else {
+                        buyInsureIdCard = insureUsers2.get(0).getIdCard();
+                        buyInsureName = insureUsers2.get(0).getName();
+                        buyInsurePhone = insureUsers2.get(0).getPhone();
+                    }
                 }else{
                     buyInsureIdCard = insureUsers.get(0).getIdCard();
                     buyInsureName = insureUsers.get(0).getName();
@@ -187,10 +207,11 @@ public class OrderRentVehicleBiz extends BaseBiz<OrderRentVehicleDetailMapper, O
                 }else {
                     String finalBuyInsureIdCard = buyInsureIdCard;
                     String finalBuyInsureName = buyInsureName;
+                    String finalBuyInsurePhone1 = buyInsurePhone;
                     bo.getInsurances().add(new OrderPersonInsurance(){{
                         setBuyInsureIdCard(finalBuyInsureIdCard);
                         setBuyInsureName(finalBuyInsureName);
-                        setBuyInsurePhone(vo.getAppUserDTO().getUsername());
+                        setBuyInsurePhone(finalBuyInsurePhone1);
                         setIdCard(insureUser.getIdCard());
                         setName(insureUser.getName());
                     }});