Merge remote-tracking branch 'origin/base-modify' into base-modify

ace-common/src/main/java/com/github/wxiaoqi/security/common/util/ReferralCodeUtil.java

@@ -6,7 +6,7 @@ import java.util.Set;
 
 public class ReferralCodeUtil {
 	//验证码长度
-	private static final int LEN = 6;
+	private static final int LEN = 8;
 	//验证码字符初始列表
 	private static final char STUFFS[] = {
 			'E','5','F','C','D','G','3','H',

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -22,6 +22,7 @@ import com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant;
 import com.github.wxiaoqi.security.common.msg.BaseResponse;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.EmojiFilter;
+import com.github.wxiaoqi.security.common.util.ReferralCodeUtil;
 import com.github.wxiaoqi.security.common.util.UUIDUtils;
 import com.github.wxiaoqi.security.common.util.VerificationUtils;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
@@ -306,7 +307,7 @@ public class AppPermissionService {
 
             }
             //生成邀请码 长度改为8 不然重复率太高
-            rsUserDetail.setCode(UUIDUtils.genCodes(8));
+            rsUserDetail.setCode(ReferralCodeUtil.encode(userid));
             appUserDetailBiz.insertSelective(rsUserDetail);
             log.error("注册：新增用户详情： " + userid);
            /* //绑定上下线关系

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/UserCouponController.java

@@ -65,7 +65,7 @@ public class UserCouponController extends ActivityBaseController<UserCouponBiz>
             @RequestParam(value = "amount",defaultValue ="0.00" ) BigDecimal amount,
             @RequestParam(value = "type",defaultValue ="1" ) Integer type
     ) {
-        return   baseBiz.useTickerNo(userId,tickerNos,orderNo,channel,amount,type);
+        return  baseBiz.useTickerNo(userId,tickerNos,orderNo,channel,amount,type);
     }
 
     @ApiOperation("优惠卷取消使用")

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

@@ -71,9 +71,16 @@ public class OrderRefundBiz extends BaseBiz<OrderRefundMapper,OrderRefund> {
 
         //未退还， 进行挂起保留违章预备金 的退还
         if(RefundStatusEnum.NONE.getCode().equals(orderMQDTO.getRefundStatus())) {
+            Integer crosstownTypeEnum;
+            //判断是否定损过
+            if(SYS_TRUE.equals(orderMQDTO.getOrderRentVehicleDetail().getFixedLossStatus())) {
+                crosstownTypeEnum = CrosstownTypeEnum.FIXED_LOSS.getCode();
+            }else {
+                crosstownTypeEnum = CrosstownTypeEnum.ARRIVE.getCode();
+            }
             OrderVehicleCrosstown crosstown = crosstownBiz.selectOne(new OrderVehicleCrosstown(){{
                 setOrderId(orderMQDTO.getId());
-                setType(CrosstownTypeEnum.ARRIVE.getCode());
+                setType(crosstownTypeEnum);
             }});
             //还车扣除款 剩余的 钱，再减去违章预备金
             BigDecimal refundAmont = crosstown.getRestDeposit().subtract(illegalReserve);

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

@@ -78,7 +78,7 @@ public class OrderRefundController extends BaseController<OrderRefundBiz,OrderRe
                 }
                 orderRefundAmount = orderRefundBiz.calculateRefund(orderPageVO.getGoodsAmount().subtract(orderPageVO.getCouponAmount())
                         , orderPageVO.getOrderTourDetail().getStartTime() - System.currentTimeMillis()
-                        , DictionaryKey.APP_ORDER+ "_"+ DictionaryKey.RENT_REFUND
+                        , DictionaryKey.APP_ORDER+ "_"+ key
                         , refundDescBuilder);
                 break;
             default: