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/AccountBindDTO.java

+package com.github.wxiaoqi.security.admin.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/10/25 14:42
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AccountBindDTO {
+      private String opendId;
+      private String unionId;
+      private String nickName;
+      private String code;
+      private String type;
+}

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserDetail.java

@@ -22,6 +22,8 @@ public class AppUserDetail {
 	private Integer isMember;
 	@Column(name = "wx_nickname")
 	private String wxNickname;
+	@Column(name = "qq_nickname")
+	private String qqNickname;
 	private String nickname;
 	private String realname;
 	private String headimgurl;

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

@@ -20,7 +20,9 @@ public class AppUserDTO {
 	private Integer isMember;
 	private String username;
 	private String wxNickname;
+	private String qqNickname;
 	private String nickname;
+	private String aliPayNickName;
 	private String realname;
 	private String headimgurl;
 	private String email;
@@ -88,7 +90,8 @@ public class AppUserDTO {
 	private String itemImg;
 	private Integer memberNo;
 	private Long cardLeave;
-	private Integer isBind;
+	private Boolean isBindWx;
 	private Boolean isBindAliPay;
+	private Boolean isBindQQ;
 
 }

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

@@ -37,6 +37,9 @@ public class AppUserVo {
 	private Integer isMember;
 	//昵称
 	private String nickname;
+	private String wxNickname;
+	private String aliPayNickName;
+	private String qqNickname;
 	//真实姓名
 	private String realname;
 	//头像

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

@@ -4,8 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.admin.entity.AppUserAlipay;
-import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
-import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.mapper.AppUserAlipayMapper;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
@@ -65,7 +63,7 @@ public class AppUserAlipayBiz extends BaseBiz<AppUserAlipayMapper, AppUserAlipay
             updateSelectiveById(appUserAlipay1);
         }
     }
-   //获取支付宝列表
+    //获取支付宝列表
     public List<AppUserAlipay> getListByUserId(Integer userId){
         Example example=new Example(AppUserAlipay.class);
         example.createCriteria().andEqualTo("userId",userId).andEqualTo("isDel",0);
@@ -96,16 +94,16 @@ public class AppUserAlipayBiz extends BaseBiz<AppUserAlipayMapper, AppUserAlipay
             appUserAlipays.add(appUserAlipay);
         }
         //微信
-        AppUserLogin appUserLogin = appUserLoginBiz.getUserById(userId);
-        if(appUserLogin != null && StringUtils.isNotBlank(appUserLogin.getWxOpenid())) {
-            AppUserDetail appUserDetail = appUserDetailBiz.getUserByUserid(userId);
-            AppUserAlipay wxAppUser = new AppUserAlipay();
-            wxAppUser.setType(2);
-            wxAppUser.setUserId(userId);
-            wxAppUser.setNickname(StringUtils.isEmpty(appUserDetail.getWxNickname())?appUserDetail.getNickname():appUserDetail.getWxNickname());
-            wxAppUser.setTxAlipay(appUserLogin.getWxOpenid());
-            appUserAlipays.add(wxAppUser);
-        }
+//        AppUserLogin appUserLogin = appUserLoginBiz.getUserById(userId);
+//        if(appUserLogin != null && StringUtils.isNotBlank(appUserLogin.getWxOpenid())) {
+//            AppUserDetail appUserDetail = appUserDetailBiz.getUserByUserid(userId);
+//            AppUserAlipay wxAppUser = new AppUserAlipay();
+//            wxAppUser.setType(2);
+//            wxAppUser.setUserId(userId);
+//            wxAppUser.setNickname(StringUtils.isEmpty(appUserDetail.getWxNickname())?appUserDetail.getNickname():appUserDetail.getWxNickname());
+//            wxAppUser.setTxAlipay(appUserLogin.getWxOpenid());
+//            appUserAlipays.add(wxAppUser);
+//        }
         return appUserAlipays;
     }
 
@@ -162,7 +160,7 @@ public class AppUserAlipayBiz extends BaseBiz<AppUserAlipayMapper, AppUserAlipay
                 }
                 log.info("用户支付宝信息： {}", appUserAlipay.toString());
                 save(appUserAlipay);
-                return ObjectRestResponse.succ();
+                return ObjectRestResponse.succ(appUserAlipay.getNickname());
             } else {
                 return ObjectRestResponse.createFailedResult(Integer.parseInt(jsonObject.getJSONObject("error_response").getString("code")), jsonObject.getJSONObject("error_response").getString("sub_msg"));
             }

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

