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

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/UserBiz.java

@@ -55,7 +55,7 @@ public class UserBiz {
         if(map.get("nickname") != null && !("").equals(map.get("nickname"))){
             str += "nickname="+map.get("nickname").toString();
         }
-        String result = this.doPost(imUrl + "/xxfcim/user/register",str) ;
+        String result = this.doPost(imUrl + "/user/register",str) ;
         JSONObject json = JSONObject.parseObject(result);
         //如果已经注册过，查询出手机号对应用户信息执行登录返回
         if(0 == json.getInteger("resultCode")){
@@ -105,7 +105,7 @@ public class UserBiz {
             str += "password="+map.get("password").toString();
         }
         str += "&areaCode=86";
-        String result = this.doPost(imUrl + "/xxfcim/user/login",str) ;
+        String result = this.doPost(imUrl + "/user/login",str) ;
         JSONObject json = JSONObject.parseObject(result);
         log.info("用户登录：result = {}, telephone = {}, password = {}, userId = {}", result, map.get("telephone"), map.get("password"), map.get("userId"));
         json.put("password",map.get("password").toString());

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

@@ -280,6 +280,8 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 orderDepositRefundRecordBiz.saveNormalRecord(depositRefundRecord);
                 baseOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
                 baseOrderBiz.updateSelectiveById(baseOrder);
+                orderRentVehicleDetail.setFixedLossStatus(0);
+                orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);
                 baseOrderBiz.sendOrderMq(orderRentVehicleDetail, null, null, baseOrder, OrderMQDTO.ORDER_FINISH);
             } else if (orderVehicleCrosstown.getType() == CrosstownTypeEnum.FIXED_LOSS.getCode()) { //定损还车，添加定损记录
                 //添加定损记录
@@ -291,6 +293,8 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 orderDepositRefundRecordBiz.saveFixLossRecord(depositRefundRecord);
                 baseOrder.setStatus(OrderStatusEnum.ORDER_FIXED_LOSS.getCode());
                 baseOrderBiz.updateSelectiveById(baseOrder);
+                orderRentVehicleDetail.setFixedLossStatus(1);
+                orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);
             }
         } else if (baseOrder.getStatus() == OrderStatusEnum.ORDER_FIXED_LOSS.getCode()) {//定损后还车
             DepositRefundRecord depositRefundRecord = orderDepositRefundRecordBiz.findByCrossIdAndStatus(orderVehicleCrosstown.getId(), DepositRefundStatus.FIXLOSSREFUND.getCode());

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

@@ -72,6 +72,7 @@ public class OrderViolationController extends BaseController<OrderViolationBiz,
             orderViolation.setUpdTime(new BigInteger(String.valueOf(System.currentTimeMillis())));
             getBaseBiz().updateOrderViolation(orderViolation);
         }
+        orderDepositRefundRecordBiz.saveViolationDeposit(orderViolation);
         return ObjectRestResponse.succ();
     }
 

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());
     }