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/feign/UserFeign.java

@@ -118,6 +118,8 @@ public interface UserFeign {
     @GetMapping("/app/user/one")
     public AppUserLogin one(@RequestParam(value = "username")String username);
 
+    @GetMapping("/app/user/getOne")
+    public List<AppUserLogin> getOne(@RequestParam(value = "username")String username,@RequestParam(value = "realName")String realName);
 
     @GetMapping("/api/app/imi/{imiId}")
     ImiVo findUserInfoByImiId(@PathVariable(value = "imiId") Integer imiId);

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

@@ -2,16 +2,21 @@ 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.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.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;
@@ -38,15 +43,18 @@ import java.util.stream.Collectors;
 @Transactional(rollbackFor = Exception.class)
 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 WX_TYPE = "wx";
+    private static final String QQ_TYPE = "q";
 
     @Autowired
     ThirdFeign thirdFeign;
     @Autowired
     MQSenderFeign mqSenderFeign;
 
-    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
+    @Autowired
+    AppUserDetailBiz appUserDetailBiz;
+
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     @Override
     public void insertSelective(AppUserLogin entity) {
         String password = new BCryptPasswordEncoder(UserConstant.PW_ENCORDER_SALT).encode(entity.getPassword());
@@ -62,7 +70,7 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
 
     @CacheClear(pre = "user{1.username}")
     public int bindOpenid(AppUserLogin entity) {
-        return  mapper.bindOpenId(entity);
+        return mapper.bindOpenId(entity);
     }
 
     @CacheClear(pre = "user{1.username}")
@@ -81,33 +89,35 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
         List<AppUserLogin> list = mapper.selectAll();
         ExecutorService executorService = Executors.newCachedThreadPool();
         executorService.execute(new Runnable() {
-             @Override
-              public void run() {
-                 if(list != null && list.size() > 0) {
-                     for(AppUserLogin appUserLogin : list) {
-                         try {
-                             Thread.sleep(3000);
-                         } catch (Exception e){}
-                         IdInformation idInformation = thirdFeign.getOneByUserId(appUserLogin.getId());
-                         if(idInformation != null) { //实名认证
-                             JSONObject jsonObject = new JSONObject();
-                             jsonObject.put("userId", appUserLogin.getId());
-                             jsonObject.put("integralRuleCode", "CRETIFICATION");
-                             jsonObject.put("channelId", idInformation.getId());
-                             mqSenderFeign.sendMessage(RabbitConstant.INTEGRAL_TOPIC, RabbitConstant.INTEGRAL_ROUTING_KEY, jsonObject.toJSONString());
-                         }
-                         try {
-                             Thread.sleep(3000);
-                         } catch (Exception e){}
-                         JSONObject jsonObject = new JSONObject();
-                         jsonObject.put("userId", appUserLogin.getId());
-                         jsonObject.put("integralRuleCode", "REGISTER");
-                         jsonObject.put("channelId", appUserLogin.getId());
-                         mqSenderFeign.sendMessage(RabbitConstant.INTEGRAL_TOPIC, RabbitConstant.INTEGRAL_ROUTING_KEY, jsonObject.toJSONString());
-
-                     }
-                 }
-               }
+            @Override
+            public void run() {
+                if (list != null && list.size() > 0) {
+                    for (AppUserLogin appUserLogin : list) {
+                        try {
+                            Thread.sleep(3000);
+                        } catch (Exception e) {
+                        }
+                        IdInformation idInformation = thirdFeign.getOneByUserId(appUserLogin.getId());
+                        if (idInformation != null) { //实名认证
+                            JSONObject jsonObject = new JSONObject();
+                            jsonObject.put("userId", appUserLogin.getId());
+                            jsonObject.put("integralRuleCode", "CRETIFICATION");
+                            jsonObject.put("channelId", idInformation.getId());
+                            mqSenderFeign.sendMessage(RabbitConstant.INTEGRAL_TOPIC, RabbitConstant.INTEGRAL_ROUTING_KEY, jsonObject.toJSONString());
+                        }
+                        try {
+                            Thread.sleep(3000);
+                        } catch (Exception e) {
+                        }
+                        JSONObject jsonObject = new JSONObject();
+                        jsonObject.put("userId", appUserLogin.getId());
+                        jsonObject.put("integralRuleCode", "REGISTER");
+                        jsonObject.put("channelId", appUserLogin.getId());
+                        mqSenderFeign.sendMessage(RabbitConstant.INTEGRAL_TOPIC, RabbitConstant.INTEGRAL_ROUTING_KEY, jsonObject.toJSONString());
+
+                    }
+                }
+            }
         });
     }
 
@@ -228,10 +238,10 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
     }
 
     public Map<Integer, AppUserLogin> findUserIdAndUserLoginMapByMemberIds(List<Integer> memberIds) {
-         Map<Integer,AppUserLogin>  userIdAndAppUserLoginMap = new HashMap<>();
+        Map<Integer, AppUserLogin> userIdAndAppUserLoginMap = new HashMap<>();
         List<AppUserLogin> appUserLogins = mapper.selectByIdList(memberIds);
-        if (CollectionUtils.isNotEmpty(appUserLogins)){
-           userIdAndAppUserLoginMap = appUserLogins.stream().collect(Collectors.toMap(AppUserLogin::getId, Function.identity()));
+        if (CollectionUtils.isNotEmpty(appUserLogins)) {
+            userIdAndAppUserLoginMap = appUserLogins.stream().collect(Collectors.toMap(AppUserLogin::getId, Function.identity()));
         }
         return userIdAndAppUserLoginMap;
     }
@@ -239,9 +249,9 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
     public AppUserLogin findUserByImiId(Integer imiId) {
         Example example = new Example(AppUserLogin.class);
         Example.Criteria criteria = example.createCriteria();
-        criteria.andEqualTo("imUserid",imiId);
+        criteria.andEqualTo("imUserid", imiId);
         List<AppUserLogin> appUserLogins = mapper.selectByExample(example);
-        if (CollectionUtils.isNotEmpty(appUserLogins)){
+        if (CollectionUtils.isNotEmpty(appUserLogins)) {
             return appUserLogins.get(0);
         }
         return null;
@@ -249,7 +259,7 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
 
     @CacheClear(pre = "user{1.id}")
     public void disable(AppUserLogin appUserLogin) {
-      mapper.updateByPrimaryKeySelective(appUserLogin);
+        mapper.updateByPrimaryKeySelective(appUserLogin);
     }
 
     @CacheClear(pre = "user{1.id}")
@@ -260,7 +270,7 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
     public void deleteByPhones(List<String> phons) {
         Example example = new Example(AppUserLogin.class);
         Example.Criteria criteria = example.createCriteria();
-        criteria.andIn("username",phons);
+        criteria.andIn("username", phons);
         mapper.deleteByExample(example);
     }
 
@@ -273,39 +283,47 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
         mapper.updateByPrimaryKeySelective(appUserLogin);
     }
 
-    public List<Integer> findAllExistUserIds(){
-       return mapper.selectAllExistUserIds();
+    public List<Integer> findAllExistUserIds() {
+        return mapper.selectAllExistUserIds();
     }
 
     /**
      * 检查第三方是否绑定
+     *
      * @param wxOpenId
      * @param wxUnionId
      * @param openId
      * @return
      */
     public boolean checkThirdPartyBindingState(String wxOpenId, String wxUnionId, String openId) {
-         AppUserLogin appUserLogin = new AppUserLogin();
-         appUserLogin.setWxOpenid(wxOpenId);
-         appUserLogin.setUnionid(wxUnionId);
-         appUserLogin.setOpenid(openId);
-       return mapper.selectOne(appUserLogin) != null;
+        AppUserLogin appUserLogin = new AppUserLogin();
+        appUserLogin.setWxOpenid(wxOpenId);
+        appUserLogin.setUnionid(wxUnionId);
+        appUserLogin.setOpenid(openId);
+        return mapper.selectOne(appUserLogin) != null;
     }
 
     @CacheClear(pre = "user{2}")
-    public void unBindThirdPartyByType(String type,String username,Integer userId) {
+    public void unBindThirdPartyByType(String type, String username, Integer userId) {
         AppUserLogin appUserLogin = new AppUserLogin();
         appUserLogin.setId(userId);
         //微信解绑
-        if (WX_TYPE.equals(type)){
+        if (WX_TYPE.equals(type)) {
             appUserLogin.setWxOpenid("");
             appUserLogin.setUnionid("");
             mapper.updateByPrimaryKeySelective(appUserLogin);
         }
-         //qq解绑
-        if (QQ_TYPE.equals(type)){
-             appUserLogin.setOpenid("");
-             mapper.updateByPrimaryKeySelective(appUserLogin);
+        //qq解绑
+        if (QQ_TYPE.equals(type)) {
+            appUserLogin.setOpenid("");
+            mapper.updateByPrimaryKeySelective(appUserLogin);
         }
     }
+
+    public List<AppUserLogin> getUserByUsernameAndRealName(String username, String realName) {
+       
+        return mapper.getUserByUsernameAndRealName(username,realName);
+
+
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserLoginMapper.java

@@ -28,4 +28,7 @@ public interface AppUserLoginMapper extends Mapper<AppUserLogin>, SelectByIdList
 
 
     List<Integer> selectAllExistUserIds();
+
+
+    List<AppUserLogin> getUserByUsernameAndRealName(@Param("username") String username, @Param("realName")String realName);
 }
\ No newline at end of file

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

@@ -262,6 +262,15 @@ public class AppUserController extends CommonBaseController{
         return appUserLoginBiz.getUserByUsername(username);
     }
 
+    /**
+     * 根据用户真实姓名和手机号模糊查询寻用户
+     * @param username
+     * @return
+     */
+    @GetMapping("/getOne")
+    public List<AppUserLogin> getOne(@RequestParam(value = "username",required = false)String username, @RequestParam(value = "realName",required = false)String realName){
+        return appUserLoginBiz.getUserByUsernameAndRealName(username,realName);
+    }
     @GetMapping("/findusersByIds")
     public Map<Integer,AppUserLogin> findAppUsersByUserIds(@RequestParam(value = "userIds") List<Integer> userIds){
      return appUserLoginBiz.findUserIdAndUserLoginMapByMemberIds(userIds);

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

@@ -5,10 +5,10 @@
     <select id="selectbyPhones" resultType="com.github.wxiaoqi.security.admin.entity.AppUserLogin">
         select `id`,`username` from `app_user_login` where `username` in
         <foreach collection="phones" item="phone" open="(" close=")" separator=",">
-          #{phone}
+            #{phone}
         </foreach>
     </select>
-    
+
     <update id="bindOpenId" parameterType="com.github.wxiaoqi.security.admin.entity.AppUserLogin">
         UPDATE  app_user_login SET wx_openid=#{wxOpenid},unionid=#{unionid},openid=#{openid} where  id=#{id}
     </update>
@@ -16,4 +16,15 @@
     <select id="selectAllExistUserIds" resultType="integer">
         SELECT  `id` FROM `app_user_login`  WHERE `isdel`=0;
     </select>
+    <select id="getUserByUsernameAndRealName" resultType="com.github.wxiaoqi.security.admin.entity.AppUserLogin">
+        select l.* from app_user_login l left  join app_user_detail d on l.id=d.userid where 1=1
+
+        <if test="username!=null ">
+         and   l.username like concat('%',#{username},'%')
+        </if>
+
+        <if test="realName !=null">
+            and   d.realname like concat('%',#{realName},'%')
+        </if>
+    </select>
 </mapper>
\ No newline at end of file

xx-campsite/xx-campsite-server/src/main/resources/mapper/CampsiteShopMapper.xml

@@ -69,7 +69,7 @@
             and `city`=#{cityCode}
         </if>
         GROUP BY cs.id
-        order by `hot`DESC,`crt_time` DESC
+        order by cs.hot DESC,cs.crt_time DESC
     </select>
 
     <!--首页查询全部-->

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

@@ -4,12 +4,17 @@ import java.util.HashMap;
 import java.util.Map;
 
 public enum OrderCostEnum {
-    RentVehicle(1, "租车费用明细"),
+    RENT_VEHICLE("01", "租车费用明细"),
+    TOUR("02", "旅游费用明细"),
+    CANCEL_NO_START("03", "取消违约金明细"),
+    CANCEL_STARTED("04", "取消费用明细"),
+    FINLISH_ADVANCE("05", "租车费用明细"),
+    FINLISH_DELAY("06", "租车费用明细"),
     ;
     /**
      * 编码
      */
-    private Integer code;
+    private String code;
     /**
      * 类型描述
      */
@@ -17,16 +22,16 @@ public enum OrderCostEnum {
 
     private static Map<Integer,String> codeAndDesc = new HashMap<Integer, String>();
 
-    OrderCostEnum(Integer code, String desc){
+    OrderCostEnum(String code, String desc){
         this.code=code;
         this.desc=desc;
     }
 
-    public Integer getCode() {
+    public String getCode() {
         return code;
     }
 
-    public void setCode(Integer code) {
+    public void setCode(String code) {
         this.code = code;
     }
 

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

@@ -78,10 +78,10 @@ public class BaseOrder implements Serializable {
     private BigDecimal goodsAmount;
 
 	    /**
-     *  订单价格
+     *  订单总金额
      */
     @Column(name = "order_amount")
-	@ApiModelProperty(value = "订单价格")
+	@ApiModelProperty(value = "订单总金额")
     private BigDecimal orderAmount;
 
 	    /**

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

@@ -7,6 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import javax.persistence.Column;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -15,7 +16,9 @@ import java.util.Date;
  * @author Administrator
  */
 @Data
-public class DailyOrderStatistics {
+public class DailyOrderStatistics implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     @Id
     @GeneratedValue(generator = "JDBC")
     private Integer id;

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

@@ -13,9 +13,15 @@ import java.math.BigDecimal;
 @Data
 @Table(name = "daily_travel_order_statistics")
 public class DailyTravelOrderStatistics extends DailyOrderStatistics  {
+
+    /**
+     *  违约总额
+     */
+    @Column(name = "default_money ")
+    private BigDecimal defaultMoney ;
     /**
-     * 取消订单总额
+     * 退还订单金额
      */
-    @Column(name = "penal_sum")
-    private BigDecimal penalSum;
+    @Column(name = "return_gmv")
+    private BigDecimal returnGmv;
 }

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

@@ -17,27 +17,28 @@ import java.util.Date;
 
 /**
  * 每日租车订单统计
+ *
  * @author Administrator
  */
 @Data
 @Table(name = "daily_vehicle_order_statistics")
-public class DailyVehicleOrderStatistics extends DailyOrderStatistics{
+public class DailyVehicleOrderStatistics extends DailyOrderStatistics {
 
 
     /**
      * 预交押金总额
      */
     @Column(name = "security_deposit")
-    private BigDecimal  securityDeposit;
+    private BigDecimal securityDeposit;
 
     /**
      * 退还押金总额
      */
     @Column(name = "refund_security_deposit")
-    private BigDecimal  refundSecurityDeposit;
+    private BigDecimal refundSecurityDeposit;
 
     /**
-     * 赔偿总额
+     * 损坏赔偿总额
      */
     @Column(name = "compensation")
     private BigDecimal compensation;
@@ -46,19 +47,25 @@ public class DailyVehicleOrderStatistics extends DailyOrderStatistics{
      * 违章总额
      */
     @Column(name = "forfeit")
-    private  BigDecimal violationMoney;
+    private BigDecimal violationMoney;
 
 
     /**
-     * 延期总额
+     * 退还订单金额
      */
-    @Column(name = "postpone")
-    private  BigDecimal postpone;
+    @Column(name = "return_gmv")
+    private BigDecimal returnGmv;
 
     /**
-     * 取消订单扣款总额
+     *  违约总额
      */
-    @Column(name = "penal_sum")
-    private BigDecimal penalSum;
+    @Column(name = "default_money ")
+    private BigDecimal defaultMoney ;
+
+    /**
+     * 消费金总额
+     */
+    @Column(name = "total_expenditure")
+    private BigDecimal totalExpenditure;
 
 }

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

@@ -323,4 +323,8 @@ public class OrderRentVehicleDetail implements Serializable {
 	@Column(name = "used_day")
 	Integer usedDay;
 
+	@Column(name = "cost_detail_extend")
+	@ApiModelProperty(value = "费用其他明细 type：1--取消违约金；2--取消费用明细；3--提前还车费用明细；4--延期还车费用明细")
+	private String costDetailExtend;
+
 }

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

@@ -12,48 +12,58 @@ import java.math.BigDecimal;
  */
 
 @Data
-@ApiModel(value = "月订单统计实体")
+@ApiModel(value = "历史订单统计实体")
 public class OrderStatistics {
 
+
+
+
     /**
-     * 月成交总金额
+     * 历史交总金额
      */
-    @ApiModelProperty(value = "月成交总金额")
+    @ApiModelProperty(value = "历史交总金额")
     private BigDecimal totalGmv;
 
     /**
-     * 月押金总额
+     * 历史押金总额
      */
-    @ApiModelProperty(value = "月押金总额")
+    @ApiModelProperty(value = "历史押金总额")
     private BigDecimal totalSecurityDeposit;
 
     /**
-     * 月退还押金总额
+     * 历史退还押金总额
      */
-    @ApiModelProperty(value = "月退还押金总额")
+    @ApiModelProperty(value = "历史退还押金总额")
     private BigDecimal totalRefundSecurityDeposit;
 
     /**
-     * 月赔偿总额
+     * 历史赔偿总额
      */
-    @ApiModelProperty(value = "月赔偿总额")
+    @ApiModelProperty(value = "历史赔偿总额")
     private BigDecimal totalCompensation;
 
     /**
-     * 月违章总额
+     * 历史违章总额
      */
-    @ApiModelProperty(value = "月违章总额")
+    @ApiModelProperty(value = "历史违章总额")
     private BigDecimal totalForfeit;
 
+
+    /**
+     * 历史订单退款
+     */
+    @ApiModelProperty(value = "历史订单退款")
+    private BigDecimal totalReturnGmv;
+
     /**
-     * 月取消订单扣款总额
+     * 历史延期扣款总额
      */
-    @ApiModelProperty(value = "月取消订单扣款总额")
-    private BigDecimal totalPenalSum;
+    @ApiModelProperty(value = "历史延期扣款总额")
+    private BigDecimal totalDefaultMoney;
 
     /**
-     * 月延期扣款总额
+     * 历史实际消费总额
      */
-    @ApiModelProperty(value = "月延期扣款总额")
-    private BigDecimal totalPostpone;
+    @ApiModelProperty(value = "实际消费总额")
+    private BigDecimal totalExpenditure;
 }

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

@@ -245,6 +245,10 @@ public class OrderTourDetail implements Serializable {
 	@ApiModelProperty(value = "是否省外 1--省外；0--省内")
 	private Integer isOutside;
 
+	@Column(name = "cost_detail_extend")
+	@ApiModelProperty(value = "费用其他明细 type：1--取消违约金；2--取消费用明细；3--提前还车费用明细；4--延期还车费用明细")
+	private String costDetailExtend;
+
 	@Transient
 	private List<TourUser> userVoList;
 }

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

+package com.xxfc.platform.order.pojo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class HomePageOrderData {
+    /**
+     * 订单总额
+     */
+    private BigDecimal totalOrders;
+    /**
+     * 为退还押金总额
+     */
+    private BigDecimal totalOutstandingDeposit;
+
+    /**
+     * 额外赔款
+     */
+    private BigDecimal additionalIndemnity;
+
+}

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

+package com.xxfc.platform.order.pojo.account;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xxfc.platform.order.entity.OrderAccount;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.Column;
+
+@Data
+public class   OrderAccountDTO extends OrderAccount {
+
+    @Column(name = "companyId")
+    private Integer companyId;
+
+    @Column(name = "oneDay")
+    private String oneDay;
+}

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

@@ -9,7 +9,7 @@ import java.util.List;
 @Data
 public class OrderAccountDetail {
     /**
-     * 实际返回订单款
+     * 实际返回订单款 账单的的orderAmount 对应的是 订单的商品金额
      */
     BigDecimal orderAmount;
     /**
@@ -17,7 +17,7 @@ public class OrderAccountDetail {
      */
     BigDecimal depositAmount;
     /**
-     * 原来要返回的订单款
+     * 原来要返回的订单款 账单的的orderAmount 对应的是 订单的商品金额
      */
     BigDecimal originOrderAmount;
     /**

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

@@ -23,6 +23,11 @@ public class InProgressVO {
      */
     BigDecimal extraAmount = BigDecimal.ZERO;
 
+    /**
+     * 实际消费金额
+     */
+    BigDecimal consumeAmount = BigDecimal.ZERO;
+
     /**
      * 已使用天数
      */

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

@@ -30,6 +30,7 @@ public class OrderListVo extends BaseOrder {
 
     private String endCompanyName;
 
+    private String realName;
     /**
      * 是否是用户匹配公司
      */

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

+package com.xxfc.platform.order.pojo.price;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class CancelNoStartVO extends CostDetailExtend{
+
+    /**
+     * 违约金描述
+     */
+    private String violateDesc;
+
+    /**
+     * 违约金额
+     */
+    private BigDecimal violateAmount = BigDecimal.ZERO;
+
+    public CancelNoStartVO() {
+        this.type = CANCEL_NO_START;
+    }
+}

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

+package com.xxfc.platform.order.pojo.price;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class CancelStartedVO extends CostDetailExtend {
+    /**
+     * 消费金额（实际计费）
+     */
+    private BigDecimal consumeAmount;
+
+    /**
+     * 租车单价
+     */
+    private BigDecimal modelAmount;
+
+    /**
+     * 使用天数
+     */
+    private Integer usedDayNum;
+
+    /**
+     * 使用金额
+     */
+    private BigDecimal usedAmount;
+
+    /**
+     * 使用免费天数
+     */
+    private Integer usedfreeDayNum;
+
+    /**
+     * 使用免费金额
+     */
+    private BigDecimal usedFreeAmount;
+
+    /**
+     * 违约金描述
+     */
+    private String violateDesc;
+
+    /**
+     * 违约金金额
+     */
+    private BigDecimal violateAmount;
+}

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

+package com.xxfc.platform.order.pojo.price;
+
+import lombok.Data;
+
+@Data
+public class CostDetailExtend {
+
+    public static final int CANCEL_NO_START = 1;
+    public static final int CANCEL_STARTED = 2;
+    public static final int FINLISH_ADVANCE = 3;
+    public static final int FINLISH_DELAY = 4;
+
+    private String costDetail;
+
+    /**
+     * type：1--取消违约金；2--取消费用明细；3--提前还车费用明细；4--延期还车费用明细
+     */
+    protected Integer type;
+}

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

@@ -7,7 +7,7 @@ import java.math.BigDecimal;
 
 @Data
 public class OrderPriceVO {
-    @ApiModelProperty(value = "订单价格")
+    @ApiModelProperty(value = "订单总金额")
     public BigDecimal orderAmount;
     @ApiModelProperty(value = "商品价格")
     public BigDecimal goodsAmount;

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

@@ -180,7 +180,6 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
                 getDriverInfo(orderPageVo);
             } else if (orderPageVo.getStatus() >= 5 || orderPageVo.getStatus() == -1) {//出行中 已交车
                 //设置违约金金额
-                updateCrossRefund(orderPageVo);
                 getDriverInfo(orderPageVo);
                 getUserLicense(orderPageVo);
             }
@@ -261,10 +260,10 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
             //提前的天数, 当天就算使用一天
             int noUsedDay = getDaysBetweenDateTime(nowTime, endTime) - 1;
             //退还未使用的天数，或者金额，扣除违约金，实际未使用天数的金额，最多3000元
-            InProgressVO inProgressVO = new InProgressVO();
-            inProgressVO.setViolateAmount(new BigDecimal(200));
-            inProgressVO.setExtraAmount(new BigDecimal(200));
-            //InProgressVO inProgressVO = orderCalculateBiz.inProgressCalculate(orderPageVO, actualDay - noUsedDay);
+//            InProgressVO inProgressVO = new InProgressVO();
+//            inProgressVO.setViolateAmount(new BigDecimal(200));
+//            inProgressVO.setExtraAmount(new BigDecimal(200));
+            InProgressVO inProgressVO = orderCalculateBiz.inProgressCalculate(orderPageVO, actualDay - noUsedDay);
             if (inProgressVO != null) {
                 //消费超额金
                 if(inProgressVO.getExtraAmount() != null) {
@@ -330,7 +329,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
                 orderVehicleCrosstownDto.setLicenseName(orderUserLicenses.get(0).getLicenseName());
                 orderVehicleCrosstownDto.setLicensePhone(orderUserLicenses.get(0).getLicensePhone());
             }
-            //设置保留金
+            //设置违约明细
             for (OrderVehicleCrosstownDto a : orderVehicleCrosstown) {
                 if(a.getType() != CrosstownTypeEnum.DEPARTURE.getCode()) {
                     if(StringUtils.isNotBlank(a.getViolateDetail())) {
@@ -339,6 +338,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
                 }
             }
         }
+        if (StringUtils.isBlank(orderPageVo.getDedDetailDTO())) {
+            updateCrossRefund(orderPageVo);
+        }
         orderPageVo.setOrderVehicleCrosstownDto(orderVehicleCrosstownDto);
     }
 
@@ -433,8 +435,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
 
             //订单账款类
             OrderAccountDetail oad = new OrderAccountDetail();
-            oad.setOriginOrderAmount(baseOrder.getRealAmount());
-            oad.setOrderAmount(baseOrder.getRealAmount());
+            oad.setOriginOrderAmount(baseOrder.getGoodsAmount());
+            //账单的的orderAmount 对应 的是商品金额
+            oad.setOrderAmount(baseOrder.getGoodsAmount());
 
             //如果是会员订单，则触发会员效益
             if (OrderTypeEnum.MEMBER.getCode().equals(baseOrder.getType())) {

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

 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.OrderAccount;
 import com.xxfc.platform.order.entity.OrderStatistics;
 import com.xxfc.platform.order.mapper.DailyMembersOrderStatisticsMapper;
+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;
 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;
@@ -33,31 +42,31 @@ public class DailyMembersOrderStatisticsBiz extends BaseBiz<DailyMembersOrderSta
     @Value("${order.day}")
     private Integer day;
 
+    /**
+     * 总公司id默认为1
+     */
+    private final Integer OMPANY_ID=1;
+    @Autowired
+    private OrderAccountBiz accountBiz;
+
     @Transactional(rollbackFor = Exception.class)
-    public boolean memberOrderStatistics() {
+    public boolean saveDailyMembersOrderRecord() {
         try {
+            List<OrderAccountDTO> accountList = accountBiz.getOrderAccountByOrderType(OrderTypeEnum.MEMBER.getCode(), day);
 
-            Map<String, Object> travelGmv = mapper.getTravelGmv(day);
-            if (travelGmv.isEmpty()) {
-                return true;
-            }
-
-
-            DailyMembersOrderStatistics MembersStatistics = new DailyMembersOrderStatistics();
-            BeanUtils.copyProperties(MembersStatistics, travelGmv);
-
-            String oneDay = MembersStatistics.getOneDay();
-
-            if (StringUtils.isBlank(oneDay)) {
-                throw new BaseException();
+            if (CollectionUtils.isNotEmpty(accountList)) {
+                DailyMembersOrderStatistics orderStatistics = new DailyMembersOrderStatistics();
+                ArrayList<OrderAccountDetail> orderAccountDetails = getOrderAccountDetail(accountList);
+                if (CollectionUtils.isNotEmpty(orderAccountDetails)) {
+                    //获取订单总额
+                    BigDecimal gmv = getOrderAmountTotal(orderAccountDetails);
+                    orderStatistics.setGmv(gmv);
+                    orderStatistics.setBranchCompanyId(OMPANY_ID);
+                    orderStatistics.setOneDay(accountList.get(0).getOneDay());
+                }
+                insertSelectiveRe(orderStatistics);
             }
 
-            Example exa = new Example(DailyMembersOrderStatistics.class);
-            exa.createCriteria().andEqualTo("oneDay", oneDay);
-            List<DailyMembersOrderStatistics> statistics = selectByExample(exa);
-            if (CollectionUtils.isEmpty(statistics)) {
-                insertSelective(MembersStatistics);
-            }
             return true;
         } catch (Exception e) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -66,6 +75,37 @@ public class DailyMembersOrderStatisticsBiz extends BaseBiz<DailyMembersOrderSta
         }
     }
 
+    /**
+     * 获取押金和
+     *
+     * @param orderAccountDetails
+     * @return
+     */
+    private BigDecimal getOrderAmountTotal(ArrayList<OrderAccountDetail> orderAccountDetails) {
+        return orderAccountDetails.stream()
+                .map(OrderAccountDetail::getOrderAmount)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+    }
+
+    /**
+     * 获取所有订单详情数据
+     *
+     * @param orderAccountDTOS
+     * @return
+     */
+    private ArrayList<OrderAccountDetail> getOrderAccountDetail(List<OrderAccountDTO> orderAccountDTOS) {
+        ArrayList<OrderAccountDetail> arrayList = Lists.newArrayList();
+        orderAccountDTOS.parallelStream()
+                .map(OrderAccount::getAccountDetail)
+                .forEach(detail -> {
+                    if (StringUtils.isNotBlank(detail)) {
+                        arrayList.add(JSONUtil.toBean(detail, OrderAccountDetail.class));
+                    }
+                });
+
+        return arrayList;
+    }
+
     @Override
     public int insertSelectiveRe(DailyMembersOrderStatistics entity) {
         Date date = new Date();

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

@@ -27,9 +27,9 @@ public class DailyOrderStatisticsBiz extends BaseBiz<DailyOrderStatisticsMapper,
 
     @Scheduled(cron = "0 0 2 * * ?")
     public boolean statisticalOrder(){
-        boolean vehicleFlag = vehicleStatisticsBiz.StatisticsOfCarRentalOrders();
-        boolean travelFlag = travelStatisticsBiz.StatisticsOfTravelOrders();
-        boolean membersFlag= membersStatisticsBiz.memberOrderStatistics();
+        boolean vehicleFlag = vehicleStatisticsBiz.saveDailyVehicleOrderRecord();
+        boolean travelFlag = travelStatisticsBiz.saveDailyTravelOrderRecord();
+        boolean membersFlag= membersStatisticsBiz.saveDailyMembersOrderRecord();
         if (vehicleFlag&&travelFlag&&membersFlag){
             log.info("----statisticalOrder:成功-----");
             return true;

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

@@ -2,20 +2,33 @@ package com.xxfc.platform.order.biz;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
+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.google.common.collect.Maps;
+import com.xxfc.platform.order.contant.enumerate.DeductionTypeEnum;
+import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
+import com.xxfc.platform.order.contant.enumerate.RefundTypeEnum;
 import com.xxfc.platform.order.entity.DailyTravelOrderStatistics;
+import com.xxfc.platform.order.entity.OrderAccount;
 import com.xxfc.platform.order.entity.OrderStatistics;
 import com.xxfc.platform.order.mapper.DailyTravelOrderStatisticsMapper;
+import com.xxfc.platform.order.pojo.account.OrderAccountDTO;
+import com.xxfc.platform.order.pojo.account.OrderAccountDeduction;
+import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 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.*;
 import java.util.stream.Collectors;
 
@@ -30,64 +43,258 @@ public class DailyTravelOrderStatisticsBiz extends BaseBiz<DailyTravelOrderStati
     @Value("${order.day}")
     private Integer day;
 
-     @Transactional(rollbackFor = Exception.class)
-    public boolean StatisticsOfTravelOrders() {
-        try {
 
-            ArrayList<DailyTravelOrderStatistics> objects = new ArrayList<>();
-            List<DailyTravelOrderStatistics> travelGmv = mapper.getTravelGmv(day);
-            objects.addAll(travelGmv);
-            List<DailyTravelOrderStatistics> travelPenalSum = mapper.getTravelPenalSum(day);
-            objects.addAll(travelPenalSum);
-            insertByList(objects);
+    @Autowired
+    private OrderAccountBiz accountBiz;
+//     @Transactional(rollbackFor = Exception.class)
+//    public boolean StatisticsOfTravelOrders() {
+//        try {
+//
+//            ArrayList<DailyTravelOrderStatistics> objects = new ArrayList<>();
+//            List<DailyTravelOrderStatistics> travelGmv = mapper.getTravelGmv(day);
+//            objects.addAll(travelGmv);
+//            List<DailyTravelOrderStatistics> travelPenalSum = mapper.getTravelPenalSum(day);
+//            objects.addAll(travelPenalSum);
+//            insertByList(objects);
+//
+//            return true;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+//            return false;
+//        }
+//    }
+//
+//    private void insertByList(ArrayList<DailyTravelOrderStatistics> objects) throws Exception {
+//
+//        if (CollectionUtils.isNotEmpty(objects)) {
+//            HashMap<Integer, DailyTravelOrderStatistics> map = new HashMap<>();
+//            for (DailyTravelOrderStatistics object : objects) {
+//
+//                DailyTravelOrderStatistics statistics = map.get(object.getBranchCompanyId());
+//                if (statistics == null) {
+//                    statistics = new DailyTravelOrderStatistics();
+//                    map.put(object.getBranchCompanyId(), statistics);
+//                }
+//
+//                BeanUtil.copyProperties(object, statistics, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+//
+//            }
+//            String oneDay = map.entrySet().parallelStream().map(Map.Entry::getValue).collect(Collectors.toList()).get(0).getOneDay();
+//
+//            if (StringUtils.isBlank(oneDay)) {
+//                throw new BaseException();
+//            }
+//            Example exa= new Example(DailyTravelOrderStatistics.class);
+//            exa.createCriteria().andEqualTo("oneDay",oneDay);
+//            List<DailyTravelOrderStatistics> statistics= selectByExample(exa);
+//            if (CollectionUtils.isEmpty(statistics)){
+//                for (Map.Entry<Integer, DailyTravelOrderStatistics> entry : map.entrySet()) {
+//                    insertSelectiveRe(entry.getValue());
+//                }
+//            }else {
+//                log.error("今日已统计车辆订单,请不要重复统计!");
+//            }
+//
+////
+////            for (Map.Entry<Integer, DailyTravelOrderStatistics> e : map.entrySet()) {
+////                insertSelectiveRe(e.getValue());
+////            }
+//        }
+//    }
+/******************************************************************************************************************************/
 
+    /**
+     * 统计订单并保存到数据库当中
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public boolean saveDailyTravelOrderRecord() {
+        try {
+            //获取每日订单统计
+            List<DailyTravelOrderStatistics> orderStatistics = getDailyTravelOrderStatistics();
+            if (CollectionUtils.isNotEmpty(orderStatistics)) {
+                for (DailyTravelOrderStatistics orderStatistic : orderStatistics) {
+                    //保存统计
+                    insertSelectiveRe(orderStatistic);
+                }
+            }
             return true;
         } catch (Exception e) {
-            e.printStackTrace();
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            log.error(e.getMessage());
             return false;
         }
     }
 
-    private void insertByList(ArrayList<DailyTravelOrderStatistics> objects) throws Exception {
+    private List<DailyTravelOrderStatistics> getDailyTravelOrderStatistics() {
+        //获取当天所有订单账目
+        List<OrderAccountDTO> accountList = accountBiz.getOrderAccountByOrderType(OrderTypeEnum.TOUR.getCode(), day);
+        if (CollectionUtils.isEmpty(accountList)) {
+            return null;
+        }
+        //获取每个分公司,当天所有的订单帐目
+        HashMap<Integer, List<OrderAccountDTO>> companyIdmap = new HashMap<>();
+        for (OrderAccountDTO orderAccountDTO : accountList) {
+            List<OrderAccountDTO> list = companyIdmap.get(orderAccountDTO.getCompanyId());
+            if (list == null) {
+                list = new ArrayList<>();
+                companyIdmap.put(orderAccountDTO.getCompanyId(), list);
+            }
+            list.add(orderAccountDTO);
+        }
 
-        if (CollectionUtils.isNotEmpty(objects)) {
-            HashMap<Integer, DailyTravelOrderStatistics> map = new HashMap<>();
-            for (DailyTravelOrderStatistics object : objects) {
+        //获取每个公司当天订单的总数据
+        ArrayList<DailyTravelOrderStatistics> statistics = new ArrayList<>();
+        for (Map.Entry<Integer, List<OrderAccountDTO>> integerListEntry : companyIdmap.entrySet()) {
+            //获取不同类型的账单详情
+            List<OrderAccountDTO> orderAccountDTOS = integerListEntry.getValue();
+            if (CollectionUtils.isNotEmpty(orderAccountDTOS)) {
+                Map<Integer, List<OrderAccountDTO>> typeMap = Maps.newHashMap();
+                for (OrderAccountDTO orderAccountDTO : orderAccountDTOS) {
+                    List<OrderAccountDTO> list = typeMap.get(orderAccountDTO.getAccountType());
+                    if (list == null) {
+                        list = new ArrayList<>();
+                        companyIdmap.put(orderAccountDTO.getAccountType(), list);
+                    }
+                    list.add(orderAccountDTO);
+                }
 
-                DailyTravelOrderStatistics statistics = map.get(object.getBranchCompanyId());
-                if (statistics == null) {
-                    statistics = new DailyTravelOrderStatistics();
-                    map.put(object.getBranchCompanyId(), statistics);
+                if (MapUtils.isNotEmpty(typeMap)) {
+                    //获取该公司当天的账单数据
+                    if (CollectionUtils.isNotEmpty(orderAccountDTOS)) {
+                        DailyTravelOrderStatistics dvos = getStatisticsByOrderAccountDetail(typeMap);
+                        if (dvos != null) {
+                            statistics.add(dvos);
+                            dvos.setBranchCompanyId(integerListEntry.getKey());
+                            dvos.setOneDay(orderAccountDTOS.get(0).getOneDay());
+                        }
+                    }
                 }
+            }
+        }
+
+        return statistics;
+    }
 
-                BeanUtil.copyProperties(object, statistics, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+    private DailyTravelOrderStatistics getStatisticsByOrderAccountDetail(Map<Integer, List<OrderAccountDTO>> map) {
+        //获取收入金额
+        DailyTravelOrderStatistics orderStatistics = getGmvAndSecurityDeposit(map);
+        //获取扣款和退还金额
+        refundAndDeductions(map, orderStatistics);
+        return orderStatistics;
+        
+    }
 
+    /**
+     * 获取扣款和退款金额
+     *
+     * @param map
+     * @param orderStatistics
+     */
+    private void refundAndDeductions(Map<Integer, List<OrderAccountDTO>> map, DailyTravelOrderStatistics orderStatistics) {
+        ArrayList<OrderAccountDTO> arrayList = Lists.newArrayList();
+        for (Integer key : map.keySet()) {
+            if (!key.equals(RefundTypeEnum.ORDER_FUND.getCode())) {
+                arrayList.addAll(map.get(key));
             }
-            String oneDay = map.entrySet().parallelStream().map(Map.Entry::getValue).collect(Collectors.toList()).get(0).getOneDay();
+        }
+        if (CollectionUtils.isNotEmpty(arrayList)) {
+            ArrayList<OrderAccountDetail> orderAccountDetail = getOrderAccountDetail(arrayList);
+            if (CollectionUtils.isNotEmpty(orderAccountDetail)) {
+                List<OrderAccountDeduction> OrderAccountDeductions = gettDeductions(orderAccountDetail);
+                //获取违约总额
+                BigDecimal bigDecimal = get(OrderAccountDeductions, new ArrayList<Integer>() {{
+                    add(DeductionTypeEnum.VIOLATE_CANCEL.getCode());
+                }});
+                orderStatistics.setDefaultMoney(bigDecimal);
+
+                //订单退还总额
+                orderStatistics.setReturnGmv(orderStatistics.getGmv().subtract(bigDecimal));
 
-            if (StringUtils.isBlank(oneDay)) {
-                throw new BaseException();
             }
-            Example exa= new Example(DailyTravelOrderStatistics.class);
-            exa.createCriteria().andEqualTo("oneDay",oneDay);
-            List<DailyTravelOrderStatistics> statistics= selectByExample(exa);
-            if (CollectionUtils.isEmpty(statistics)){
-                for (Map.Entry<Integer, DailyTravelOrderStatistics> entry : map.entrySet()) {
-                    insertSelectiveRe(entry.getValue());
-                }
-            }else {
-                log.error("今日已统计车辆订单,请不要重复统计!");
+        }
+    }
+   
+
+    
+    private DailyTravelOrderStatistics getGmvAndSecurityDeposit(Map<Integer, List<OrderAccountDTO>> map) {
+        DailyTravelOrderStatistics orderStatistics = new DailyTravelOrderStatistics();
+        List<OrderAccountDTO> orderAccountDTOS = map.get(RefundTypeEnum.ORDER_FUND.getCode());
+
+        if (CollectionUtils.isNotEmpty(orderAccountDTOS)) {
+            ArrayList<OrderAccountDetail> orderAccountDetails = getOrderAccountDetail(orderAccountDTOS);
+            if (CollectionUtils.isNotEmpty(orderAccountDetails)) {
+                //获取订单总额
+                BigDecimal gmv = getOrderAmountTotal(orderAccountDetails);
+                orderStatistics.setGmv(gmv);
+
             }
+        }
+        return orderStatistics;
+    }
 
-//
-//            for (Map.Entry<Integer, DailyTravelOrderStatistics> e : map.entrySet()) {
-//                insertSelectiveRe(e.getValue());
-//            }
+    /**
+     * 获取金额详情
+     *
+     * @param orderAccountDTOS
+     * @return
+     */
+    private ArrayList<OrderAccountDetail> getOrderAccountDetail(List<OrderAccountDTO> orderAccountDTOS) {
+        ArrayList<OrderAccountDetail> arrayList = Lists.newArrayList();
+        orderAccountDTOS.parallelStream()
+                .map(OrderAccount::getAccountDetail)
+                .forEach(detail -> {
+                    if (StringUtils.isNotBlank(detail)) {
+                        arrayList.add(JSONUtil.toBean(detail, OrderAccountDetail.class));
+                    }
+                });
+
+        return arrayList;
+    }
+
+
+    /**
+     * 获取订单和
+     *
+     * @param orderAccountDetails
+     * @return
+     */
+    private BigDecimal getOrderAmountTotal(ArrayList<OrderAccountDetail> orderAccountDetails) {
+        return orderAccountDetails.stream()
+                .map(OrderAccountDetail::getOrderAmount)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+    }
+
+    /**
+     * 获取赔款数据
+     *
+     * @param orderAccountDetails
+     * @return
+     */
+    private List<OrderAccountDeduction> gettDeductions(ArrayList<OrderAccountDetail> orderAccountDetails) {
+        ArrayList<OrderAccountDeduction> arrayList = Lists.newArrayList();
+        for (OrderAccountDetail orderAccountDetail : orderAccountDetails) {
+            arrayList.addAll(orderAccountDetail.getDeductions());
         }
+        return arrayList;
     }
 
 
+    /**
+     * 根据type获取对应的金额总和
+     *
+     * @param OrderAccountDeduction
+     * @param type                  金额类型
+     * @return
+     */
+    private BigDecimal get(List<OrderAccountDeduction> OrderAccountDeduction, List<Integer> type) {
+        return OrderAccountDeduction.parallelStream()
+                .filter(el -> el.getType().equals(type))
+                .map(com.xxfc.platform.order.pojo.account.OrderAccountDeduction::getAmount)
+                .reduce(BigDecimal.ZERO,BigDecimal::add);
+
+    }
+
     @Override
     public int insertSelectiveRe(DailyTravelOrderStatistics entity) {
         entity.setCrtTime(new Date());

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

@@ -2,29 +2,35 @@ package com.xxfc.platform.order.biz;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
+import cn.hutool.db.sql.Order;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
-import com.xxfc.platform.order.entity.DailyOrderStatistics;
+import com.github.wxiaoqi.security.common.util.JsonUtil;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.xxfc.platform.order.contant.enumerate.DeductionTypeEnum;
+import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
+import com.xxfc.platform.order.contant.enumerate.RefundTypeEnum;
 import com.xxfc.platform.order.entity.DailyVehicleOrderStatistics;
+import com.xxfc.platform.order.entity.OrderAccount;
 import com.xxfc.platform.order.entity.OrderStatistics;
 import com.xxfc.platform.order.mapper.DailyVehicleOrderStatisticsMapper;
-import com.xxfc.platform.order.pojo.DedDetailDTO;
+import com.xxfc.platform.order.pojo.account.OrderAccountDTO;
+import com.xxfc.platform.order.pojo.account.OrderAccountDeduction;
+import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 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 sun.rmi.runtime.Log;
-import tk.mybatis.mapper.entity.Example;
-import tk.mybatis.mapper.weekend.WeekendSqls;
 
-import javax.print.attribute.standard.MediaSize;
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 每日租车订单统计
@@ -34,185 +40,430 @@ import java.util.stream.Collectors;
 @Service
 @Slf4j
 public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderStatisticsMapper, DailyVehicleOrderStatistics> {
-
+    /**
+     * 延期
+     */
     private final Integer TYPE_DEFERRED = 1;
+    /**
+     * 损坏
+     */
     private final Integer TYPE_DAMAGE = 2;
+    /**
+     * 其他
+     */
     private final Integer TYPE_OTHER = 3;
 
+    /**
+     * 统计几天前的数据
+     */
     @Value("${order.day}")
     private Integer day;
 
-    @Transactional(rollbackFor = Exception.class)
-    public boolean StatisticsOfCarRentalOrders() {
-
-        try {
-
-            ArrayList<DailyVehicleOrderStatistics> result = new ArrayList<>();
 
-//        获取每日租车订单成交金和押金总额
-            List<DailyVehicleOrderStatistics> gmvAndMarginTotal = mapper.getGmvAndMarginTotal(day);
-            result.addAll(gmvAndMarginTotal);
+    @Autowired
+    private OrderAccountBiz accountBiz;
+
+
+//    @Transactional(rollbackFor = Exception.class)
+//    public boolean StatisticsOfCarRentalOrders() {
+//
+//        try {
+//
+//            ArrayList<DailyVehicleOrderStatistics> result = new ArrayList<>();
+//
+////        获取每日租车订单成交金和押金总额
+//            List<DailyVehicleOrderStatistics> gmvAndMarginTotal = mapper.getGmvAndMarginTotal(day);
+//            result.addAll(gmvAndMarginTotal);
+//
+////        获取取消订单扣款总额
+//            List<DailyVehicleOrderStatistics> penalSum = mapper.getPenalSum(day);
+//            result.addAll(penalSum);
+//
+////        获取订单退还押金总额
+//            List<DailyVehicleOrderStatistics> refundSecurityDeposit = mapper.getRefundSecurityDeposit(day);
+//            result.addAll(refundSecurityDeposit);
+//
+////        获取违章查询总和
+//            List<DailyVehicleOrderStatistics> violationMoney = mapper.getViolationMoney(day);
+//            result.addAll(violationMoney);
+//
+////        获取赔偿和延期JSON字符串
+//            List<Map> compensationAndPostpone = mapper.getCompensationAndPostpone(day);
+////        获取赔偿和延期JSON字符串转换为map
+//            List<DailyVehicleOrderStatistics> compensationAndPostpones = getCompensationAndPostpones(compensationAndPostpone);
+//            result.addAll(compensationAndPostpones);
+//
+//            InsertByList(result);
+//            return true;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+//            return false;
+//        }
+//
+//    }
+//
+//    private void InsertByList(ArrayList<DailyVehicleOrderStatistics> result) throws Exception {
+//        if (CollectionUtils.isNotEmpty(result)) {
+//
+//            Map<Integer, DailyVehicleOrderStatistics> map = new HashMap<>();
+//
+//            for (DailyVehicleOrderStatistics value : result) {
+//                Integer branchCompanyId = value.getBranchCompanyId();
+//                DailyVehicleOrderStatistics statistics = map.get(branchCompanyId);
+//
+//                if (statistics == null) {
+//                    statistics = new DailyVehicleOrderStatistics();
+//                    map.put(branchCompanyId, statistics);
+//                }
+//                BeanUtil.copyProperties(
+//                        value,
+//                        statistics,
+//                        CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+//            }
+//
+//            String oneDay = map.entrySet().parallelStream().map(Map.Entry::getValue).collect(Collectors.toList()).get(0).getOneDay();
+//            if (StringUtils.isBlank(oneDay)) {
+//                throw new BaseException();
+//            }
+//            Example exa = new Example(DailyVehicleOrderStatistics.class);
+//            exa.createCriteria().andEqualTo("oneDay", oneDay);
+//            List<DailyVehicleOrderStatistics> statistics = selectByExample(exa);
+//
+//            if (CollectionUtils.isEmpty(statistics)) {
+//                for (Map.Entry<Integer, DailyVehicleOrderStatistics> entry : map.entrySet()) {
+//                    insertSelectiveRe(entry.getValue());
+//                }
+//            } else {
+//                log.error("今日已统计车辆订单,请不要重复统计!");
+//            }
+//        }
+//
+//    }
+//
+//
+//    /**
+//     * 获取赔偿总额和延期总额
+//     */
+//    private List<DailyVehicleOrderStatistics> getCompensationAndPostpones(List<Map> list) {
+//
+//        if (CollectionUtils.isNotEmpty(list)) {
+//            //获取分公全部赔偿和延期DedDetailDTO
+//            HashMap<Integer, List<DedDetailDTO>> map = new HashMap<>();
+//
+//            for (Map value : list) {
+//                if (value != null) {
+//
+//                    //获取分公司id
+//                    Integer branchCompanyId = (Integer) value.get("branchCompanyId");
+//                    List<DedDetailDTO> strings = map.get(branchCompanyId);
+//                    if (strings == null) {
+//                        strings = new ArrayList<DedDetailDTO>();
+//                        map.put(branchCompanyId, strings);
+//                    }
+//
+//                    String str = (String) value.get("dedDetail");
+//
+//                    if (StringUtils.isNotBlank(str)) {
+//                        List<DedDetailDTO> dedDetailDTOS = JSON.parseArray(str, DedDetailDTO.class);
+//                        if (CollectionUtils.isNotEmpty(dedDetailDTOS)) {
+//                            strings.addAll(dedDetailDTOS);
+//                        }
+//                    }
+//                }
+//
+//            }
+//
+//
+//            List<DailyVehicleOrderStatistics> result = new ArrayList<>();
+//
+//            if (!map.isEmpty()) {
+//
+//                //获取分工对象集合
+//                for (Map.Entry<Integer, List<DedDetailDTO>> entry : map.entrySet()) {
+//                    DailyVehicleOrderStatistics statistics = new DailyVehicleOrderStatistics();
+//                    //公司id添加到对象当中
+//                    statistics.setBranchCompanyId(entry.getKey());
+//
+//                    //获取公司的JSON字符串
+//                    List<DedDetailDTO> sumDedDetailDTOs = entry.getValue();
+//
+////            获取赔偿金额总和
+//                    BigDecimal compensation = get(sumDedDetailDTOs, TYPE_DAMAGE);
+//                    statistics.setCompensation(compensation);
+////            获取延期金额总和
+//                    BigDecimal postpone = get(sumDedDetailDTOs, TYPE_DEFERRED);
+//                    statistics.setPostpone(postpone);
+//////            其他款项总金额
+////                    BigDecimal other = get(sumDedDetailDTOs, TYPE_OTHER);
+//
+//                    result.add(statistics);
+//                }
+//
+//            }
+//
+//
+//            return result;
+//        }
+//        return new ArrayList<>();
+//    }
+    /****************************************************************************************************************************/
 
-//        获取取消订单扣款总额
-            List<DailyVehicleOrderStatistics> penalSum = mapper.getPenalSum(day);
-            result.addAll(penalSum);
 
-//        获取订单退还押金总额
-            List<DailyVehicleOrderStatistics> refundSecurityDeposit = mapper.getRefundSecurityDeposit(day);
-            result.addAll(refundSecurityDeposit);
-
-//        获取违章查询总和
-            List<DailyVehicleOrderStatistics> violationMoney = mapper.getViolationMoney(day);
-            result.addAll(violationMoney);
-
-//        获取赔偿和延期JSON字符串
-            List<Map> compensationAndPostpone = mapper.getCompensationAndPostpone(day);
-//        获取赔偿和延期JSON字符串转换为map
-            List<DailyVehicleOrderStatistics> compensationAndPostpones = getCompensationAndPostpones(compensationAndPostpone);
-            result.addAll(compensationAndPostpones);
+    /**
+     * 根据type获取对应的金额总和
+     *
+     * @param OrderAccountDeduction
+     * @param types                  金额类型
+     * @return
+     */
+    private BigDecimal get(List<OrderAccountDeduction> OrderAccountDeduction, List<Integer> types) {
+        return OrderAccountDeduction.parallelStream()
+                .filter(el -> types.contains(el))
+                .map(com.xxfc.platform.order.pojo.account.OrderAccountDeduction::getAmount)
+                .reduce(BigDecimal.ZERO,BigDecimal::add);
 
-            InsertByList(result);
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return false;
-        }
+    }
 
+    /***
+     * 添加每日记录
+     * @param entity
+     * @return
+     */
+    @Override
+    public int insertSelectiveRe(DailyVehicleOrderStatistics entity) {
+        entity.setCrtTime(new Date());
+        return mapper.insertSelective(entity);
     }
 
-    private void InsertByList(ArrayList<DailyVehicleOrderStatistics> result) throws Exception {
-        if (CollectionUtils.isNotEmpty(result)) {
 
-            Map<Integer, DailyVehicleOrderStatistics> map = new HashMap<>();
+    public OrderStatistics findAll(Integer companyId) {
+        return mapper.monthOrderTotal(companyId);
+    }
 
-            for (DailyVehicleOrderStatistics value : result) {
-                Integer branchCompanyId = value.getBranchCompanyId();
-                DailyVehicleOrderStatistics statistics = map.get(branchCompanyId);
+    /**
+     * 统计订单并保存到数据库当中
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public boolean saveDailyVehicleOrderRecord() {
 
-                if (statistics == null) {
-                    statistics = new DailyVehicleOrderStatistics();
-                    map.put(branchCompanyId, statistics);
+        try {
+            //获取每日订单统计
+            List<DailyVehicleOrderStatistics> orderStatistics = getDailyVehicleOrderRecord();
+            if (CollectionUtils.isNotEmpty(orderStatistics)) {
+                for (DailyVehicleOrderStatistics orderStatistic : orderStatistics) {
+                    //保存统计
+                    insertSelectiveRe(orderStatistic);
                 }
-                BeanUtil.copyProperties(
-                        value,
-                        statistics,
-                        CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
             }
 
-            String oneDay = map.entrySet().parallelStream().map(Map.Entry::getValue).collect(Collectors.toList()).get(0).getOneDay();
-            if (StringUtils.isBlank(oneDay)) {
-                throw new BaseException();
-            }
-            Example  exa= new Example(DailyVehicleOrderStatistics.class);
-            exa.createCriteria().andEqualTo("oneDay",oneDay);
-            List<DailyVehicleOrderStatistics> statistics= selectByExample(exa);
-
-            if (CollectionUtils.isEmpty(statistics)){
-                for (Map.Entry<Integer, DailyVehicleOrderStatistics> entry : map.entrySet()) {
-                    insertSelectiveRe(entry.getValue());
-                }
-            }else {
-                log.error("今日已统计车辆订单,请不要重复统计!");
-            }
+            return true;
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            return false;
         }
-
     }
 
-
     /**
-     * 获取赔偿总额和延期总额
+     * 获取所有分公司每日统计记录
+     * @return
      */
-    private List<DailyVehicleOrderStatistics> getCompensationAndPostpones(List<Map> list) {
+    private List<DailyVehicleOrderStatistics> getDailyVehicleOrderRecord() {
+        //获取当天所有订单账目
+        List<OrderAccountDTO> accountList = accountBiz.getOrderAccountByOrderType(OrderTypeEnum.RENT_VEHICLE.getCode(), day);
+        if (CollectionUtils.isEmpty(accountList)) {
+            return null;
+        }
+        //获取每个分公司当天所有的订单帐目
+        HashMap<Integer, List<OrderAccountDTO>> companyIdmap = new HashMap<>();
+        for (OrderAccountDTO orderAccountDTO : accountList) {
+            List<OrderAccountDTO> list = companyIdmap.get(orderAccountDTO.getCompanyId());
+            if (list == null) {
+                list = new ArrayList<>();
+                companyIdmap.put(orderAccountDTO.getCompanyId(), list);
+            }
+            list.add(orderAccountDTO);
+        }
 
-        if (CollectionUtils.isNotEmpty(list)) {
-            //获取分公全部赔偿和延期DedDetailDTO
-            HashMap<Integer, List<DedDetailDTO>> map = new HashMap<>();
+        //获取每个公司当天订单的总数据
+        ArrayList<DailyVehicleOrderStatistics> statistics = new ArrayList<>();
+        for (Map.Entry<Integer, List<OrderAccountDTO>> integerListEntry : companyIdmap.entrySet()) {
+            //获取不同类型的账单详情
+            List<OrderAccountDTO> orderAccountDTOS = integerListEntry.getValue();
+            if (CollectionUtils.isNotEmpty(orderAccountDTOS)) {
+                Map<Integer, List<OrderAccountDTO>> typeMap = Maps.newHashMap();
+                for (OrderAccountDTO orderAccountDTO : orderAccountDTOS) {
 
-            for (Map value : list) {
-                if (value != null) {
+                    List<OrderAccountDTO> list = typeMap.get(orderAccountDTO.getAccountType());
+                    if (list == null) {
+                        list = new ArrayList<>();
+                        companyIdmap.put(orderAccountDTO.getAccountType(), list);
 
-                    //获取分公司id
-                    Integer branchCompanyId = (Integer) value.get("branchCompanyId");
-                    List<DedDetailDTO> strings = map.get(branchCompanyId);
-                    if (strings == null) {
-                        strings = new ArrayList<DedDetailDTO>();
-                        map.put(branchCompanyId, strings);
                     }
+                    list.add(orderAccountDTO);
+                }
 
-                    String str = (String) value.get("dedDetail");
-
-                    if (StringUtils.isNotBlank(str)) {
-                        List<DedDetailDTO> dedDetailDTOS = JSON.parseArray(str, DedDetailDTO.class);
-                        if (CollectionUtils.isNotEmpty(dedDetailDTOS)) {
-                            strings.addAll(dedDetailDTOS);
+                if (MapUtils.isNotEmpty(typeMap)) {
+                    //获取该公司当天的账单数据
+                    if (CollectionUtils.isNotEmpty(orderAccountDTOS)) {
+                        DailyVehicleOrderStatistics dvos = getStatisticsByOrderAccountDetail(typeMap);
+                        if (dvos != null) {
+                            statistics.add(dvos);
+                            dvos.setBranchCompanyId(integerListEntry.getKey());
+                            dvos.setOneDay(orderAccountDTOS.get(0).getOneDay());
                         }
                     }
                 }
-
             }
+        }
 
+        return statistics;
+    }
 
-            List<DailyVehicleOrderStatistics> result = new ArrayList<>();
-
-            if (!map.isEmpty()) {
 
-                //获取分工对象集合
-                for (Map.Entry<Integer, List<DedDetailDTO>> entry : map.entrySet()) {
-                    DailyVehicleOrderStatistics statistics = new DailyVehicleOrderStatistics();
-                    //公司id添加到对象当中
-                    statistics.setBranchCompanyId(entry.getKey());
+    /**
+     * 获取该分公司的统计数据
+     * @param map
+     * @return
+     */
+    private DailyVehicleOrderStatistics getStatisticsByOrderAccountDetail(Map<Integer, List<OrderAccountDTO>> map) {
+        //获取收入金额
+        DailyVehicleOrderStatistics orderStatistics = getGmvAndSecurityDeposit(map);
+        //获取扣款和退还金额
+        refundAndDeductions(map, orderStatistics);
+        return orderStatistics;
 
-                    //获取公司的JSON字符串
-                    List<DedDetailDTO> sumDedDetailDTOs = entry.getValue();
+    }
 
-//            获取赔偿金额总和
-                    BigDecimal compensation = get(sumDedDetailDTOs, TYPE_DAMAGE);
-                    statistics.setCompensation(compensation);
-//            获取延期金额总和
-                    BigDecimal postpone = get(sumDedDetailDTOs, TYPE_DEFERRED);
-                    statistics.setPostpone(postpone);
-////            其他款项总金额
-//                    BigDecimal other = get(sumDedDetailDTOs, TYPE_OTHER);
+    /**
+     * 获取扣款和退款金额
+     *
+     * @param map
+     * @param orderStatistics
+     */
+    private void refundAndDeductions(Map<Integer, List<OrderAccountDTO>> map, DailyVehicleOrderStatistics orderStatistics) {
+        ArrayList<OrderAccountDTO> arrayList = Lists.newArrayList();
+        for (Integer key : map.keySet()) {
+            if (!key.equals(RefundTypeEnum.ORDER_FUND.getCode())) {
+                arrayList.addAll(map.get(key));
+            }
+        }
+        if (CollectionUtils.isNotEmpty(arrayList)) {
+            ArrayList<OrderAccountDetail> orderAccountDetail = getOrderAccountDetail(arrayList);
+            if (CollectionUtils.isNotEmpty(orderAccountDetail)) {
+                //获取退还订总额
+                BigDecimal returnGmv = getOrderAmountTotal(orderAccountDetail);
+                orderStatistics.setReturnGmv(returnGmv);
+                //获取退还押金总额
+                BigDecimal refundSecurityDeposit = getDepositAmountTotal(orderAccountDetail);
+                orderStatistics.setRefundSecurityDeposit(refundSecurityDeposit);
+                List<OrderAccountDeduction> OrderAccountDeductions = gettDeductions(orderAccountDetail);
+                //获取违章总额
+                orderStatistics.setViolationMoney(get(OrderAccountDeductions, new ArrayList<Integer>(){{
+                    add(DeductionTypeEnum.VIOLATE_TRAFFIC_DEDUCT.getCode());
+                }}));
+                //获取损坏赔偿总额
+                orderStatistics.setCompensation(get(OrderAccountDeductions,new ArrayList<Integer>(){{
+                    add(DeductionTypeEnum.DAMAGES.getCode());
+                }} ));
+                //获取违约总额
+                ArrayList<Integer> types = Lists.newArrayList();
+                types.add(DeductionTypeEnum.VIOLATE_ADVANCE.getCode());
+                types.add(DeductionTypeEnum.VIOLATE_CANCEL.getCode());
+                types.add(DeductionTypeEnum.VIOLATE_DELAY.getCode());
+                orderStatistics.setDefaultMoney(get(OrderAccountDeductions,types));
+
+                //消费金额
+                orderStatistics.setTotalExpenditure(get(OrderAccountDeductions,new ArrayList<Integer>(){{
+                    add(DeductionTypeEnum.EXTRA.getCode());
+                }}));
+            }
+        }
+    }
 
-                    result.add(statistics);
-                }
+    /**
+     * 获取订单总额和预交押金总额
+     *
+     * @param map
+     * @return
+     */
+    private DailyVehicleOrderStatistics getGmvAndSecurityDeposit(Map<Integer, List<OrderAccountDTO>> map) {
+        DailyVehicleOrderStatistics orderStatistics = new DailyVehicleOrderStatistics();
+        List<OrderAccountDTO> orderAccountDTOS = map.get(RefundTypeEnum.ORDER_FUND.getCode());
 
-            }
+        if (CollectionUtils.isNotEmpty(orderAccountDTOS)) {
+            ArrayList<OrderAccountDetail> orderAccountDetails = getOrderAccountDetail(orderAccountDTOS);
+            if (CollectionUtils.isNotEmpty(orderAccountDetails)) {
+                //获取订单总额
+                BigDecimal gmv = getOrderAmountTotal(orderAccountDetails);
+                orderStatistics.setGmv(gmv);
+                //获取押金总额
+                BigDecimal securityDeposit = getDepositAmountTotal(orderAccountDetails);
+                orderStatistics.setSecurityDeposit(securityDeposit);
 
 
-            return result;
+            }
         }
-        return new ArrayList<>();
+        return orderStatistics;
     }
 
+    /**
+     * 获取订单和
+     *
+     * @param orderAccountDetails
+     * @return
+     */
+    private BigDecimal getDepositAmountTotal(ArrayList<OrderAccountDetail> orderAccountDetails) {
+        return orderAccountDetails.stream()
+                .map(OrderAccountDetail::getDepositAmount)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+    }
 
     /**
-     * 根据type获取对应的金额总和
+     * 获取押金和
      *
-     * @param sumDedDetailDTOs
-     * @param type             金额类型
+     * @param orderAccountDetails
      * @return
      */
-    private BigDecimal get(List<DedDetailDTO> sumDedDetailDTOs, Integer type) {
-        if (CollectionUtils.isNotEmpty(sumDedDetailDTOs)) {
-            BigDecimal aggregateAmount = sumDedDetailDTOs.stream()
-                    .filter(d -> type.equals(d.getType()))
-                    .map(DedDetailDTO::getCost)
-                    .reduce(BigDecimal.ZERO, BigDecimal::add);
-            return aggregateAmount;
+    private BigDecimal getOrderAmountTotal(ArrayList<OrderAccountDetail> orderAccountDetails) {
+        return orderAccountDetails.stream()
+                .map(OrderAccountDetail::getOrderAmount)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+    }
+
+    /**
+     * 获取赔款数据
+     *
+     * @param orderAccountDetails
+     * @return
+     */
+    private List<OrderAccountDeduction> gettDeductions(ArrayList<OrderAccountDetail> orderAccountDetails) {
+        ArrayList<OrderAccountDeduction> arrayList = Lists.newArrayList();
+        for (OrderAccountDetail orderAccountDetail : orderAccountDetails) {
+            arrayList.addAll(orderAccountDetail.getDeductions());
         }
-        return BigDecimal.ZERO;
+        return arrayList;
     }
 
+    /**
+     * 获取金额详情
+     *
+     * @param orderAccountDTOS
+     * @return
+     */
+    private ArrayList<OrderAccountDetail> getOrderAccountDetail(List<OrderAccountDTO> orderAccountDTOS) {
+        ArrayList<OrderAccountDetail> arrayList = Lists.newArrayList();
+        orderAccountDTOS.parallelStream()
+                .map(OrderAccount::getAccountDetail)
+                .forEach(detail -> {
+                    if (StringUtils.isNotBlank(detail)) {
+                        arrayList.add(JSONUtil.toBean(detail, OrderAccountDetail.class));
+                    }
+                });
 
-    @Override
-    public int insertSelectiveRe(DailyVehicleOrderStatistics entity) {
-        entity.setCrtTime(new Date());
-        return mapper.insertSelective(entity);
+        return arrayList;
     }
 
-    public OrderStatistics findAll(Integer companyId) {
-        return mapper.monthOrderTotal(companyId);
-    }
+
 }

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

@@ -13,6 +13,7 @@ import com.xxfc.platform.order.biz.inner.OrderMsgBiz;
 import com.xxfc.platform.order.contant.enumerate.*;
 import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.pojo.DedDetailDTO;
+import com.xxfc.platform.order.pojo.account.OrderAccountDTO;
 import com.xxfc.platform.order.pojo.account.OrderAccountDeduction;
 import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
@@ -85,17 +86,19 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
      * @param timeLag 与开始时间的时间差
      * @param dicParentKey
      */
-    public BigDecimal rentRefundProcessCancel(BaseOrder baseOrder, BigDecimal mainItemRealAmount, Long timeLag, String dicParentKey, BigDecimal depositAmount, BigDecimal originalDeductAmount) {
+    public BigDecimal rentRefundProcessCancel(BaseOrder baseOrder, BigDecimal mainItemRealAmount, Long timeLag, String dicParentKey, BigDecimal depositAmount, BigDecimal originalDeductAmount, OrderAccountDetail oad) {
         //计算退款金额
         //商品价格 - 优惠券减免的价格
         BigDecimal originalRefundAmount = BigDecimal.ZERO.add(mainItemRealAmount);
         StringBuilder refundDescBuilder = new StringBuilder("取消订单退款:");
-        OrderAccountDetail oad = new OrderAccountDetail();
+        if(null == oad) {
+            oad = new OrderAccountDetail();
+        }
         BigDecimal refundMainGoodsAmount = calculateRefund(originalRefundAmount, timeLag, dicParentKey, refundDescBuilder, oad);
         refundMainGoodsAmount = refundMainGoodsAmount.setScale(2, RoundingMode.HALF_UP);
 
-        //退款金额 = 主要商品退款 + （其他商品退款） 即--> 主要商品退款 + （订单总商品款 - 主要商品款）
-        oad.setOrderAmount(refundMainGoodsAmount.add(baseOrder.getOrderAmount().subtract(mainItemRealAmount)));
+        //退款金额 = 主要商品退款 + （其他商品退款） 即--> 主要商品退款 + （总商品款 - 主要商品款）
+        oad.setOrderAmount(refundMainGoodsAmount.add(baseOrder.getGoodsAmount().subtract(mainItemRealAmount)));
         BigDecimal refundAmount = oad.getOrderAmount();
 
         // 押金
@@ -187,7 +190,9 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
                     set("ga", goodsAmount);
                 }})).toString());
                 refundDescBuilder = refundDescBuilder.insert(0, names[1]+ ",");
-                orderAccountDetail.getDeductions().add(initDeduction(goodsAmount.subtract(refundGoodsAmount), names[1], DeductionTypeEnum.VIOLATE_CANCEL, OrderAccountDeduction.ORIGIN_DEPOSIT));
+                if(goodsAmount.subtract(refundGoodsAmount).compareTo(BigDecimal.ZERO) > 0) {
+                    orderAccountDetail.getDeductions().add(initDeduction(goodsAmount.subtract(refundGoodsAmount), names[1], DeductionTypeEnum.VIOLATE_CANCEL, OrderAccountDeduction.ORIGIN_DEPOSIT));
+                }
                 break;
             }
         }
@@ -353,4 +358,24 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             log.error("crosstown.getViolateDetail() crosstown id :"+crosstown.getId() +" 转换失败");
         }
     }
+
+
+    /**
+     * 获取每日订单账目,用于统计
+     * @param code
+     * @param day
+     * @return
+     */
+    public List<OrderAccountDTO> getOrderAccountByOrderType(Integer code, Integer day) {
+
+
+        return mapper.getOrderAccountByOrderType(code,day);
+    }
+
+
+
+
+
+
+
 }
\ No newline at end of file

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

 package com.xxfc.platform.order.biz;
 
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.order.entity.OrderStatistics;
 import com.xxfc.platform.order.mapper.OrderStatisticsMapper;
+import com.xxfc.platform.order.pojo.HomePageOrderData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -26,37 +28,48 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat
     @Autowired
     private DailyMembersOrderStatisticsBiz membersBiz;
 
-    public OrderStatistics getTotalOrder(Integer companyId) {
-        OrderStatistics result = new OrderStatistics();
-        ArrayList<OrderStatistics> orderStatistics = new ArrayList<>();
+    public HomePageOrderData getTotalOrder(Integer companyId) {
+        HomePageOrderData result = new HomePageOrderData();
+        ArrayList<HomePageOrderData> orderStatistics = new ArrayList<>();
 
         OrderStatistics vehicle = vehicleBiz.findAll(companyId);
         if (vehicle != null) {
-            orderStatistics.add(vehicle);
+            HomePageOrderData data = new HomePageOrderData() {{
+                setTotalOrders(vehicle.getTotalGmv().subtract(vehicle.getTotalReturnGmv()));
+                setAdditionalIndemnity(vehicle.getTotalCompensation()
+                        .add(vehicle.getTotalForfeit())
+                        .add(vehicle.getTotalDefaultMoney())
+                        .add(vehicle.getTotalExpenditure().subtract(vehicle.getTotalGmv().subtract(vehicle.getTotalReturnGmv())))
+                );
+            }};
+            orderStatistics.add(data);
         }
         OrderStatistics tour = TravelBiz.findAll(companyId);
 
         if (vehicle != null) {
-            orderStatistics.add(tour);
+            HomePageOrderData data = new HomePageOrderData() {{
+                setTotalOrders(tour.getTotalGmv().subtract(tour.getTotalReturnGmv()));
+                setAdditionalIndemnity(tour.getTotalDefaultMoney());
+            }};
+            orderStatistics.add(data);
         }
         OrderStatistics member = membersBiz.findAll(companyId);
         if (vehicle != null) {
-            orderStatistics.add(member);
-        }
+            HomePageOrderData data = new HomePageOrderData() {{
+                setTotalOrders(member.getTotalGmv().subtract(member.getTotalReturnGmv()));
 
-        result.setTotalGmv(orderStatistics.stream().map(OrderStatistics::getTotalGmv).filter(o-> Objects.nonNull(o)).reduce(BigDecimal.ZERO, BigDecimal::add));
+            }};
+            orderStatistics.add(data);
+        }
 
-        result.setTotalForfeit(orderStatistics.stream().map(OrderStatistics::getTotalForfeit).filter(o-> Objects.nonNull(o)).reduce(BigDecimal.ZERO, BigDecimal::add));
 
-        result.setTotalCompensation(orderStatistics.stream().map(OrderStatistics::getTotalCompensation).filter(o-> Objects.nonNull(o)).reduce(BigDecimal.ZERO, BigDecimal::add));
 
-        result.setTotalRefundSecurityDeposit(orderStatistics.stream().map(OrderStatistics::getTotalRefundSecurityDeposit).filter(o-> Objects.nonNull(o)).reduce(BigDecimal.ZERO, BigDecimal::add));
 
-        result.setTotalSecurityDeposit(orderStatistics.stream().map(OrderStatistics::getTotalSecurityDeposit).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.setTotalPenalSum(orderStatistics.stream().map(OrderStatistics::getTotalPenalSum).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.setTotalPostpone(orderStatistics.stream().map(OrderStatistics::getTotalPostpone).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));
 
         return result;
     }

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

@@ -6,11 +6,16 @@ import cn.hutool.extra.template.TemplateEngine;
 import cn.hutool.extra.template.TemplateUtil;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.google.common.collect.Maps;
+import com.xxfc.platform.order.contant.enumerate.OrderCostEnum;
 import com.xxfc.platform.order.entity.OrderTemplate;
 import com.xxfc.platform.order.mapper.OrderTemplateMapper;
+import com.xxfc.platform.order.pojo.price.CancelNoStartVO;
+import com.xxfc.platform.order.pojo.price.CancelStartedVO;
+import com.xxfc.platform.order.pojo.price.CostDetailExtend;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -58,6 +63,32 @@ public class OrderTemplateBiz extends BaseBiz<OrderTemplateMapper,OrderTemplate>
         return template.render(map);
     }
 
+    public OrderTemplate selectByCode(String code) {
+        return selectOne(new OrderTemplate(){{
+            setCode(code);
+        }});
+    }
+
+    /**
+     * 计算费用明细
+     * @param vo
+     * @return
+     */
+    public void handleCostDetailExtend(CancelNoStartVO vo) {
+        OrderTemplate template = selectByCode(OrderCostEnum.CANCEL_NO_START.getCode());
+        vo.setCostDetail(result(template.getTemplate(), Dict.parse(vo)));
+    }
+
+    /**
+     * 取消费用明细
+     * @param vo
+     * @return
+     */
+    public void handleCostDetailExtend(CancelStartedVO vo) {
+        OrderTemplate template = selectByCode(OrderCostEnum.CANCEL_STARTED.getCode());
+        vo.setCostDetail(result(template.getTemplate(), Dict.parse(vo)));
+    }
+
     public static void main(String[] args) {
         String tempStr = "{\"key\":\"费用明细\", \"val\":\"\", \"consumeAmount\":\"${consumeAmount}\",\"children\":[${children}]}";
         Map map = Maps.newHashMap();

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

@@ -68,7 +68,7 @@ public class OrderTourVerificationBiz{
         if(baseOrder==null){
             return ObjectRestResponse.createFailedResult(ResCode.ORDER_IS_NOT_EXIST.getCode(), ResCode.ORDER_IS_NOT_EXIST.getDesc());
         }
-        if(baseOrder.getStatus()!=OrderStatusEnum.ORDER_TOSTART.getCode()){
+        if(baseOrder.getHasPay()==0){
             return ObjectRestResponse.createFailedResult(ResCode.ORDER_IS_NOT_PAY.getCode(), ResCode.ORDER_IS_NOT_PAY.getDesc());
         }
        Integer orderId=baseOrder.getId();

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

@@ -250,24 +250,28 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         //定损扣除费用
         if (StringUtils.isNotBlank(orderVehicleCrosstownDto.getDedDetail())) {
             JSONArray jsonArray = JSONArray.parseArray(orderVehicleCrosstownDto.getDedDetail());
-            for (int i = 0; i < jsonArray.size(); i++) {
-                JSONObject jsonObject = JSONObject.parseObject(jsonArray.get(i).toString());
-                if (jsonObject != null) {
-                    cost += Double.parseDouble(jsonObject.getString("cost"));
+            if(jsonArray != null && jsonArray.size() > 0) {
+                for (int i = 0; i < jsonArray.size(); i++) {
+                    JSONObject jsonObject = JSONObject.parseObject(jsonArray.get(i).toString());
+                    if (jsonObject != null) {
+                        cost += Double.parseDouble(jsonObject.getString("cost"));
+                    }
                 }
             }
         }
         //延期扣除费用
         if (StringUtils.isNotBlank(orderVehicleCrosstownDto.getViolateDetail())) {
             JSONArray jsonArray = JSONArray.parseArray(orderVehicleCrosstownDto.getDedDetail());
-            for (int i = 0; i < jsonArray.size(); i++) {
-                JSONObject jsonObject = JSONObject.parseObject(jsonArray.get(i).toString());
-                if (jsonObject != null) {
-                    if (jsonObject.getString("cost") != null) {
-                        cost += Double.parseDouble(jsonObject.getString("cost"));
-                    }
-                    if (jsonObject.getString("excessCost") != null) {
-                        cost += Double.parseDouble(jsonObject.getString("excessCost"));
+            if(jsonArray != null && jsonArray.size() > 0) {
+                for (int i = 0; i < jsonArray.size(); i++) {
+                    JSONObject jsonObject = JSONObject.parseObject(jsonArray.get(i).toString());
+                    if (jsonObject != null) {
+                        if (jsonObject.getString("cost") != null) {
+                            cost += Double.parseDouble(jsonObject.getString("cost"));
+                        }
+                        if (jsonObject.getString("excessCost") != null) {
+                            cost += Double.parseDouble(jsonObject.getString("excessCost"));
+                        }
                     }
                 }
             }

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

 package com.xxfc.platform.order.biz.inner;
 
+import cn.hutool.core.lang.Dict;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.xxfc.platform.activity.entity.Coupon;
 import com.xxfc.platform.activity.feign.ActivityFeign;
@@ -12,6 +13,7 @@ import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.pojo.account.OrderAccountDeduction;
 import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import com.xxfc.platform.order.pojo.calculate.InProgressVO;
+import com.xxfc.platform.order.pojo.price.RentVehiclePriceVO;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import lombok.extern.slf4j.Slf4j;
@@ -20,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -59,6 +62,7 @@ public class OrderCalculateBiz {
 
     public InProgressVO inProgressCalculate(BaseOrder baseOrder, OrderItem orderItem, Integer freeDays, Integer useDays, OrderAccountDetail oad) {
         BigDecimal refundAmount = BigDecimal.ZERO;
+        BigDecimal consumeAmount = BigDecimal.ZERO;
         InProgressVO inProgressVO = new InProgressVO();
         inProgressVO.setUsedDays(useDays);
         inProgressVO.setUsedfreeDays(freeDays);
@@ -80,7 +84,7 @@ public class OrderCalculateBiz {
                     //消费天数
                 Integer consumeDays = 0 - backFreeDays;
                     //计算使用天数的费用
-                BigDecimal consumeAmount = orderItem.getUnitPrice().multiply(new BigDecimal(consumeDays+""));
+                consumeAmount = orderItem.getUnitPrice().multiply(new BigDecimal(consumeDays+""));
                 List<BigDecimal> couponAmounts = Lists.newArrayList();
                 for(String tickerNo : baseOrder.getCouponTickerNos().split(",")) {
                     BigDecimal couponAmount = activityFeign.use(baseOrder.getUserId(), Lists.newArrayList(tickerNo), baseOrder.getNo(), Coupon.CHANNEL_RENT, consumeAmount, ActivityFeign.TYPE_CHECK);

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

@@ -11,9 +11,12 @@ import com.xxfc.platform.activity.feign.ActivityFeign;
 import com.xxfc.platform.order.biz.*;
 import com.xxfc.platform.order.contant.enumerate.*;
 import com.xxfc.platform.order.entity.*;
+import com.xxfc.platform.order.pojo.account.OrderAccountDeduction;
 import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import com.xxfc.platform.order.pojo.calculate.InProgressVO;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
+import com.xxfc.platform.order.pojo.price.CancelNoStartVO;
+import com.xxfc.platform.order.pojo.price.CancelStartedVO;
 import com.xxfc.platform.tour.feign.TourFeign;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.vehicle.common.RestResponse;
@@ -67,6 +70,9 @@ public class OrderCancelBiz {
     @Autowired
     OrderAccountBiz orderAccountBiz;
 
+    @Autowired
+    OrderTemplateBiz orderTemplateBiz;
+
     @Autowired
     UserFeign userFeign;
 
@@ -152,6 +158,25 @@ public class OrderCancelBiz {
                         //退款子流程: 订单基础，退款描述，退款金额
                         orderAccountBiz.refundSubProcess(baseOrder, "", baseOrder.getRealAmount().subtract(orvd.getDeposit()), oad.getDepositAmount().add(oad.getOrderAmount()), AccountTypeEnum.OUT_ORDER_FUND.getCode(), RefundStatusEnum.ALL.getCode(), oad);
 
+
+                        //如果有扣款项，则生成额外的费用明细
+                        CancelStartedVO csv = new CancelStartedVO();
+                        csv.setConsumeAmount(inProgressVO.getConsumeAmount());
+                        csv.setModelAmount(orderItem.getUnitPrice());
+                        csv.setUsedAmount(inProgressVO.getUsedAmount());
+                        csv.setUsedDayNum(inProgressVO.getUsedDays());
+                        csv.setUsedFreeAmount(inProgressVO.getUsedFreeDaysAmount());
+                        if(oad.getDeductions().size() > 0) {
+                            for(OrderAccountDeduction deduction : oad.getDeductions()) {
+                                if(DeductionTypeEnum.VIOLATE_CANCEL.getCode().equals(deduction.getType())) {
+                                    csv.setViolateAmount(deduction.getAmount());
+                                    csv.setViolateDesc(deduction.getName());
+                                }
+                            }
+                        }
+                        orderTemplateBiz.handleCostDetailExtend(csv);
+                        orvd.setCostDetailExtend(csv.getCostDetail());
+                        orderRentVehicleBiz.updateSelectiveByIdRe(orvd);
                     }else {
                         //没到出车时间
                         //判断是否使用免费天数，并且进行扣款
@@ -165,7 +190,22 @@ public class OrderCancelBiz {
                             }
                         }
                         //退款流程
-                        orderAccountBiz.rentRefundProcessCancel(hasUpdateOrder, orderItem.getRealAmount(), timeLag, APP_ORDER+ "_"+ RENT_REFUND, orvd.getDeposit(), freeDayAmount);
+                        orderAccountBiz.rentRefundProcessCancel(hasUpdateOrder, orderItem.getRealAmount(), timeLag, APP_ORDER+ "_"+ RENT_REFUND, orvd.getDeposit(), freeDayAmount, null);
+
+                        //如果有扣款项，则生成额外的费用明细
+                        if(oad.getDeductions().size() > 0) {
+                            for(OrderAccountDeduction deduction : oad.getDeductions()) {
+                                if(DeductionTypeEnum.VIOLATE_CANCEL.getCode().equals(deduction.getType())) {
+                                    CancelNoStartVO cnsv = new CancelNoStartVO(){{
+                                        setViolateAmount(deduction.getAmount());
+                                        setViolateDesc(deduction.getName());
+                                    }};
+                                    orderTemplateBiz.handleCostDetailExtend(cnsv);
+                                    orvd.setCostDetailExtend(cnsv.getCostDetail());
+                                    orderRentVehicleBiz.updateSelectiveByIdRe(orvd);
+                                }
+                            }
+                        }
                     }
 
                     //已付款的取消订单发送消息
@@ -199,8 +239,24 @@ public class OrderCancelBiz {
                     if(SYS_TRUE.equals(otd.getIsOutside())) {
                         key = TOUR_REFUND;
                     }
+
                     //退款流程
-                    orderAccountBiz.rentRefundProcessCancel(hasUpdateOrder, adultItem.getRealAmount().add(childItem.getRealAmount()), timeLag, APP_ORDER+ "_"+ key, BigDecimal.ZERO, BigDecimal.ZERO);
+                    orderAccountBiz.rentRefundProcessCancel(hasUpdateOrder, adultItem.getRealAmount().add(childItem.getRealAmount()), timeLag, APP_ORDER+ "_"+ key, BigDecimal.ZERO, BigDecimal.ZERO, oad);
+
+                    //如果有扣款项，则生成额外的费用明细
+                    if(oad.getDeductions().size() > 0) {
+                        for(OrderAccountDeduction deduction : oad.getDeductions()) {
+                            if(DeductionTypeEnum.VIOLATE_CANCEL.getCode().equals(deduction.getType())) {
+                                CancelNoStartVO cnsv = new CancelNoStartVO(){{
+                                    setViolateAmount(deduction.getAmount());
+                                    setViolateDesc(deduction.getName());
+                                }};
+                                orderTemplateBiz.handleCostDetailExtend(cnsv);
+                                otd.setCostDetailExtend(cnsv.getCostDetail());
+                                orderTourDetailBiz.updateSelectiveByIdRe(otd);
+                            }
+                        }
+                    }
 
                     //站点总人数减少
                     tourFeign.updateTourGoodPersonNum(otd.getVerificationId(), TourFeign.TOTAL_PERSON, (otd.getTotalNumber() * -1));
@@ -213,10 +269,11 @@ public class OrderCancelBiz {
                     setOrderId(baseOrder.getId());
                 }});
 
-                //取消租车预定
+                //取消租车预定 和 记录生成额外的费用明细
                 //已支付,并且是待出行状态，取消预约
                 if(OrderStatusEnum.ORDER_TOSTART.getCode().equals(baseOrder.getStatus()) && SYS_TRUE.equals(baseOrder.getHasPay())){
                     vehicleFeign.rentUnbookVehicle(orvd.getBookRecordId());
+
                 }else {
                     //未支付，拒绝之前的预约
                     RestResponse<Integer> restResponse = vehicleFeign.rentRejectVehicleBooking(orvd.getBookRecordId());

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

 package com.xxfc.platform.order.mapper;
 
 import com.xxfc.platform.order.entity.OrderAccount;
+import com.xxfc.platform.order.pojo.account.OrderAccountDTO;
+import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.util.List;
+
+
 /**
  * 订单帐目
  * 
@@ -11,5 +16,6 @@ import tk.mybatis.mapper.common.Mapper;
  * @date 2019-09-09 15:51:16
  */
 public interface OrderAccountMapper extends Mapper<OrderAccount> {
-	
+
+    List<OrderAccountDTO> getOrderAccountByOrderType(@Param("type") Integer type, @Param("day") Integer day);
 }

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

 package com.xxfc.platform.order.rest;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.json.JSONUtil;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
@@ -48,6 +49,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.lang.reflect.Array;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
@@ -103,10 +105,11 @@ public class BackStageOrderController extends CommonBaseController implements Us
                 dto.setEndTime(new Date().getTime());
             }
         }
-        if (StringUtils.isNotBlank(dto.getPhone())) {
-            AppUserLogin appUserLogin = userFeign.one(dto.getPhone());
-            if (appUserLogin != null) {
-                dto.setUserId(appUserLogin.getId());
+        if (StringUtils.isNotBlank(dto.getPhone())||StringUtils.isNotBlank(dto.getRealName())) {
+            List<AppUserLogin> appUserLoins = userFeign.getOne(dto.getPhone(),dto.getRealName());
+            if (CollectionUtil.isNotEmpty(appUserLoins)) {
+                List<Integer> collect = appUserLoins.parallelStream().map(AppUserLogin::getId).collect(Collectors.toList());
+                dto.setUserIds(collect);
             }else {
                 return ObjectRestResponse.succ(new PageDataVO<>());
             }
@@ -121,8 +124,8 @@ public class BackStageOrderController extends CommonBaseController implements Us
             dto.setCompanyIds(companyIds);
         }
 
-        if (StringUtils.isNotEmpty(dto.getPlateNumber())){
-          List<String> vehicleIds = vehicleFeign.findbyPlateNumber(dto.getPlateNumber().trim());
+        if (StringUtils.isNotEmpty(dto.getPlateNumber())||StringUtils.isNotEmpty(dto.getVehicleCode())){
+          List<String> vehicleIds = vehicleFeign.findbyPlateNumberAndVehicleCod(dto.getPlateNumber(),dto.getVehicleCode());
            dto.setVehicleIds(vehicleIds);
         }
 
@@ -148,6 +151,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
                 if(appUserVo != null) {
                     orderPageVO.setTelephone(appUserVo.getUsername());
                     orderPageVO.setUsername(appUserVo.getNickname());
+                    orderPageVO.setRealName(appUserVo.getRealname());
                 }
                 if (orderPageVO.getOrderRentVehicleDetail() != null && orderPageVO.getOrderRentVehicleDetail().getVehicleId() != null) {
                     RestResponse<Vehicle> restResponse = vehicleFeign.findById(orderPageVO.getOrderRentVehicleDetail().getVehicleId());

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

@@ -309,8 +309,19 @@ public class BaseOrderController extends CommonBaseController implements UserRes
 
         private String phone;
 
+        /**
+         * 后台搜索条件：真实姓名
+         */
+        private String realName;
+
+        /**
+         * 后台搜索条件：车辆编号
+         */
+        private String vehicleCode;
+
         private  List<String> vehicleIds;
 
+
         //订单用户ID列表
         private List<Integer> userIds;
         //订单用户手机号或订单用户真实姓名

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

@@ -12,6 +12,7 @@ import com.xxfc.platform.order.biz.DailyTravelOrderStatisticsBiz;
 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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -88,15 +89,28 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
 
             if (TYPE_VEHICLE.equals(type)) {
                 OrderStatistics vehicle = vehicleBiz.findAll(companyId);
-                return ObjectRestResponse.succ(vehicle);
+                return ObjectRestResponse.succ(new HomePageOrderData(){{
+                    setTotalOrders(vehicle.getTotalGmv().subtract(vehicle.getTotalReturnGmv()));
+                    setAdditionalIndemnity(vehicle.getTotalCompensation()
+                            .add(vehicle.getTotalForfeit())
+                            .add(vehicle.getTotalDefaultMoney())
+                            .add(vehicle.getTotalExpenditure().subtract(vehicle.getTotalGmv().subtract(vehicle.getTotalReturnGmv())))
+                    );
+                }});
             }
             if (TYPE_TOUR.equals(type)) {
                 OrderStatistics tour = TravelBiz.findAll(companyId);
-                return ObjectRestResponse.succ(tour);
+                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(member);
+                return ObjectRestResponse.succ(new HomePageOrderData(){{
+                    setTotalOrders(member.getTotalGmv().subtract(member.getTotalReturnGmv()));
+
+                }});
             }
 
             if (TYPE_TOTAL.equals(type)) {
@@ -110,4 +124,6 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
         }
 
     }
+
+
 }

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

@@ -15,7 +15,6 @@ import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.activity.entity.Coupon;
 import com.xxfc.platform.activity.feign.ActivityFeign;
 import com.xxfc.platform.order.biz.OrderCostDetailBiz;
-import com.xxfc.platform.order.biz.OrderItemBiz;
 import com.xxfc.platform.order.biz.OrderRentVehicleBiz;
 import com.xxfc.platform.order.biz.OrderTemplateBiz;
 import com.xxfc.platform.order.contant.enumerate.ItemTypeEnum;
@@ -25,18 +24,15 @@ import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.entity.OrderItem;
 import com.xxfc.platform.order.entity.OrderTemplate;
 import com.xxfc.platform.order.pojo.OrderAccompanyDTO;
-import com.xxfc.platform.order.pojo.order.OrderItemDTO;
 import com.xxfc.platform.order.pojo.order.RentVehicleBO;
 import com.xxfc.platform.order.pojo.price.RentVehiclePriceVO;
 import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.vehicle.constant.AccompanyingItemType;
-import com.xxfc.platform.vehicle.entity.AccompanyingItem;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.VehicleBookRecord;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
-import com.xxfc.platform.vehicle.pojo.CompanyDetail;
 import com.xxfc.platform.vehicle.pojo.RentVehicleBookDTO;
 import com.xxfc.platform.vehicle.pojo.vo.AccompanyingItemVo;
 import lombok.Data;
@@ -386,9 +382,9 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
 
     private String handleChildren(RentVehicleBO detail, Integer vehicleDayNum) {
         StringBuffer childrenStr = new StringBuffer("");
-        if(vehicleDayNum > 0) {
+//        if(vehicleDayNum > 0) {
             childrenStr.append(",${tem_0101}");
-        }
+//        }
         if(DRIVER_TYPE_COMPANY.equals(detail.getDriverType())) {
             childrenStr.append(",${tem_0102}");
         }
@@ -414,9 +410,11 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
      * @return
      */
     private void costDetail(RentVehiclePriceVO vo, String children) {
-        OrderTemplate template = orderTemplateBiz.selectById(OrderCostEnum.RentVehicle.getCode());
+        OrderTemplate template = orderTemplateBiz.selectById(OrderCostEnum.RENT_VEHICLE.getCode());
         template.setTemplate(orderTemplateBiz.result(template.getTemplate(), new HashMap(){{
             put("children", children);
+            put("vehicleAmount", vo.getVehicleAmount());
+            put("realAmount", vo.getRealAmount());
         }}));
         String result = orderTemplateBiz.result(template, Dict.parse(vo));
         vo.setCostDetail(result);

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

@@ -3,7 +3,6 @@ package com.xxfc.platform.order.service;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Dict;
 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.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.common.exception.BaseException;
@@ -12,7 +11,6 @@ import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.activity.entity.Coupon;
 import com.xxfc.platform.activity.feign.ActivityFeign;
 import com.xxfc.platform.order.biz.OrderCostDetailBiz;
-import com.xxfc.platform.order.biz.OrderItemBiz;
 import com.xxfc.platform.order.biz.OrderTemplateBiz;
 import com.xxfc.platform.order.biz.OrderTourDetailBiz;
 import com.xxfc.platform.order.contant.enumerate.ItemTypeEnum;
@@ -312,7 +310,7 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
      * @return
      */
     private void costDetail(TourPriceVO vo, String children) {
-        OrderTemplate template = orderTemplateBiz.selectById(OrderCostEnum.RentVehicle.getCode());
+        OrderTemplate template = orderTemplateBiz.selectById(OrderCostEnum.RENT_VEHICLE.getCode());
         template.setTemplate(orderTemplateBiz.result(template.getTemplate(), new HashMap(){{
             put("children", children);
         }}));

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

@@ -120,8 +120,12 @@
             <if test="crtUser != null">
                 and b.crt_user = #{crtUser}
             </if>
-            <if test="userId != null">
-                and b.user_id = #{userId}
+            <if test="userIds != null and userIds.size() > 0">
+                and b.user_id in
+                <foreach collection="userIds" item="item"  open="("  separator="," close=")">
+                    #{item}
+                </foreach>
+
             </if>
             <if test="status != null">
                 and b.status = #{status}
@@ -178,8 +182,11 @@
         from base_order b
         LEFT JOIN order_rent_vehicle_detail r on r.order_id = b.id
         where b.type = 1
-        <if test="userId != null">
-            and b.user_id = #{userId}
+        <if test="userIds != null and userIds.size > 0">
+            and b.user_id in
+            <foreach collection="userIds" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
         </if>
         <if test="status != null and status == -1">
             AND b.status = -1

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

@@ -17,24 +17,13 @@
 
     <select id="monthOrderTotal" resultType="com.xxfc.platform.order.entity.OrderStatistics">
         SELECT
-        IFNULL(sum(gmv),0) as totalGmv
+        IFNULL( sum( gmv ), 0 ) AS totalGmv
         FROM
-        (
-        SELECT
-        ANY_VALUE(id) AS id ,
-        ANY_VALUE(branch_company_id) AS branch_company_id,
-        ANY_VALUE(one_day) AS one_day,
-        ANY_VALUE(gmv) AS gmv,
-        ANY_VALUE(crt_time) AS crt_time
-        FROM
-        daily_members_order_statistics
-        GROUP BY
-        one_day,branch_company_id
-        ) m
+        daily_vehicle_order_statistics
         WHERE
         1=1
         <if test="companyId != null">
-            and branch_company_id =#{companyId}
+            and branch_company_id = #{companyId}
         </if>
 
     </select>

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

@@ -51,26 +51,15 @@
 
     <select id="monthOrderTotal" resultType="com.xxfc.platform.order.entity.OrderStatistics">
         SELECT
-        IFNULL(sum(gmv),0) as totalGmv,
-        IFNULL(sum(penal_sum) ,0) as totalPenalSum
+        IFNULL( sum( gmv ), 0 ) AS totalGmv,
+        IFNULL( sum( default_money ), 0 ) AS totalDefaultMoney,
+        IFNULL( sum( return_gmv ), 0 ) AS totalReturnGmv
         FROM
-        (
-        SELECT
-        ANY_VALUE(id) AS id,
-        ANY_VALUE(branch_company_id) AS branch_company_id,
-        ANY_VALUE(one_day) AS one_day,
-        ANY_VALUE(gmv) AS gmv,
-        ANY_VALUE(penal_sum) AS penal_sum,
-        ANY_VALUE(crt_time) AS crt_time
-        FROM
-        daily_travel_order_statistics
-        GROUP BY
-        one_day,branch_company_id
-        ) o
+        daily_vehicle_order_statistics
         WHERE
         1=1
         <if test="companyId != null">
-            and branch_company_id =#{companyId}
+            and branch_company_id = #{companyId}
         </if>
     </select>
 

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

@@ -79,33 +79,19 @@
         v.start_company_id
     </select>
 
-    <!--    获取赔偿和延期JSON字符串-->
+    <!--    -->
     <select id="monthOrderTotal" resultType="com.xxfc.platform.order.entity.OrderStatistics">
         SELECT
-        IFNULL(sum(gmv),0) as totalGmv,
-        (IFNULL(sum(security_deposit),0)-IFNULL(sum(refund_security_deposit) ,0)) as totalSecurityDeposit,
-        IFNULL(sum(refund_security_deposit) ,0) as totalRefundSecurityDeposit,
-        IFNULL(sum(compensation) ,0) as totalCompensation,
-        IFNULL(sum(forfeit) ,0) as totalForfeit,
-        IFNULL(sum(penal_sum) ,0) as totalPenalSum,
-        IFNULL(sum(postpone) ,0) as totalPostpone
-        FROM
-        (
-        SELECT
-        ANY_VALUE(id) as id,
-        one_day,
-        branch_company_id,
-        ANY_VALUE(gmv) AS gmv,
-        ANY_VALUE(security_deposit) AS security_deposit,
-        ANY_VALUE(refund_security_deposit) AS refund_security_deposit,
-        ANY_VALUE(forfeit) AS forfeit,ANY_VALUE(penal_sum) AS penal_sum,
-        ANY_VALUE(postpone) AS postpone,ANY_VALUE(crt_time) AS crt_time,
-        ANY_VALUE(compensation) AS compensation
+        IFNULL( sum( gmv ), 0 ) AS totalGmv,
+        IFNULL( sum( security_deposit ), 0 ) AS totalSecurityDeposit,
+        IFNULL( sum( refund_security_deposit ), 0 ) AS totalRefundSecurityDeposit,
+        IFNULL( sum( forfeit ), 0 ) AS totalForfeit,
+        IFNULL( sum( compensation ), 0 ) AS totalCompensation,
+        IFNULL( sum( return_gmv ), 0 ) AS totalReturnGmv,
+        IFNULL( sum( default_money ), 0 ) AS totalDefaultMoney,
+        IFNULL( sum( total_expenditure ), 0 ) AS totalExpenditure
         FROM
         daily_vehicle_order_statistics
-        GROUP  BY
-        one_day,branch_company_id
-        )  a
         WHERE
         1=1
         <if test="companyId != null">

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xxfc.platform.order.mapper.OrderAccountMapper">
+    <select id="getOrderAccountByOrderType" resultType="com.xxfc.platform.order.pojo.account.OrderAccountDTO">
+        SELECT
+        date(DATE_SUB(now(),interval #{day} day)) as oneDay,
+        a.*
+        <if test="type != null and type == 1">
+            , v.start_company_id as companyId
+        </if>
+        <if test="type != null and type == 2">
+            , t.start_company_id as companyId
+        </if>
+        FROM
+        order_account a
+        LEFT JOIN base_order b ON a.order_id = b.id
+        <if test="type != null and type==1">
+            LEFT JOIN order_rent_vehicle_detail v ON b.id = v.order_id
+        </if>
+        <if test="type != null and type==2">
+            LEFT JOIN order_tour_detail t ON b.id = t.order_id
+        </if>
+        WHERE
+        a.account_status=1
+        AND
+        b.type = #{type}
+        AND date( FROM_UNIXTIME( a.crt_time / 1000 ) ) = date( DATE_SUB( now( ), INTERVAL #{day} DAY ) )
+    </select>
+</mapper>
\ No newline at end of file

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

@@ -26,6 +26,7 @@
       <result column="deduction_cost" jdbcType="INTEGER" property="deductionCost"/>
       <result column="rest_deposit" jdbcType="INTEGER" property="restDeposit"/>
       <result column="user_license_id" jdbcType="VARCHAR" property="userLicenseId"/>
+      <result column="violate_amount_detail" jdbcType="VARCHAR" property="violateDetail"/>
   </resultMap>
     <resultMap id="orderMap" type="com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto">
         <result column="id" javaType="java.lang.Integer" property="id"/>
@@ -34,20 +35,20 @@
                      javaType="com.xxfc.platform.order.entity.DepositRefundRecord"/>
     </resultMap>
     <select id="selectByOrderId" parameterType="com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto" resultType="com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto">
-        select *
-        from order_vehicle_crosstown
+        select o.*, o.violate_amount_detail violateDetail
+        from order_vehicle_crosstown o
         <where>
             <if test="status != null">
-                and status = #{status}
+                and o.status = #{status}
             </if>
             <if test="type != null">
-                and type = #{type}
+                and o.type = #{type}
             </if>
             <if test="orderId != null">
-                and order_id = #{orderId}
+                and o.order_id = #{orderId}
             </if>
             <if test="orderNo != null">
-                and order_no = #{orderNo}
+                and o.order_no = #{orderNo}
             </if>
         </where>
     </select>

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

@@ -152,4 +152,7 @@ public interface VehicleFeign {
 
     @GetMapping("/vehicleInfo/findwith_plate_number")
     List<String> findbyPlateNumber(@RequestParam(value = "plateNumber") String plateNumber);
+
+    @GetMapping("/vehicleInfo/findVehicleIds")
+    List<String> findbyPlateNumberAndVehicleCod(@RequestParam(value = "plateNumber") String plateNumber,@RequestParam(value = "vehicleCode") String vehicleCode);
 }

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

@@ -164,21 +164,21 @@ public class VehicleActiveService {
         }
         List<VehicleBookRecordVo> vehicleBookRecordVos = vehicleBookRecordBiz.selectByVehicleId(vehicleId);
         if (vehicleBookRecordVos != null && vehicleBookRecordVos.size() > 0) {
-        Iterator<VehicleBookRecordVo> iterator = vehicleBookRecordVos.iterator();
-        while (iterator.hasNext()) {
-            VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
-            if (vehicleBookRecordVo.getVehicleDepartureLogVo() != null && vehicleBookRecordVo.getVehicleDepartureLogVo().getState() != 1) { //已经出车
-                stringBuilder.append("中，使用人：");
-                stringBuilder.append(vehicleBookRecordVo.getVehicleUsername());
-                stringBuilder.append(" 使用人电话：");
-                stringBuilder.append(vehicleBookRecordVo.getVehicleUserPhone());
-                return stringBuilder.toString();
+            Iterator<VehicleBookRecordVo> iterator = vehicleBookRecordVos.iterator();
+            while (iterator.hasNext()) {
+                VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
+                if (vehicleBookRecordVo.getVehicleDepartureLogVo() != null && vehicleBookRecordVo.getVehicleDepartureLogVo().getState() != 1) { //已经出车
+                    stringBuilder.append("中，使用人：");
+                    stringBuilder.append(vehicleBookRecordVo.getVehicleUsername());
+                    stringBuilder.append(" 使用人电话：");
+                    stringBuilder.append(vehicleBookRecordVo.getVehicleUserPhone());
+                    return stringBuilder.toString();
+                }
             }
         }
-    }
         stringBuilder.append(", 请联系管理员修改车辆状态为正常状态");
         return stringBuilder.toString();
-}
+    }
 
     public void arrival(VehicleArrivalVo arrivalVo) {
         Vehicle vehicle = vehicleMapper.selectByPrimaryKey(arrivalVo.getVehicleId());
@@ -214,9 +214,6 @@ public class VehicleActiveService {
             }
             vehicle.setExpectDestinationBranchCompanyId(0);
             vehicleMapper.updateByPrimaryKeySelective(vehicle);
-
-
-
             // 出车记录
             VehicleDepartureLogVo departureLogVo = vehicleDepartureLogMapper.selectByBookRecordId(arrivalVo.getBookRecordId());
 
@@ -229,12 +226,12 @@ public class VehicleActiveService {
             boolean flag = true;
             VehicleDepartureLog departureLog = departureLogVo.getVehicleDeparture(departureLogVo);
             List<VehicleDepartureLog> list = vehicleDepartureLogMapper.selectByVehicle(arrivalVo.getVehicleId());
-            for(VehicleDepartureLog vehicleDepartureLogVo : list) {
-                if(vehicleDepartureLogVo.getState() != 1 && vehicleDepartureLogVo.getId() > departureLog.getId()) { //后面还有未收车的记录
+            for (VehicleDepartureLog vehicleDepartureLogVo : list) {
+                if (vehicleDepartureLogVo.getState() != 1 && vehicleDepartureLogVo.getId() > departureLog.getId()) { //后面还有未收车的记录
                     flag = false;
                 }
             }
-            if(flag) { //如果此条记录后面还有未收车记录，就不修改车辆状态
+            if (flag) { //如果此条记录后面还有未收车记录，就不修改车辆状态
                 int result = vehicleMapper.updateStatus(arrivalVo.getVehicleId(), VehicleStatus.NORMAL.getCode());
 //                if (result == 0) {
 //                    throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc(),
@@ -330,7 +327,7 @@ public class VehicleActiveService {
                         }
                     }
                 }
-                if(!(startDate.minusDays(1).compareTo(DateTime.now()) <= 0 && DateTime.now().compareTo(endDate) <= 0 && vehicleBookRecord.getStatus() == VehicleBookRecordStatus.APPROVE.getCode() && (list == null || list.size() <= 0))) {
+                if (!(startDate.minusDays(1).compareTo(DateTime.now()) <= 0 && DateTime.now().compareTo(endDate) <= 0 && vehicleBookRecord.getStatus() == VehicleBookRecordStatus.APPROVE.getCode() && (list == null || list.size() <= 0))) {
                     throw new BaseException(ResCode.VEHICLE_DEPARTURE_DATE_IS_NOT_ABLED.getDesc(),
                             ResCode.VEHICLE_DEPARTURE_DATE_IS_NOT_ABLED.getCode());
                 }
@@ -340,7 +337,6 @@ public class VehicleActiveService {
 
 
     public void updateBookRecordStatus(VehicleBookRecord vehicleBookRecord, Integer type) {
-
         if (vehicleBookRecord != null) {
             if (type == 1) {
                 vehicleBookRecord.setActualStartDate(new Date());
@@ -355,9 +351,9 @@ public class VehicleActiveService {
     }
 
 
-
     /**
      * 车辆保养
+     *
      * @param vehicleUpkeepVo
      */
     @Transactional
@@ -411,6 +407,7 @@ public class VehicleActiveService {
 
     /**
      * 保养结束
+     *
      * @param vehicleUpkeepEndVo
      */
     @Transactional

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

@@ -1467,10 +1467,31 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         Example example = new Example(Vehicle.class);
         Example.Criteria criteria = example.createCriteria();
         criteria.andEqualTo("code", code);
+        criteria.andEqualTo("isDel",0);
         if (StringUtils.isNotEmpty(id)) {
             criteria.andNotEqualTo("id", id);
         }
         int count = mapper.selectCountByExample(example);
         return count > 0;
     }
+
+
+    public List<String> findbyPlateNumberAndVehicleCod(String plateNumber,String vehicleCode) {
+        List<String> vehicleIds = Lists.newArrayList();
+        Example example = new Example(Vehicle.class);
+        Example.Criteria criteria = example.createCriteria();
+        if (StringUtils.isNotBlank(plateNumber)) {
+            criteria.andLike("numberPlate", String.format("%%%s%%", plateNumber.trim()));
+        }
+
+        if (StringUtils.isNotBlank(vehicleCode)) {
+            criteria.andLike("code", String.format("%%%s%%", vehicleCode.trim()));
+        }
+        List<Vehicle> vehicles = mapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(vehicles)){
+            return vehicleIds;
+        }
+        return vehicles.stream().map(Vehicle::getId).collect(Collectors.toList());
+    }
+
 }

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

@@ -519,7 +519,7 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
     }
 
     @GetMapping("/findwith_plate_number")
-    public List<String> findbyPlateNumber(@RequestParam(value = "plateNumber") String plateNumber){
+    List<String> findbyPlateNumber(@RequestParam(value = "plateNumber") String plateNumber){
      return  vehicleBiz.findVehicleIdsByPlateNumber(plateNumber);
     }
 
@@ -529,4 +529,9 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
         return ObjectRestResponse.succ(exist);
     }
 
+
+    @GetMapping("/findVehicleIds")
+   public List<String> findbyPlateNumberAndVehicleCod(@RequestParam(value = "plateNumber",required = false) String plateNumber,@RequestParam(value = "vehicleCode",required = false) String vehicleCode){
+        return  vehicleBiz.findbyPlateNumberAndVehicleCod(plateNumber,vehicleCode);
+    }
 }

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

@@ -475,6 +475,9 @@
             <if test="numberPlate != null">
                 and v3.number_plate = #{numberPlate}
             </if>
+            <if test="keywords != null and keywords != ''">
+                and (v3.number_plate like concat('%', #{keywords}, '%') or v3.code like concat('%', #{keywords}, '%'))
+            </if>
             <if test="bookType != null">
                 and v1.book_type = #{bookType}
             </if>

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

@@ -383,6 +383,9 @@
             <if test="numberPlate != null">
                 and v1.number_plate = #{numberPlate}
             </if>
+            <if test="keywords != null and keywords != ''">
+                and (v1.number_plate like concat('%', #{keywords}, '%') or v1.code like concat('%', #{keywords}, '%'))
+            </if>
             <if test="status != null">
                 and v1.status = #{status}
             </if>