Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify

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

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

@@ -2,15 +2,15 @@ package com.github.wxiaoqi.security.admin.entity;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
 import javax.persistence.*;
+
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 
 /**
  * 钱包提现表
- * 
+ *
  * @author zjw
  * @email 18178966185@163.com
  * @date 2019-07-11 14:14:54
@@ -18,102 +18,100 @@ import lombok.Data;
 @Data
 @Table(name = "my_wallet_cath")
 public class MyWalletCath implements Serializable {
-	private static final long serialVersionUID = 1L;
-	
-	    /**
-    *  主键ID
-   */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
     @Id
-	@GeneratedValue(generator = "JDBC")
-	@ApiModelProperty("主键ID")
+    @GeneratedValue(generator = "JDBC")
+    @ApiModelProperty("主键ID")
     private Long id;
-	
-	    /**
-     *  用户iD
+
+    /**
+     * 用户iD
      */
     @Column(name = "user_id")
-	@ApiModelProperty(value = "用户iD")
+    @ApiModelProperty(value = "用户iD")
     private Integer userId;
-	
-	    /**
-     *  提现类别，第三方提现类别(0-微信，1-支付宝，2-银行卡)
+
+    /**
+     * 提现类别，第三方提现类别(0-微信，1-支付宝，2-银行卡)
      */
     @Column(name = "cath_type")
-	@ApiModelProperty(value = "提现类别，第三方提现类别(0-微信，1-支付宝，2-银行卡)")
+    @ApiModelProperty(value = "提现类别，第三方提现类别(0-微信，1-支付宝，2-银行卡)")
     private Integer cathType;
-	
-	    /**
-     *  商户订单号
-     */
+
+
     @Column(name = "account_number")
-	@ApiModelProperty(value = "用户账号")
+    @ApiModelProperty(value = "用户账号")
     private String accountNumber;
-	
-	    /**
-     *  第三方订单号：如微信，支付宝，银行卡等
+
+    /**
+     * 第三方订单号：如微信，支付宝，银行卡等
      */
     @Column(name = "cono")
-	@ApiModelProperty(value = "第三方订单号：如微信，支付宝，银行卡等")
+    @ApiModelProperty(value = "第三方订单号：如微信，支付宝，银行卡等")
     private String cono;
 
 
-	/**
-	 *  提现金额
-	 */
-	@Column(name = "balance")
-	@ApiModelProperty(value = "当前钱包余额")
-	private BigDecimal balance;
+    /**
+     * 提现金额
+     */
+    @Column(name = "balance")
+    @ApiModelProperty(value = "当前钱包余额")
+    private BigDecimal balance;
+
 
-	
     /**
-     *  提现金额
+     * 提现金额
      */
     @Column(name = "amount")
-	@ApiModelProperty(value = "提现金额")
+    @ApiModelProperty(value = "提现金额")
     private BigDecimal amount;
 
-	/**
-	 *  到账金额
-	 */
-	@Column(name = "real_amount")
-	@ApiModelProperty(value = "到账金额")
-	private BigDecimal realAmount;
-
-
-	/**
-	 *  手续费
-	 */
-	@Column(name = "commission")
-	@ApiModelProperty(value = "手续费")
-	private BigDecimal commission;
-	
-	    /**
-     *  订单状态：0-未提现,待审核，1-已审核
+    /**
+     * 到账金额
+     */
+    @Column(name = "real_amount")
+    @ApiModelProperty(value = "到账金额")
+    private BigDecimal realAmount;
+
+
+    /**
+     * 手续费
+     */
+    @Column(name = "commission")
+    @ApiModelProperty(value = "手续费")
+    private BigDecimal commission;
+
+    /**
+     * 订单状态：0-未提现,待审核，1-已审核
      */
     @Column(name = "stauts")
-	@ApiModelProperty(value = "订单状态：0-未提现,待审核，1-已审核")
+    @ApiModelProperty(value = "订单状态：0-未提现,待审核，1-已审核")
     private Integer stauts;
-	
-	    /**
-     *  提现日期
+
+    /**
+     * 提现日期
      */
     @Column(name = "crt_time")
-	@ApiModelProperty(value = "提现日期", hidden = true )
+    @ApiModelProperty(value = "提现日期", hidden = true)
     private Long crtTime;
-	
-	    /**
-     *  审核日期
+
+    /**
+     * 审核日期
      */
     @Column(name = "finish_time")
-	@ApiModelProperty(value = "审核日期")
+    @ApiModelProperty(value = "审核日期")
     private Long finishTime;
-	
-	    /**
-     *  操作者ID
+
+    /**
+     * 操作者ID
      */
     @Column(name = "upd_user")
-	@ApiModelProperty(value = "操作者ID")
+    @ApiModelProperty(value = "操作者ID")
     private String updUser;
-	
+
 
 }

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

@@ -29,4 +29,7 @@ public class WalletCathDetailVo {
      */
     @ApiModelProperty(value = "审核日期")
     private Long finishTime;
+
+    @ApiModelProperty(value = "帐号")
+    private String accountNumber;
 }

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

@@ -189,13 +189,13 @@ public class MyWalletBiz extends BaseBiz<MyWalletMapper, MyWallet> {
         myWallet.setUserId(userId);
         myWallet = selectOne(myWallet);
         if (myWallet==null){
-            return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "钱包不存在");
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "钱包不存在");
         }
         if (amount.compareTo(myWallet.getBalance())>0){
-            return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "提现金额不能大于钱包金额");
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "提现金额不能大于钱包金额");
         }
         if (StringUtils.isNotBlank(password)&&!encoder.matches(password,myWallet.getPayPassword())){
-            return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "支付密码错误");
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "支付密码错误");
         }
         WithDrawRuleVo ruleVo=configFeign.getWithDrawRule();
         BigDecimal proceduReates=BigDecimal.ZERO;