@@ -2,6 +2,7 @@ package com.github.wxiaoqi.security.admin.biz;
 
 import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
+import com.github.wxiaoqi.security.admin.dto.AccountBindDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
 import com.github.wxiaoqi.security.admin.mapper.AppUserDetailMapper;
 import com.github.wxiaoqi.security.admin.rpc.service.AppPermissionService;
@@ -149,4 +150,18 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
         return mapper.getUserIdByUsername(keywords);
     }
 
+    public void updateByUserId(AccountBindDTO accountBindDTO,Integer userId) {
+
+        AppUserDetail appUserDetail = new AppUserDetail();
+        if (accountBindDTO.getType().equals("wx")){
+            appUserDetail.setWxNickname(accountBindDTO.getNickName());
+        }
+        if(accountBindDTO.getType().equals("q")){
+            appUserDetail.setQqNickname(accountBindDTO.getNickName());
+        }
+        Example example = new Example(AppUserDetail.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("userid",userId);
+        mapper.updateByExample(appUserDetail,example);
+    }
 }

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

@@ -2,21 +2,19 @@ package com.github.wxiaoqi.security.admin.biz;
 
 import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
-import com.alibaba.druid.sql.visitor.functions.If;
 import com.alibaba.fastjson.JSONObject;
-import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
+import com.github.wxiaoqi.security.admin.dto.AccountBindDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.mapper.AppUserLoginMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant;
 import com.github.wxiaoqi.security.common.constant.UserConstant;
-import com.google.common.collect.Lists;
-import com.xxfc.platform.im.utils.StringUtil;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.universal.entity.IdInformation;
 import com.xxfc.platform.universal.feign.MQSenderFeign;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
@@ -24,6 +22,7 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
 
+import javax.servlet.http.HttpServletRequest;
 import java.time.Instant;
 import java.util.HashMap;
 import java.util.List;
@@ -45,6 +44,7 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
 
     private static final String WX_TYPE = "wx";
     private static final String QQ_TYPE = "q";
+    private static final String ALIPAY_TYPE = "aliPay";
 
     @Autowired
     ThirdFeign thirdFeign;
@@ -54,6 +54,9 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
     @Autowired
     AppUserDetailBiz appUserDetailBiz;
 
+    @Autowired
+    private AppUserAlipayBiz appUserAlipayBiz;
+
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     @Override
     public void insertSelective(AppUserLogin entity) {
@@ -321,9 +324,73 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
     }
 
     public List<AppUserLogin> getUserByUsernameAndRealName(String username, String realName) {
-       
-        return mapper.getUserByUsernameAndRealName(username,realName);
 
+        return mapper.getUserByUsernameAndRealName(username, realName);
+
+
+    }
+
+    @CacheClear(pre = "user{2}")
+    public ObjectRestResponse bindAccount(AccountBindDTO accountBindDTO, Integer userId, HttpServletRequest request) {
+        switch (accountBindDTO.getType()) {
+            case WX_TYPE:
+                wxBinding(accountBindDTO, userId);
+                break;
+            case QQ_TYPE:
+                qqBinding(accountBindDTO, userId);
+                break;
+            case ALIPAY_TYPE:
+                return appUserAlipayBiz.getUserInfo(accountBindDTO.getCode(), request);
+            default:
+                break;
+        }
+        return ObjectRestResponse.succ(accountBindDTO.getNickName());
+    }
+
+    /**
+     * 微信绑定
+     *
+     * @param accountBindDTO
+     */
+    private void wxBinding(AccountBindDTO accountBindDTO, Integer userId) {
+        //检查微信是否绑定
+   /*     Example example = new Example(AppUserLogin.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("id", userId);
+        criteria.andEqualTo("wxOpenid", accountBindDTO.getOpendId());
+        List<AppUserLogin> appUserLogins = mapper.selectByExample(example);
+        if (CollectionUtils.isNotEmpty(appUserLogins)) {
+            throw new BaseException("该微信已经绑定过了");
+        }*/
+
+        AppUserLogin appUserLogin = new AppUserLogin();
+        appUserLogin.setId(userId);
+        appUserLogin.setWxOpenid(accountBindDTO.getOpendId());
+        appUserLogin.setUnionid(accountBindDTO.getUnionId());
+        mapper.updateByPrimaryKey(appUserLogin);
+        appUserDetailBiz.updateByUserId(accountBindDTO, userId);
+    }
 
