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

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:

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

@@ -64,7 +64,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
     @Value("${universal.url}")
     String weixinHost;
 
-    String notifyUrl = weixinHost + "/service/payment/notify/alipay";
+
 
     public JSONObject preparepay(OrderPayVo orderPayVo) {
         if (null == orderPayVo) {
@@ -280,6 +280,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
         AlipayClient alipayClient = new DefaultAlipayClient(SystemConfig.ALIPAY_PAY_BASE_URL + "/gateway.do",
                 SystemConfig.ALIPAY_APPID, SystemConfig.ALIPAY_PRIVATE_KEY, AlipayConstants.FORMAT_JSON,
                 "UTF-8", SystemConfig.ALIPAY_PUBLIC_KEY, AlipayConstants.SIGN_TYPE_RSA2);
+        String notifyUrl = weixinHost + "/service/payment/notify/alipay";
         orderPayVo.setNotifyUrl(notifyUrl);
         try {
             if (orderPayVo.getPayWay() == 2) { //支付宝APP支付
@@ -361,7 +362,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
         //选填字段，信用授权订单，针对信用全免订单，传入该值完结信用订单，形成芝麻履约记录
         // model.setExtraParam("{\"unfreezeBizInfo\":\"{\\\"bizComplete\\\":\\\"true\\\"}\"}");
         request.setBizModel(model);
-        request.setNotifyUrl(notifyUrl);//异步通知地址，必填，该接口只通过该参数进行异步通知
+        request.setNotifyUrl("");//异步通知地址，必填，该接口只通过该参数进行异步通知
         AlipayFundAuthOrderUnfreezeResponse response = alipayClient.execute(request);
         log.info("response: {}" + response.getBody());
     }