@@ -214,7 +214,7 @@ public class MyWalletBiz extends BaseBiz<MyWalletMapper, MyWallet> {
             //每日次数
             Integer  maxNumberOfDay=ruleVo.getMaxNumberOfDay()==null?0:ruleVo.getMaxNumberOfDay();
             //查询当日次数和金额
-             sumDto=myWalletCathBiz.sumCathAmount(1);
+             sumDto=myWalletCathBiz.sumCathAmount(userId,1);
             BigDecimal ramount=amount.add(sumDto.getSumAmount());
             if (amountOfDay.compareTo(BigDecimal.ZERO)>0&&ramount.compareTo(amountOfDay)>0){
                 return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "提现金额超过日额度"+amountOfDay+"元");
@@ -230,7 +230,7 @@ public class MyWalletBiz extends BaseBiz<MyWalletMapper, MyWallet> {
             Integer maxNumberOfMonth=ruleVo.getMaxNumberOfMonth();
 
             //查询当月次数和金额
-             sumDto=myWalletCathBiz.sumCathAmount(2);
+             sumDto=myWalletCathBiz.sumCathAmount(userId,2);
              BigDecimal yamount=amount.add(sumDto.getSumAmount());
              if (amountOfMonth.compareTo(BigDecimal.ZERO)>0&&yamount.compareTo(amountOfMonth)>0){
                  return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "提现金额超过月额度"+amountOfMonth+"元");
@@ -270,16 +270,17 @@ public class MyWalletBiz extends BaseBiz<MyWalletMapper, MyWallet> {
         if (restResponse.getStatus()!=ResultCode.SUCCESS_CODE){
               return  restResponse;
         }
-        WalletCathSumDto sumDto=JSONUtil.toBean( restResponse.getData().toString(),WalletCathSumDto.class);
+        String data=JSONObject.toJSONString(restResponse.getData());
+        WalletCathSumDto sumDto=JSONUtil.toBean( data,WalletCathSumDto.class);
         if (sumDto==null){
             return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "参数不能为空");
         }
-        BigDecimal commission=amount.divide(sumDto.getProceduReates()).multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP);
+        BigDecimal commission=amount.multiply(sumDto.getProceduReates()).divide(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP);
         BigDecimal balnece=sumDto.getBalance();
         //到账金额
-        BigDecimal realAmount=balnece.subtract(commission);
+        BigDecimal realAmount=amount;
         if (amount.compareTo(realAmount)>0){
-            realAmount=amount;
+            realAmount=balnece.subtract(commission);
         }
         log.info("-----提现申请-----proceduReates==="+sumDto.getProceduReates()+"----commission===="+commission+"---realAmount==="+realAmount);
         //添加账号

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

@@ -12,7 +12,6 @@ import com.github.wxiaoqi.security.admin.vo.WalletCathPageVo;
 import com.github.wxiaoqi.security.admin.vo.WalletCathVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
-import com.google.common.collect.Maps;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -40,7 +39,9 @@ public class MyWalletCathBiz extends BaseBiz<MyWalletCathMapper, MyWalletCath> {
 
         Example example = new Example(MyWalletCath.class);
         Example.Criteria criteria = example.createCriteria();
-        criteria.andEqualTo("stauts", state);
+        if (Objects.nonNull(state)) {
+            criteria.andEqualTo("stauts", state);
+        }
         criteria.andEqualTo("userId", userId);
         example.setOrderByClause("crt_time DESC");
         PageDataVO<MyWalletCath> walletCathPage = PageDataVO.pageInfo(pageNo, pageSize, () -> mapper.selectByExample(example));
@@ -122,7 +123,7 @@ public class MyWalletCathBiz extends BaseBiz<MyWalletCathMapper, MyWalletCath> {
         return userIdAndPersonalConsumptionMap;
     }
 
-    public WalletCathSumDto sumCathAmount(Integer type){
-        return  mapper.sumCathAmount(type);
+    public WalletCathSumDto sumCathAmount(Integer userId,Integer type){
+        return  mapper.sumCathAmount(userId,type);
     }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/config/XxlJobConfig.java

+package com.github.wxiaoqi.security.admin.config;
+
+import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * xxl-job config
+ *
+ * @author xuxueli 2017-04-28
+ */
+@Slf4j
+@Configuration
+public class XxlJobConfig {
+
+    @Value("${xxl.job.admin.addresses}")
+    private String adminAddresses;
+
+    @Value("${xxl.job.executor.appname}")
+    private String appName;
+
+    @Value("${xxl.job.executor.ip}")
+    private String ip;
+
+    @Value("${xxl.job.executor.port}")
+    private int port;
+
+    @Value("${xxl.job.accessToken}")
+    private String accessToken;
+
+    @Value("${xxl.job.executor.logpath}")
+    private String logPath;
+
+    @Value("${xxl.job.executor.logretentiondays}")
+    private int logRetentionDays;
+
+
+    @Bean(initMethod = "start", destroyMethod = "destroy")
+    public XxlJobSpringExecutor xxlJobExecutor() {
+        log.info(">>>>>>>>>>> xxl-job config init.");
+        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
+        xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
+        xxlJobSpringExecutor.setAppName(appName);
+        xxlJobSpringExecutor.setIp(ip);
+        xxlJobSpringExecutor.setPort(port);
+        xxlJobSpringExecutor.setAccessToken(accessToken);
+        xxlJobSpringExecutor.setLogPath(logPath);
+        xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
+
+        return xxlJobSpringExecutor;
+    }
+
+    /**
+     * 针对多网卡、容器内部署等情况，可借助 "spring-cloud-commons" 提供的 "InetUtils" 组件灵活定制注册IP；
+     *
+     *      1、引入依赖：
+     *          <dependency>
+     *             <groupId>org.springframework.cloud</groupId>
+     *             <artifactId>spring-cloud-commons</artifactId>
+     *             <version>${version}</version>
+     *         </dependency>
+     *
+     *      2、配置文件，或者容器启动变量
+     *          spring.cloud.inetutils.preferred-networks: 'xxx.xxx.xxx.'
+     *
+     *      3、获取IP
+     *          String ip_ = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
+     */
+
+
+}
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/jobhandler/RentDepositJobHandler.java

+package com.github.wxiaoqi.security.admin.jobhandler;
+
+import com.github.wxiaoqi.security.common.util.IntervalUtil;
+import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
+import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
+import com.xxfc.platform.order.contant.enumerate.RefundStatusEnum;
+import com.xxfc.platform.order.entity.BaseOrder;
+import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
+import com.xxfc.platform.order.entity.OrderViolation;
+import com.xxfc.platform.universal.constant.DictionaryKey;
+import com.xxfc.platform.universal.entity.Dictionary;
+import com.xxfc.platform.universal.feign.ThirdFeign;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.IJobHandler;
+import com.xxl.job.core.handler.annotation.JobHandler;
+import com.xxl.job.core.log.XxlJobLogger;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.weekend.WeekendSqls;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
+import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
+
+/**
+ * 跨平台Http任务
+ *
+ * @author xuxueli 2018-09-16 03:48:34
+ */
+@JobHandler(value = "walletHandler")
+@Component
+@Slf4j
+public class RentDepositJobHandler extends IJobHandler {
+
+    @Override
+    public ReturnT<String> execute(String var1) throws Exception {
+        try {
+
+
+            ReturnT returnT = new ReturnT(){{
+                setCode(100);
+                setMsg("成功");
+            }};
+            return returnT;
+        } catch (Exception e) {
+            XxlJobLogger.log(e);
+            return FAIL;
+        } finally {
+            ;
+        }
+    }
+
+}
\ No newline at end of file

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

@@ -29,5 +29,5 @@ public interface MyWalletCathMapper extends Mapper<MyWalletCath> {
      * @param type 1-日；2-月
      * @return
      */
-    WalletCathSumDto sumCathAmount(@Param("type") int type);
+    WalletCathSumDto sumCathAmount(@Param("userId") Integer userId,@Param("type") int type);
 }

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

@@ -105,6 +105,7 @@ public class MyWalletController {
     public ObjectRestResponse  applyCath(@RequestBody ApplyCathVo applyCathVo, HttpServletRequest request){
         try {
             Integer userId=Integer.parseInt(userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getId());
+            applyCathVo.setUserId(userId);
             return   myWalletBiz.applyCath(applyCathVo);
         }catch (Exception e) {
             throw new BaseException(e);

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

@@ -35,7 +35,7 @@ public class WalletCathController {
 
     @ApiOperation("提现记录列表")
     @GetMapping("/page")
-    public ObjectRestResponse<WalletCathPageVo> findWatchCatchByWithdrawalState(@RequestParam("state") Integer state,
+    public ObjectRestResponse<WalletCathPageVo> findWatchCatchByWithdrawalState(@RequestParam(value = "state",required = false) Integer state,
                                                                                 @RequestParam("pageNo") Integer pageNo,
                                                                                 @RequestParam("pageSize") Integer pageSize,
                                                                                 HttpServletRequest request) {

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

@@ -38,7 +38,7 @@
     <select id="sumCathAmount" resultType="com.github.wxiaoqi.security.admin.dto.WalletCathSumDto">
         select IFNULL(SUM(amount),0) as sumAmount,COUNT(*) as `number` from my_wallet_cath
         <where>
-
+            user_id=#{userId} and stauts in(0,1)
             <choose>
                 <when test="type ==1 ">
                     AND date_format(from_unixtime(crt_time/1000),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d')

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/CofigBiz.java

@@ -39,12 +39,13 @@ public class CofigBiz extends BaseBiz<CofigMapper,Cofig> {
      * @param cofig
      * @return
      */
-    @CacheClear(pre = "app:withdrawrule:",key = "{1.type}")
+    @CacheClear(pre = "app:withdrawrule{1.type}")
     public int updateConfig(Cofig cofig) {
         EntityUtils.setUpdatedInfo(cofig);
        return mapper.updateByPrimaryKeySelective(cofig);
     }
 
+    @Cache(key = "app:withdrawrule:88")
     public WithDrawRuleVo getWithDrawRule(){
         WithDrawRuleVo withDrawRuleVo = new WithDrawRuleVo();
         Example example  = new Example(Cofig.class);

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/config/RedisConfiguration.java

@@ -20,7 +20,7 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
 public class RedisConfiguration {
 
     @Bean
-    public RedisTemplate<String, Object> customRedisTemplate(RedisConnectionFactory factory) {
+    public RedisTemplate<String, Object> configRedisTemplate(RedisConnectionFactory factory) {
         RedisTemplate redisTemplate = new RedisTemplate();
         redisTemplate.setConnectionFactory(factory);
         RedisSerializer<String> stringSerializer = new StringRedisSerializer();

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/rest/CofigController.java

@@ -44,4 +44,12 @@ public class CofigController extends BaseController<CofigBiz,Cofig> {
     public WithDrawRuleVo getWithDrawRule(){
         return  baseBiz.getWithDrawRule();
     }
+
+
+
+    @GetMapping("/app/unauth/wallet_rule")
+    @IgnoreUserToken
+    public ObjectRestResponse getWalletRule(){
+        return  ObjectRestResponse.succ(baseBiz.getWithDrawRule());
+    }
 }
\ No newline at end of file

xx-common/xx-common-platform-web/pom.xml

@@ -135,6 +135,13 @@
             <artifactId>spring-boot-starter-data-mongodb</artifactId>
         </dependency>
 
+        <!--  分布式锁 -->
+        <dependency>
+            <groupId>org.redisson</groupId>
+            <artifactId>redisson-spring-boot-starter</artifactId>
+            <version>3.11.0</version>
+        </dependency>
+
     </dependencies>
 
 </project>
\ No newline at end of file

xx-common/xx-common-platform/pom.xml

@@ -85,5 +85,12 @@
             <artifactId>beetl</artifactId>
             <version>2.9.3</version>
         </dependency>
+
+        <!-- xxl-job-core -->
+        <dependency>
+            <groupId>com.xuxueli</groupId>
+            <artifactId>xxl-job-core</artifactId>
+            <version>2.0.2</version>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file

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

@@ -77,12 +77,24 @@ public class OrderRefund implements Serializable {
 	@ApiModelProperty(value = "退款说明")
     private String refundDesc;
 	
-	    /**
+	/**
      *  创建时间
      */
     @Column(name = "crt_time")
 	@ApiModelProperty(value = "创建时间", hidden = true )
     private Long crtTime;
-	
 
+	/**
+	 *  创建时间
+	 */
+	@Column(name = "original_refund_amount")
+	@ApiModelProperty(value = "原来要退款的金额", hidden = true )
+	private BigDecimal originalRefundAmount;
+
+	/**
+	 *  创建时间
+	 */
+	@Column(name = "deduct_amount")
+	@ApiModelProperty(value = "扣除的金额", hidden = true )
+	private BigDecimal deductAmount;
 }

xx-order/xx-order-server/pom.xml

@@ -26,13 +26,6 @@
             <scope>compile</scope>
         </dependency>
 
-        <!-- xxl-job-core -->
-        <dependency>
-            <groupId>com.xuxueli</groupId>
-            <artifactId>xxl-job-core</artifactId>
-            <version>2.0.2</version>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-amqp</artifactId>

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

@@ -335,18 +335,20 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
     private void rentRefundProcess(BaseOrder baseOrder, BigDecimal depositAmount, Long timeLag, String dicParentKey) {
         //计算退款金额
             // 1、押金 + 租金(规则扣除)
-        //BigDecimal refundGoodsAmount = baseOrder.getGoodsAmount();
+        BigDecimal originalRefundAmount = BigDecimal.ZERO.add(baseOrder.getGoodsAmount().subtract(baseOrder.getCouponAmount()));
         StringBuilder refundDescBuilder = new StringBuilder("取消订单退款:");
         if(null == depositAmount) {
             depositAmount = BigDecimal.ZERO;
         }
         //商品价格 - 优惠券减免的价格
-        BigDecimal refundGoodsAmount = calculateRefund(baseOrder.getGoodsAmount().subtract(baseOrder.getCouponAmount()), timeLag, dicParentKey, refundDescBuilder);
+        BigDecimal refundGoodsAmount = calculateRefund(originalRefundAmount, timeLag, dicParentKey, refundDescBuilder);
 
         //退款金额
         BigDecimal refundAmount = depositAmount.add(refundGoodsAmount);
+        originalRefundAmount = depositAmount.add(originalRefundAmount);
+
         //退款子流程: 订单基础，退款描述，退款金额
-        refundSubProcess(baseOrder, refundDescBuilder.toString(), refundAmount, RefundTypeEnum.ORDER_FUND.getCode(), RefundStatusEnum.ALL.getCode());
+        refundSubProcess(baseOrder, refundDescBuilder.toString(), originalRefundAmount, refundAmount, RefundTypeEnum.ORDER_FUND.getCode(), RefundStatusEnum.ALL.getCode());
     }
 
     public BigDecimal calculateRefund(BigDecimal goodsAmount, Long timeLag, String dicParentKey, StringBuilder refundDescBuilder) {
@@ -390,7 +392,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
      * @param refundType
      * @param refundStatus
      */
-    public void refundSubProcess(BaseOrder baseOrder, String refundDesc, BigDecimal refundAmount, Integer refundType, Integer refundStatus) {
+    public void refundSubProcess(BaseOrder baseOrder, String refundDesc, BigDecimal originalRefundAmount, BigDecimal refundAmount, Integer refundType, Integer refundStatus) {
         String refundTradeNo = null;
         //0 小于 退款金额
         if(BigDecimal.ZERO.compareTo(refundAmount) < 0) {
@@ -404,7 +406,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
         }
 
         //记录订单退款记录
-        Integer flag = addOrderRefund(baseOrder.getId(), refundDesc, refundAmount, refundTradeNo, refundType);
+        Integer flag = addOrderRefund(baseOrder.getId(), refundDesc, originalRefundAmount, refundAmount, refundTradeNo, refundType);
 
         //更新订单的退款状态和退款时间
         if(SYS_TRUE.equals(flag) && null != refundStatus) {
@@ -424,7 +426,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
      * @param refundAmount
      * @param refundTradeNo
      */
-    private Integer addOrderRefund(Integer orderId, String refundDesc, BigDecimal refundAmount, String refundTradeNo, Integer refundType) {
+    private Integer addOrderRefund(Integer orderId, String refundDesc, BigDecimal originalRefundAmount, BigDecimal refundAmount, String refundTradeNo, Integer refundType) {
         //如果返回的流水为空，则当做失败
         Integer refundStatus = SYS_TRUE;
         if(StrUtil.isBlank(refundTradeNo)) {
@@ -438,6 +440,8 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
             setTradeNo(refundTradeNo);
             setRefundType(RefundTypeEnum.ORDER_FUND.getCode());
         }};
+        orderRefund.setOriginalRefundAmount(originalRefundAmount);
+        orderRefund.setDeductAmount(originalRefundAmount.subtract(refundAmount));
         orderRefund.setRefundAmount(refundAmount);
         orderRefund.setRefundDesc(refundDesc);
         orderRefund.setRefundStatus(refundStatus);
@@ -625,5 +629,4 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
 //        DailyOrderStatistics dailyOrderStatistics= mapper.getTotalOrder();
 //    }
 
-
 }
\ No newline at end of file

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

@@ -56,19 +56,20 @@ public class OrderRefundBiz extends BaseBiz<OrderRefundMapper,OrderRefund> {
             }});
             //还车扣除款 剩余的 钱，再减去违章预备金
             BigDecimal refundAmont = crosstown.getRestDeposit().subtract(illegalReserve);
+            BigDecimal originalRefundAmount = crosstown.getRestDeposit().add(crosstown.getDeductionCost()).subtract(illegalReserve);
             List<DedDetailDTO> dddList = JSONUtil.toBean(crosstown.getDedDetail(), List.class);
             String refundDesc = "退还押金："+ refundAmont.toString()+ "(已扣除 违章预备金："+ illegalReserve.toString();
             for(DedDetailDTO ddd : dddList) {
                 refundDesc += ", "+ ddd.getDeductions()+ ":"+ ddd.getCost();
             }
             refundDesc += ")";
-            refundTrigger(orderMQDTO, orderMQDTO.getOrderRentVehicleDetail(), illegalReserve, refundAmont, refundDesc, RefundStatusEnum.RESIDUE_ILLEGAL.getCode());
+            refundTrigger(orderMQDTO, orderMQDTO.getOrderRentVehicleDetail(), illegalReserve, originalRefundAmount, refundAmont, refundDesc, RefundStatusEnum.RESIDUE_ILLEGAL.getCode());
         }
     }
 
-    public void refundTrigger(BaseOrder baseOrder, OrderRentVehicleDetail orvd, BigDecimal residueAmount, BigDecimal refundAmont, String refundDesc, Integer refundStatus) {
+    public void refundTrigger(BaseOrder baseOrder, OrderRentVehicleDetail orvd, BigDecimal residueAmount, BigDecimal originalRefundAmount, BigDecimal refundAmont, String refundDesc, Integer refundStatus) {
         //退款子流程: 订单基础，退款描述，退款金额
-        baseOrderBiz.refundSubProcess(baseOrder, refundDesc, refundAmont, RefundTypeEnum.DEPOSIT.getCode(), refundStatus);
+        baseOrderBiz.refundSubProcess(baseOrder, refundDesc, originalRefundAmount, refundAmont, RefundTypeEnum.DEPOSIT.getCode(), refundStatus);
         //设置剩余没有返还的钱
         orderRentVehicleBiz.updateSelectiveById(new OrderRentVehicleDetail(){{
             setId(orvd.getId());

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

@@ -88,11 +88,8 @@ public class RentDepositJobHandler extends IJobHandler {
                         //还车扣除款 剩余的 钱，再减去违章预备金
                         BigDecimal refundAmont = orvd.getReturnPayResidue().subtract(orderViolation.getPrice());
                         String refundDesc = "退还押金："+ refundAmont.toString()+ "(已扣除 违章扣款："+ refundAmont.toString();
-    //                    for(DedDetailDTO ddd : dddList) {
-    //                        refundDesc += ", "+ ddd.getDeductions()+ ":"+ ddd.getCost();
-    //                    }
                         refundDesc += ")";
-                        orderRefundBiz.refundTrigger(baseOrder, orvd, refundAmont, refundAmont, refundDesc, RefundStatusEnum.REFUND_DEPOSIT.getCode());
+                        orderRefundBiz.refundTrigger(baseOrder, orvd, BigDecimal.ZERO, orvd.getReturnPayResidue(), refundAmont, refundDesc, RefundStatusEnum.REFUND_DEPOSIT.getCode());
                     }
 
                 }

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

@@ -220,18 +220,18 @@
     </select>
 
 
-    <select id="getTotalOrder" resultType="com.xxfc.platform.order.entity.DailyOrderStatistics">
-
-        select
-        date_format(refund_time,'%Y-%c-%d') as oneDay,
-        sum(1) as totalOrders,
-        sum(refund_time)as actualTotalIncome
-        from
-        base_order
-        where
-        date(refund_time)=date(now())-1
-        group by
-        date_format(refund_time,'%d')
-    </select>
+<!--    <select id="getTotalOrder" resultType="com.xxfc.platform.order.entity.DailyOrderStatistics">-->
+
+<!--        select-->
+<!--        date_format(refund_time,'%Y-%c-%d') as oneDay,-->
+<!--        sum(1) as totalOrders,-->
+<!--        sum(refund_time)as actualTotalIncome-->
+<!--        from-->
+<!--        base_order-->
+<!--        where-->
+<!--        date(refund_time)=date(now())-1-->
+<!--        group by-->
+<!--        date_format(refund_time,'%d')-->
+<!--    </select>-->
 
 </mapper>
\ No newline at end of file