+    /**
+     * QQ绑定
+     *
+     * @param accountBindDTO
+     */
+    private void qqBinding(AccountBindDTO accountBindDTO, Integer userId) {
+        //检查qq是否绑定
+/*        Example example = new Example(AppUserLogin.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("id", userId);
+        criteria.andEqualTo("openid", accountBindDTO.getOpendId());
+        List<AppUserLogin> appUserLogins = mapper.selectByExample(example);
+        if (CollectionUtils.isNotEmpty(appUserLogins)) {
+            throw new BaseException("该qq已经绑定过了");
+        }*/
+        AppUserLogin appUserLogin = new AppUserLogin();
+        appUserLogin.setId(userId);
+        appUserLogin.setWxOpenid(accountBindDTO.getOpendId());
+        appUserLogin.setUnionid(accountBindDTO.getUnionId());
+        mapper.updateByPrimaryKey(appUserLogin);
+        appUserDetailBiz.updateByUserId(accountBindDTO, userId);
     }
 }

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

 package com.github.wxiaoqi.security.admin.rest;
 
 import com.github.wxiaoqi.security.admin.biz.*;
+import com.github.wxiaoqi.security.admin.dto.AccountBindDTO;
 import com.github.wxiaoqi.security.admin.entity.*;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.vo.AppUserGroups;
@@ -22,7 +23,6 @@ import com.xxfc.platform.order.feign.OrderFeign;
 import io.swagger.annotations.ApiOperation;
 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;
 import org.springframework.web.bind.annotation.*;
@@ -145,7 +145,7 @@ public class AppUserController extends CommonBaseController{
             throw new Exception();
         }
         Integer id= userVo.getId();
-       Integer positionId=userVo.getPositionId();
+        Integer positionId=userVo.getPositionId();
         BeanUtils.copyProperties(userDTO,userVo);
         if(userVo.getIsMember()!=null&&userVo.getIsMember()>0){
             //获取用户会员信息
@@ -158,8 +158,6 @@ public class AppUserController extends CommonBaseController{
                 if (memberLevel!=null){
                     String icon=memberLevel.getIcon();
                     userDTO.setIcon(icon);
-                    userDTO.setBigIcon(memberLevel.getBigIcon());
-                    userDTO.setItemImg(memberLevel.getItemImg());
                 }
             }
         }
@@ -171,6 +169,10 @@ public class AppUserController extends CommonBaseController{
         long count = appUserAlipays.stream().filter(appUserAlipay -> appUserAlipay.getType() == 1).count();
         userDTO.setIsBindAliPay(count>0);
         userDTO.setId(id);
+        userDTO.setAliPayNickName(userDTO.getIsBindAliPay()?appUserAlipays.get(0).getNickname():"");
+        AppUserLogin appUserLogin = appUserLoginBiz.selectById(userid);
+        userDTO.setIsBindWx(StringUtils.isEmpty(appUserLogin.getWxOpenid()));
+        userDTO.setIsBindQQ(StringUtils.isEmpty(appUserLogin.getOpenid()));
         return ObjectRestResponse.succ(userDTO);
     }
 
@@ -224,7 +226,7 @@ public class AppUserController extends CommonBaseController{
             appUserLoginBiz.bindOpenid(appUserLogin);
             //支付宝绑定
             if (StringUtils.isNotEmpty(userVo.getAliCode()) && userVo.getAliCode().trim().length()>0){
-                appUserAlipayBiz.getUserInfo(userVo.getAliCode(),request);
+               appUserAlipayBiz.getUserInfo(userVo.getAliCode(),request);
             }
         }
 
@@ -304,7 +306,7 @@ public class AppUserController extends CommonBaseController{
     }
     @GetMapping("/findusersByIds")
     public Map<Integer,AppUserLogin> findAppUsersByUserIds(@RequestParam(value = "userIds") List<Integer> userIds){
-     return appUserLoginBiz.findUserIdAndUserLoginMapByMemberIds(userIds);
+        return appUserLoginBiz.findUserIdAndUserLoginMapByMemberIds(userIds);
     }
 
     @GetMapping("/finduserIdsByphones")
@@ -316,8 +318,8 @@ public class AppUserController extends CommonBaseController{
     @IgnoreUserToken
     @IgnoreClientToken
     public ObjectRestResponse<AppUserInfoVo> findUserInfoByCode(@PathVariable("code") String code){
-         AppUserInfoVo appUserInfoVo = userDetailBiz.findUserInfoByCode(code);
-         return ObjectRestResponse.succ(appUserInfoVo);
+        AppUserInfoVo appUserInfoVo = userDetailBiz.findUserInfoByCode(code);
+        return ObjectRestResponse.succ(appUserInfoVo);
     }
 
     @GetMapping("/app/unauth/getUserIdByUsername")
@@ -334,4 +336,14 @@ public class AppUserController extends CommonBaseController{
     public Object test() {
         return appUserLoginBiz.test();
     }
+
+    @PostMapping("/bind")
+    private ObjectRestResponse accountBinding(@RequestBody AccountBindDTO accountBindDTO,HttpServletRequest request){
+         try {
+             IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
+            return appUserLoginBiz.bindAccount(accountBindDTO, Integer.valueOf(infoFromToken.getId()), request);
+         }catch (Exception ex){
+             throw new BaseException(ex);
+         }
+    }
 }

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

@@ -14,6 +14,8 @@
         <result column="certification_status" property="certificationStatus"/>
         <result column="is_member" property="isMember"/>
         <result column="nickname" property="nickname"/>
+        <result column="wx_nickname" property="wxNickname"/>
+        <result column="qq_nickname" property="qqNickname"/>
         <result column="realname" property="realname"/>
         <result column="headimgurl" property="headimgurl"/>
         <result column="birthday" property="birthday"/>

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

@@ -25,7 +25,7 @@
             AND `stauts`=#{state}
             i
         </if>
-        <if test="orderNo">
+        <if test="orderNo !=null and orderNo !=''">
             AND `order_no` = #{orderNo}
         </if>
         <if test="startTime !=null and  endTime !=null">

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

 package com.xxfc.platform.order.biz;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import com.xxfc.platform.order.contant.enumerate.ItemTypeEnum;
@@ -58,7 +59,7 @@ public class OrderItemBiz extends BaseBiz<OrderItemMapper,OrderItem> {
         List<VehicleModelCalendarPriceDTO> overlist = vehicleFeign.findVehicleModelCalendarPriceByDate(overStart.getTime(), overEnd.getTime(), modelId, userId).getData();
 
         for(VehicleModelCalendarPriceDTO vmcpd : overlist) {
-            overAmountList.add((VMCalendarPriceCostDTO) vmcpd);
+            overAmountList.add(BeanUtil.toBean(vmcpd, VMCalendarPriceCostDTO.class));
         }
         return overAmountList;
     }

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

@@ -178,7 +178,7 @@ public class OrderCalculateBiz {
         if(residueDays > 0) {
             //设置消耗费用列表
             for(int i = 0; i < useDays; i++) {
-                useAmountList.add((VMCalendarPriceCostDTO) vmcpds.get(i));
+                useAmountList.add(BeanUtil.toBean(vmcpds.get(i), VMCalendarPriceCostDTO.class));
             }
 
             //"{}元/天 x{}天"

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

@@ -417,12 +417,12 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
         try {
             response = alipayClient.execute(request);
         } catch (AlipayApiException e) {
-             throw new BaseException("支付宝转账api调用错误",e);
+            throw new BaseException("支付宝转账api调用错误",e);
         }
         if (response.isSuccess()) {
             return fundPayVo.getOutBizNo();
         } else {
-             throw  new BaseException(response.getSubMsg(),response.getSubCode());
+            throw  new BaseException(response.getSubMsg(),response.getSubCode());
         }
     }
 

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/UserInfoController.java

@@ -5,10 +5,12 @@ package com.xxfc.platform.universal.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alipay.api.AlipayApiException;
+import com.alipay.api.AlipayApiException;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.UserAgentUtil;
 import com.xxfc.platform.universal.biz.OrderPayBiz;
+import com.xxfc.platform.universal.biz.OrderPayBiz;
 import com.xxfc.platform.universal.biz.WeixinService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/Vehicle.java

@@ -64,11 +64,17 @@ public class  Vehicle {
      */
     private Integer insuranceCompany;
 
+    private Integer strongInsuranceCompany;
+
 
     /**
      * 保险单号
      */
     private String insuranceNo;
+    /**
+     * 强险单号
+     */
+    private String strongInsuranceNo;
 
     /**
      * 保险开始时间
@@ -80,6 +86,11 @@ public class  Vehicle {
      */
     private Date insuranceEndDate;
 
+    /**
+     * 强险的结束时间
+     */
+    private Date strongInsuranceEndDate;
+
     /**
      * 年审时间
      */

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/AddOrUpdateVehicleVo.java

@@ -68,12 +68,14 @@ public class AddOrUpdateVehicleVo {
      * 保险公司，见常量表
      */
     private Integer insuranceCompany;
+    private Integer strongInsuranceCompany;
 
 
     /**
      * 保险单号
      */
     private String insuranceNo;
+    private String strongInsuranceNo;
 
     /**
      * 保险开始时间
@@ -84,6 +86,7 @@ public class AddOrUpdateVehicleVo {
      * 保险结束时间
      */
     private Date insuranceEndDate;
+    private Date strongInsuranceEndDate;
 
     /**
      * 年审时间

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehiclePageQueryVo.java

@@ -138,4 +138,6 @@ public class VehiclePageQueryVo {
      */
     private Integer modelId;
 
+
+
 }

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

@@ -261,7 +261,7 @@ public class VehicleModelCalendarPriceBiz extends BaseBiz<VehicleModelCalendarPr
             //价格重置
             vehicle_price = vehicle_base_price;
             //未乘以会员折扣的价格
-            BigDecimal no_discount_price = new BigDecimal(vehicle_price.doubleValue());
+            BigDecimal no_discount_price = new BigDecimal(Objects.toString(vehicle_price.doubleValue()));
             //免费天数重置
             Integer free_days = DEFAULT_FREE_DAYS;
             //节假日对应的价格和免费天数
@@ -275,17 +275,17 @@ public class VehicleModelCalendarPriceBiz extends BaseBiz<VehicleModelCalendarPr
                 } else {
                     switch (vehicleModelCalendarPrice.getType()) {
                         case VehicleModelPriceType.MULTIPLE:
-                            no_discount_price = vehicle_price.multiply(new BigDecimal(vehicleModelCalendarPrice.getMultiple().doubleValue()));
-                            vehicle_price = no_discount_price.multiply(new BigDecimal(discount / 100.00));
+                            no_discount_price = vehicle_price.multiply(new BigDecimal(String.valueOf(vehicleModelCalendarPrice.getMultiple().doubleValue())));
+                            vehicle_price = no_discount_price.multiply(new BigDecimal(Objects.toString(discount / 100.00)));
                             break;
                         case VehicleModelPriceType.ABS:
                             no_discount_price = vehicleModelCalendarPrice.getPrice();
-                            vehicle_price = no_discount_price.multiply(new BigDecimal(discount / 100.00));
+                            vehicle_price = no_discount_price.multiply(new BigDecimal(Objects.toString(discount / 100.00)));
                             break;
                         case VehicleModelPriceType.MEMBER:
                             memberLevel = vehicleModelCalendarPrice.getLevel() > memberLevel ? vehicleModelCalendarPrice.getLevel() : memberLevel;
                             Integer level_discount = levelAndDiscountMap.get(memberLevel);
-                            vehicle_price = level_discount == null ? vehicle_price : vehicle_price.multiply(new BigDecimal(level_discount / 100.00));
+                            vehicle_price = level_discount == null ? vehicle_price : vehicle_price.multiply(new BigDecimal(Objects.toString(level_discount / 100.00)));
                             break;
                         default:
                             break;
@@ -301,7 +301,7 @@ public class VehicleModelCalendarPriceBiz extends BaseBiz<VehicleModelCalendarPr
                 no_discount_price = (BigDecimal) price_freeDays_map.get(BASE_PRICE_VAL);
             }
             vehicleModelCalendarPriceDTO.setNo_discount_price(no_discount_price);
-            vehicleModelCalendarPriceDTO.setPrice(vehicle_price.setScale(2, RoundingMode.HALF_UP));
+            vehicleModelCalendarPriceDTO.setPrice(vehicle_price);
             vehicleModelCalendarPriceDTO.setFreeDays(free_days);
             final_startLocalDate = final_startLocalDate.plusDays(1);
             vehicleModelCalendarPriceVos.add(vehicleModelCalendarPriceDTO);
@@ -330,7 +330,7 @@ public class VehicleModelCalendarPriceBiz extends BaseBiz<VehicleModelCalendarPr
                 free_days = vehicleModelHolidayPriceDTO.getFreeDays() == null ? free_days : vehicleModelHolidayPriceDTO.getFreeDays();
             }
         }
-        vehicle_price = vehicle_price.multiply(new BigDecimal(discount / 100.00));
+        vehicle_price = vehicle_price.multiply(new BigDecimal(Objects.toString(discount / 100.00)));
         vehicle_price_days_map.put(PRICE_VAL, vehicle_price);
         vehicle_price_days_map.put(DAYS_VAL, free_days);
         log.info("(节假日|非节假日未设置的)价格和免费天数 处理【{}】",vehicle_price_days_map);

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

@@ -53,16 +53,28 @@ public class VehicleModelCalendarPriceController {
         return ObjectRestResponse.succ(vehicleModelCalendarPriceVos);
     }
 
-    @GetMapping(value = "/price",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @GetMapping(value = "/price", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public ObjectRestResponse<List<VehicleModelCalendarPriceDTO>> findVehicleModelCalendarPriceByDate(@RequestParam(value = "startDate") Long startDate,
-                                                                                       @RequestParam(value = "endDate") Long endDate,
-                                                                                       @RequestParam(value = "vehicleModelId") Integer vehicleModelId,
-                                                                                       @RequestParam(value = "userId") Integer userId) {
+                                                                                                      @RequestParam(value = "endDate") Long endDate,
+                                                                                                      @RequestParam(value = "vehicleModelId") Integer vehicleModelId,
+                                                                                                      @RequestParam(value = "userId") Integer userId) {
 
         Date startDateDay = DateUtil.beginOfDay(DateUtil.date(startDate));
-                //Date.from(startDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate().atStartOfDay(ZoneId.systemDefault()).toInstant());
+        //Date.from(startDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate().atStartOfDay(ZoneId.systemDefault()).toInstant());
         Date endDateDay = DateUtil.beginOfDay(DateUtil.date(endDate));
-                //Date.from(endDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate().atStartOfDay(ZoneId.systemDefault()).toInstant());
+        //Date.from(endDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate().atStartOfDay(ZoneId.systemDefault()).toInstant());
         return ObjectRestResponse.succ(vehicleModelCalendarPriceBiz.findVehicleModelCalendarPriceByDateAndVehilceIdAndUserId(startDateDay, endDateDay, vehicleModelId, userId));
     }
+
+    @GetMapping(value = "/app/price", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ObjectRestResponse<List<VehicleModelCalendarPriceDTO>> findVehicleModelCalendarPriceByDateForApp(@RequestParam(value = "startDate") Long startDate,
+                                                                                                            @RequestParam(value = "endDate") Long endDate,
+                                                                                                            @RequestParam(value = "vehicleModelId") Integer vehicleModelId,
+                                                                                                            AppUserDTO appUserDTO) {
+
+        Date startDateDay = DateUtil.beginOfDay(DateUtil.date(startDate));
+        Date endDateDay = DateUtil.beginOfDay(DateUtil.date(endDate));
+        return ObjectRestResponse.succ(vehicleModelCalendarPriceBiz.findVehicleModelCalendarPriceByDateAndVehilceIdAndUserId(startDateDay, endDateDay, vehicleModelId, appUserDTO.getUserid()));
+    }
+
 }

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

@@ -121,7 +121,7 @@
             and v.belong_to_name  like concat('%',#{belongToName},'%')
         </if>
         <if test="vin !=null and vin != ''">
-            and v.vin = #{vin}
+            and v.vin like CONCAT('%',#{vin},'%')
         </if>
         <!--        <if test="subordinateBranch !=null">-->
         <!--            and v.subordinate_branch = #{subordinateBranch}-->
@@ -289,7 +289,7 @@
             and v.belong_to_name = #{belongToName}
         </if>
         <if test="vin !=null and vin != ''">
-            and v.vin = #{vin}
+            and v.vin like CONCAT('%',#{vin},'%')
         </if>
 <!--        <if test="subordinateBranch !=null">-->
 <!--            and v.subordinate_branch = #{subordinateBranch}-->