Merge remote-tracking branch 'origin/dev' into dev

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityRuleBiz.java

@@ -66,6 +66,10 @@ public class ActivityRuleBiz extends BaseBiz<ActivityRuleMapper,ActivityRule> {
                             Integer id=array.getJSONObject(i).getInteger("id");
                             Coupon coupon=couponBiz.selectById(id);
                             if (coupon!=null&&coupon.getIsDel()==0&&coupon.getStatus()==1){
+                                if (coupon.getValidType()==2){
+                                    int days=coupon.getValidDays()==null?0:coupon.getValidDays();
+                                    coupon.setValidEndTime(System.currentTimeMillis()+days*24*60*60*1000);
+                                }
                                 coupons.add(couponBiz.selectById(id));
                             }
                         }

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

 package com.xxfc.platform.order.biz;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
@@ -568,6 +569,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
         if (updateSelectiveByIdRe(baseOrder) > 0) {
             return selectById(baseOrder.getId());
         } else {
+            log.error(StrUtil.format("数据更新失败：baseOrder: {}", JSONUtil.toJsonStr(baseOrder)));
             throw new BaseException(ResultCode.DB_OPERATION_FAIL_CODE);
         }
     }

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

@@ -208,7 +208,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
         updateBaseOrder.setRefundTime(System.currentTimeMillis());
         updateBaseOrder.setVersion(baseOrder.getVersion());
         if(SYS_TRUE.equals(flag) && null != refundStatus) {
-            BeanUtil.copyProperties(baseOrderBiz.updateSelectiveByIdReT(updateBaseOrder), baseOrder);
+            BeanUtil.copyProperties(baseOrderBiz.updateSelectiveByIdReT(updateBaseOrder, Boolean.TRUE), baseOrder);
         }
     }
 

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

@@ -357,7 +357,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 orderDepositRefundRecordBiz.saveFixLossRecord(depositRefundRecord);
                 //修改訂單狀態為定損
                 baseOrder.setStatus(OrderStatusEnum.ORDER_FIXED_LOSS.getCode());
-                baseOrderBiz.updateSelectiveByIdReT(baseOrder);
+                baseOrder = baseOrderBiz.updateSelectiveByIdReT(baseOrder);
                 orderRentVehicleDetail.setFixedLossStatus(1);
                 orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);
             } else if (orderVehicleCrosstown.getType() == CrosstownTypeEnum.FIXED_LOSS_NOW.getCode()) { //直接定损还车
@@ -370,7 +370,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 orderDepositRefundRecordBiz.saveFixLossRecord(depositRefundRecord);
                 //修改訂單狀態為已完成
                 baseOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
-                baseOrderBiz.updateSelectiveByIdReT(baseOrder);
+                baseOrder = baseOrderBiz.updateSelectiveByIdReT(baseOrder);
                 orderRentVehicleDetail.setFixedLossStatus(1);
                 baseOrderBiz.sendOrderMq(orderRentVehicleDetail, null, null, baseOrder, OrderMQDTO.ORDER_FINISH);
                 orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);