Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunT...

Pu Zhibing

2025-11-03 074deae253e3f319377c9f39f18afc6aa5ae1efb

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong into dev

 UserQYTTravel/external-data-qyttravel_localhost.xml

New file
@@ -0,0 +1,330 @@
<?xml version="1.0" encoding="UTF-8"?>
<data>
  <object-set>
    <table path="qyttravel.app_complaints">
      <table path="qyttravel.t_user" name="userId" from="userId" to="id"/>
      <table path="qyttravel.t_driver" name="driverId" from="driverId" to="id"/>
    </table>
    <table path="qyttravel.app_driver_ride">
      <table path="qyttravel.t_company" name="companyId" from="companyId" to="id"/>
      <table path="qyttravel.t_car_brand" name="brandId" from="brandId" to="id"/>
      <table path="qyttravel.t_user" name="userId" from="userId" to="id"/>
    </table>
    <table path="qyttravel.app_evaluate">
      <table path="qyttravel.app_order_ride" name="orderId" from="orderId" to="id"/>
      <table path="qyttravel.t_driver" name="driverId" from="driverId" to="id"/>
      <table path="qyttravel.t_user" name="userId" from="userId" to="id"/>
    </table>
    <table path="qyttravel.app_financial">
      <table path="qyttravel.t_company" name="companyId" from="companyId" to="id"/>
      <table path="qyttravel.t_user" name="userId" from="userId" to="id"/>
    </table>
    <table path="qyttravel.app_order_invitation">
      <table path="qyttravel.app_order_ride" name="orderRideId" from="orderRideId" to="id"/>
      <table path="qyttravel.app_order_travel" name="orderTravelId" from="orderTravelId" to="id"/>
    </table>
    <table path="qyttravel.app_order_ride">
      <table path="qyttravel.t_user" name="userId" from="userId" to="id"/>
      <table path="qyttravel.app_order_travel" name="travelId" from="travelId" to="id"/>
      <table path="qyttravel.app_driver_ride" name="driverId" from="driverId" to="id"/>
    </table>
    <table path="qyttravel.app_order_travel">
      <table path="qyttravel.app_driver_ride" name="driverId" from="driverId" to="id"/>
    </table>
    <table path="qyttravel.sys_dept">
      <table path="qyttravel.sys_dept" name="pid" from="pid" to="id"/>
    </table>
    <table path="qyttravel.sys_dict">
      <table path="qyttravel.sys_dict" name="pid" from="pid" to="id"/>
    </table>
    <table path="qyttravel.sys_menu">
      <table path="qyttravel.sys_menu" name="pcode" from="pcode" to="code"/>
    </table>
    <table path="qyttravel.sys_role">
      <table path="qyttravel.sys_role" name="pid" from="pid" to="id"/>
    </table>
    <table path="qyttravel.sys_user">
      <table path="qyttravel.sys_role" name="roleid" from="roleid" to="id"/>
      <table path="qyttravel.sys_dept" name="deptid" from="deptid" to="id"/>
      <table path="qyttravel.t_company" name="objectId" from="objectId" to="id"/>
    </table>
    <table path="qyttravel.t_abnormal_pay_order">
      <table path="qyttravel.t_user" name="userId" from="userId" to="id"/>
      <table path="qyttravel.t_company" name="companyId" from="companyId" to="id"/>
    </table>
    <table path="qyttravel.t_additional_fee">
      <table path="qyttravel.t_company" name="companyId" from="companyId" to="id"/>
    </table>
    <table path="qyttravel.t_balance_modify_record">
      <table path="qyttravel.t_user" name="userId" from="userId" to="id"/>
    </table>
    <table path="qyttravel.t_bank_card">
      <table path="qyttravel.t_driver" name="driverId" from="driverId" to="id"/>
    </table>
    <table path="qyttravel.t_car">
      <table path="qyttravel.t_company" name="companyId" from="companyId" to="id"/>
      <table path="qyttravel.t_company" name="franchiseeId" from="franchiseeId" to="id"/>
      <table path="qyttravel.t_car_model" name="carModelId" from="carModelId" to="id"/>
      <table path="qyttravel.t_car_brand" name="carBrandId" from="carBrandId" to="id"/>
      <table path="qyttravel.t_driver" name="useDriverId" from="useDriverId" to="id"/>
    </table>
    <table path="qyttravel.t_car_insurance">
      <table path="qyttravel.t_car" name="carId" from="carId" to="id"/>
    </table>
    <table path="qyttravel.t_car_model">
      <table path="qyttravel.t_car_brand" name="brandId" from="brandId" to="id"/>
    </table>
    <table path="qyttravel.t_car_service">
      <table path="qyttravel.t_car" name="carId" from="carId" to="id"/>
      <table path="qyttravel.t_server_carmodel" name="serverCarModelId" from="serverCarModelId" to="id"/>
    </table>
    <table path="qyttravel.t_company_city">
      <table path="qyttravel.t_company" name="companyId" from="companyId" to="id"/>
    </table>
    <table path="qyttravel.t_complaint">
      <table path="qyttravel.t_user" name="userId" from="userId" to="id"/>
      <table path="qyttravel.t_driver" name="driverId" from="driverId" to="id"/>
    </table>
    <table path="qyttravel.t_driver">
      <table path="qyttravel.t_company" name="companyId" from="companyId" to="id"/>
      <table path="qyttravel.t_car" name="carId" from="carId" to="id"/>
    </table>
    <table path="qyttravel.t_driver_activity">
      <table path="qyttravel.t_company" name="companyId" from="companyId" to="id"/>
    </table>
    <table path="qyttravel.t_driver_activity_history">
      <table path="qyttravel.t_driver" name="driverId" from="driverId" to="id"/>
    </table>
    <table path="qyttravel.t_driver_activity_online">
      <table path="qyttravel.t_company" name="companyId" from="companyId" to="id"/>
      <table path="qyttravel.t_driver_activity" name="driverActivityId" from="driverActivityId" to="id"/>
    </table>
    <table path="qyttravel.t_driver_activity_order">
      <table path="qyttravel.t_company" name="companyId" from="companyId" to="id"/>
      <table path="qyttravel.t_driver_activity" name="driverActivityId" from="driverActivityId" to="id"/>
    </table>
    <table path="qyttravel.t_driver_activity_registered">
      <table path="qyttravel.t_company" name="companyId" from="companyId" to="id"/>
      <table path="qyttravel.t_driver_activity" name="driverActivityId" from="driverActivityId" to="id"/>
    </table>
    <table path="qyttravel.t_driver_line">
      <table path="qyttravel.t_driver" name="driverId" from="driverId" to="id"/>
      <table path="qyttravel.t_line" name="lineId" from="lineId" to="id"/>
    </table>
    <table path="qyttravel.t_driver_online">
      <table path="qyttravel.t_driver" name="driverId" from="driverId" to="id"/>
    </table>
    <table path="qyttravel.t_driver_punish">
      <table path="qyttravel.t_driver" name="driverId" from="driverId" to="id"/>
    </table>
    <table path="qyttravel.t_driver_service">
      <table path="qyttravel.t_driver" name="driverId" from="driverId" to="id"/>
    </table>
    <table path="qyttravel.t_driver_work">
      <table path="qyttravel.t_driver" name="driverId" from="driverId" to="id"/>
    </table>
    <table path="qyttravel.t_line_company">
      <table path="qyttravel.t_line" name="lineId" from="lineId" to="id"/>
      <table path="qyttravel.t_company" name="companyId" from="companyId" to="id"/>
    </table>
    <table path="qyttravel.t_line_price">
      <table path="qyttravel.t_line" name="lineId" from="lineId" to="id"/>
      <table path="qyttravel.t_server_carmodel" name="serverCarModelId" from="serverCarModelId" to="id"/>
    </table>
    <table path="qyttravel.t_line_shift">
      <table path="qyttravel.t_line" name="lineId" from="lineId" to="id"/>
    </table>
    <table path="qyttravel.t_line_shift_driver">
      <table path="qyttravel.t_line_shift" name="lineShiftId" from="lineShiftId" to="id"/>
      <table path="qyttravel.t_driver" name="driverId" from="driverId" to="id"/>
    </table>
    <table path="qyttravel.t_line_site">
      <table path="qyttravel.t_line" name="lineId" from="lineId" to="id"/>
      <table path="qyttravel.t_site" name="siteId" from="siteId" to="id"/>
    </table>
    <table path="qyttravel.t_line_site">
      <table path="qyttravel.t_line" name="lineId" from="lineId" to="id"/>
      <table path="qyttravel.t_site" name="siteId" from="siteId" to="id"/>
    </table>
    <table path="qyttravel.t_merchant_activity">
      <table path="qyttravel.t_merchant" name="merchantId" from="merchantId" to="id"/>
      <table path="qyttravel.t_company" name="companyId" from="companyId" to="id"/>
    </table>
    <table path="qyttravel.t_merchant_activity_slave">
      <table path="qyttravel.t_merchant_activity" name="merchantActivityId" from="merchantActivityId" to="id"/>
      <table path="qyttravel.t_merchant_coupon" name="merchantCouponId" from="merchantCouponId" to="id"/>
    </table>
    <table path="qyttravel.t_merchant_coupon">
      <table path="qyttravel.t_merchant" name="merchantId" from="merchantId" to="id"/>
    </table>
    <table path="qyttravel.t_open_city_business">
      <table path="qyttravel.t_open_city" name="openCityId" from="openCityId" to="id"/>
    </table>
    <table path="qyttravel.t_order_cross_city">
      <table path="qyttravel.t_user" name="userId" from="userId" to="id"/>
      <table path="qyttravel.t_server_carmodel" name="serverCarModelId" from="serverCarModelId" to="id"/>
      <table path="qyttravel.t_driver" name="driverId" from="driverId" to="id"/>
      <table path="qyttravel.t_line" name="lineId" from="lineId" to="id"/>
      <table path="qyttravel.t_line_shift_driver" name="lineShiftDriverId" from="lineShiftDriverId" to="id"/>
      <table path="qyttravel.t_car" name="carId" from="carId" to="id"/>
      <table path="qyttravel.t_user_red_packet_record" name="redPacketId" from="redPacketId" to="id"/>
      <table path="qyttravel.t_user_coupon_record" name="couponId" from="couponId" to="id"/>
      <table path="qyttravel.t_user_activity_discount2" name="activityId" from="activityId" to="id"/>
      <table path="qyttravel.t_taxi_card" name="taxiCardId" from="taxiCardId" to="id"/>
      <table path="qyttravel.t_user_taxi_card" name="userTaxiCardId" from="userTaxiCardId" to="id"/>
      <table path="qyttravel.t_company" name="companyId" from="companyId" to="id"/>
    </table>
    <table path="qyttravel.t_order_evaluate">
      <table path="qyttravel.driverId" name="driverId" from="driverId" to="id"/>
      <table path="qyttravel.t_user" name="userId" from="userId" to="id"/>
    </table>
    <table path="qyttravel.t_order_logistics">
      <table path="qyttravel.t_user" name="userId" from="userId" to="id"/>
      <table path="qyttravel.t_driver" name="driverId" from="driverId" to="id"/>
      <table path="qyttravel.t_car" name="carId" from="carId" to="id"/>
      <table path="qyttravel.t_user_red_packet_record" name="redPacketId" from="redPacketId" to="id"/>
      <table path="qyttravel.t_user_coupon_record" name="couponId" from="couponId" to="id"/>
      <table path="qyttravel.t_user_activity_discount1" name="activityId" from="activityId" to="id"/>
      <table path="qyttravel.t_company" name="companyId" from="companyId" to="id"/>
    </table>
    <table path="qyttravel.t_order_logistics_spread">
      <table path="qyttravel.t_order_logistics" name="orderLogisticsId" from="orderLogisticsId" to="id"/>
    </table>
    <table path="qyttravel.t_order_private_car">
      <table path="qyttravel.t_user" name="userId" from="userId" to="id"/>
      <table path="qyttravel.t_order_cross_city" name="crossCityOrderId" from="crossCityOrderId" to="id"/>
      <table path="qyttravel.t_server_carmodel" name="serverCarModelId" from="serverCarModelId" to="id"/>
      <table path="qyttravel.t_driver" name="driverId" from="driverId" to="id"/>
      <table path="qyttravel.t_line" name="lineId" from="lineId" to="id"/>
      <table path="qyttravel.t_line_shift_driver" name="lineShiftDriverId" from="lineShiftDriverId" to="id"/>
      <table path="qyttravel.t_car" name="carId" from="carId" to="id"/>
      <table path="qyttravel.t_user_red_packet_record" name="redPacketId" from="redPacketId" to="id"/>
      <table path="qyttravel.t_user_coupon_record" name="couponId" from="couponId" to="id"/>
      <table path="qyttravel.t_user_activity_discount1" name="activityId" from="activityId" to="id"/>
      <table path="qyttravel.t_taxi_card" name="taxiCardId" from="taxiCardId" to="id"/>
      <table path="qyttravel.t_user_taxi_card" name="userTaxiCardId" from="userTaxiCardId" to="id"/>
      <table path="qyttravel.t_company" name="companyId" from="companyId" to="id"/>
    </table>
    <table path="qyttravel.t_order_taxi">
      <table path="qyttravel.t_user" name="userId" from="userId" to="id"/>
      <table path="qyttravel.t_order_cross_city" name="crossCityOrderId" from="crossCityOrderId" to="id"/>
      <table path="qyttravel.t_server_carmodel" name="serverCarModelId" from="serverCarModelId" to="id"/>
      <table path="qyttravel.t_driver" name="driverId" from="driverId" to="id"/>
      <table path="qyttravel.t_line" name="lineId" from="lineId" to="id"/>
      <table path="qyttravel.t_line_shift_driver" name="lineShiftDriverId" from="lineShiftDriverId" to="id"/>
      <table path="qyttravel.t_car" name="carId" from="carId" to="id"/>
      <table path="qyttravel.t_user_red_packet_record" name="redPacketId" from="redPacketId" to="id"/>
      <table path="qyttravel.t_user_coupon_record" name="couponId" from="couponId" to="id"/>
      <table path="qyttravel.t_user_activity_discount1" name="activityId" from="activityId" to="id"/>
      <table path="qyttravel.t_taxi_card" name="taxiCardId" from="taxiCardId" to="id"/>
      <table path="qyttravel.t_user_taxi_card" name="userTaxiCardId" from="userTaxiCardId" to="id"/>
      <table path="qyttravel.t_company" name="companyId" from="companyId" to="id"/>
    </table>
    <table path="qyttravel.t_payment_record">
      <table path="qyttravel.t_user" name="userId" from="userId" to="id"/>
    </table>
    <table path="qyttravel.t_sys_cancle_order">
      <table path="qyttravel.t_open_city" name="openCityId" from="openCityId" to="id"/>
    </table>
    <table path="qyttravel.t_sys_coupon_activity">
      <table path="qyttravel.t_company" name="companyId" from="companyId" to="id"/>
      <table path="qyttravel.t_sys_coupon_record" name="couponId" from="couponId" to="id"/>
    </table>
    <table path="qyttravel.t_sys_coupon_record">
      <table path="qyttravel.t_company" name="companyId" from="companyId" to="id"/>
    </table>
    <table path="qyttravel.t_sys_face_distinguish">
      <table path="qyttravel.t_open_city" name="openCityId" from="openCityId" to="id"/>
    </table>
    <table path="qyttravel.t_sys_integral">
      <table path="qyttravel.t_open_city" name="openCityId" from="openCityId" to="id"/>
    </table>
    <table path="qyttravel.t_sys_push_order">
      <table path="qyttravel.t_open_city" name="openCityId" from="openCityId" to="id"/>
    </table>
    <table path="qyttravel.t_sys_red_packet_record">
      <table path="qyttravel.t_company" name="companyId" from="companyId" to="id"/>
    </table>
    <table path="qyttravel.t_sys_reformist">
      <table path="qyttravel.t_open_city" name="openCityId" from="openCityId" to="id"/>
    </table>
    <table path="qyttravel.t_sys_timeout_money">
      <table path="qyttravel.t_open_city" name="openCityId" from="openCityId" to="id"/>
    </table>
    <table path="qyttravel.t_system_price">
      <table path="qyttravel.t_system_price_city" name="systemPriceCityId" from="systemPriceCityId" to="id"/>
      <table path="qyttravel.t_server_carmodel" name="serverCarModelId" from="serverCarModelId" to="id"/>
      <table path="qyttravel.t_open_city" name="openCityId" from="openCityId" to="id"/>
    </table>
    <table path="qyttravel.t_taxi_card">
      <table path="qyttravel.t_company" name="companyId" from="companyId" to="id"/>
    </table>
    <table path="qyttravel.t_taxi_card_payment">
      <table path="qyttravel.t_user" name="userId" from="userId" to="id"/>
      <table path="qyttravel.t_taxi_card" name="taxiCardId" from="taxiCardId" to="id"/>
      <table path="qyttravel.t_company" name="companyId" from="companyId" to="id"/>
    </table>
    <table path="qyttravel.t_timeout_appeal">
      <table path="qyttravel.t_driver" name="driverId" from="driverId" to="id"/>
    </table>
    <table path="qyttravel.t_user">
      <table path="qyttravel.t_company" name="companyId" from="companyId" to="id"/>
    </table>
    <table path="qyttravel.t_user_activity">
      <table path="qyttravel.t_company" name="companyId" from="companyId" to="id"/>
    </table>
    <table path="qyttravel.t_user_activity_balance">
      <table path="qyttravel.t_user_activity" name="userActivityId" from="userActivityId" to="id"/>
    </table>
    <table path="qyttravel.t_user_activity_discount1">
      <table path="qyttravel.t_user_activity" name="userActivityId" from="userActivityId" to="id"/>
    </table>
    <table path="qyttravel.t_user_activity_discount2">
      <table path="qyttravel.t_user_activity" name="userActivityId" from="userActivityId" to="id"/>
      <table path="qyttravel.t_line" name="lineId" from="lineId" to="id"/>
    </table>
    <table path="qyttravel.t_user_activity_invite">
      <table path="qyttravel.t_user_activity" name="userActivityId" from="userActivityId" to="id"/>
      <table path="qyttravel.t_sys_coupon_record" name="couponId" from="couponId" to="id"/>
    </table>
    <table path="qyttravel.t_user_activity_receive">
      <table path="qyttravel.t_user" name="userId" from="userId" to="id"/>
    </table>
    <table path="qyttravel.t_user_activity_redenvelope">
      <table path="qyttravel.t_user_activity" name="userActivityId" from="userActivityId" to="id"/>
      <table path="qyttravel.t_sys_red_packet_record" name="redEnvelopeId" from="redEnvelopeId" to="id"/>
    </table>
    <table path="qyttravel.t_user_activity_registered">
      <table path="qyttravel.t_user_activity" name="userActivityId" from="userActivityId" to="id"/>
      <table path="qyttravel.t_sys_coupon_record" name="couponId" from="couponId" to="id"/>
    </table>
    <table path="qyttravel.t_user_coupon_record">
      <table path="qyttravel.t_company" name="companyId" from="companyId" to="id"/>
      <table path="qyttravel.t_user" name="userId" from="userId" to="id"/>
      <table path="qyttravel.t_sys_coupon_record" name="couponId" from="couponId" to="id"/>
      <table path="qyttravel.t_payment_record" name="paymentRecordId" from="paymentRecordId" to="id"/>
    </table>
    <table path="qyttravel.t_user_merchant_coupon">
      <table path="qyttravel.t_merchant_activity" name="merchantActivityId" from="merchantActivityId" to="id"/>
      <table path="qyttravel.t_user" name="userId" from="userId" to="id"/>
      <table path="qyttravel.t_merchant_coupon" name="merchantCouponId" from="merchantCouponId" to="id"/>
    </table>
    <table path="qyttravel.t_user_red_packet_record">
      <table path="qyttravel.t_company" name="companyId" from="companyId" to="id"/>
      <table path="qyttravel.t_user" name="userId" from="userId" to="id"/>
      <table path="qyttravel.t_user_activity_redenvelope" name="redPacketActivityId" from="redPacketActivityId" to="id"/>
    </table>
    <table path="qyttravel.t_user_taxi_card">
      <table path="qyttravel.t_company" name="companyId" from="companyId" to="id"/>
      <table path="qyttravel.t_user" name="userId" from="userId" to="id"/>
      <table path="qyttravel.t_taxi_card" name="taxiCardId" from="taxiCardId" to="id"/>
    </table>
    <table path="qyttravel.t_user_user">
      <table path="qyttravel.t_user" name="userId" from="userId" to="id"/>
      <table path="qyttravel.t_user" name="bindUserId" from="bindUserId" to="id"/>
    </table>
    <table path="qyttravel.t_verified">
      <table path="qyttravel.t_user" name="userId" from="userId" to="id"/>
    </table>
  </object-set>
</data>

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java

@@ -219,7 +219,7 @@

                    tradeTerminalInfo.setMac(macAddress.toString());
                    ZLUserInfo userInfo1 = ZhengLianUtil.getUserInfo(driverRide.getEmpId().toString(), tradeTerminalInfo);
                    if(null != userInfo){
                    if(null != userInfo1){
                        driverRide.setCustId(userInfo1.getCustId());
                        driverRide.setAccOpenFlag(userInfo1.getAccOpenFlag());
                        driverRideService.updateById(driverRide);

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/rideCommentController.java

@@ -965,6 +965,9 @@
        request1.setCustomerId(userInfo.getOnconUUID());
        request1.setOrderNo("SF" + orderRide1.getId());
        ListPage<List<TravelItinerary>> travelItineraryList = OrderUtil.getTravelItineraryList(request1);
        if(travelItineraryList.getList().isEmpty()){
            return;
        }
        TravelItinerary travelItinerary = travelItineraryList.getList().get(0);
        if(travelItinerary.getStatus() != 7 || Arrays.asList(3, 11).contains(travelItinerary.getOrderStatus())){
            GetPaymentInfoDataRequest getPaymentInfoDataRequest1 = new GetPaymentInfoDataRequest();
@@ -1061,14 +1064,28 @@
            //todo 推送
            /*司机接单给用户发送消息*/
            OrderRide orderRide=orderRideService.selectOne(new EntityWrapper<OrderRide>().eq("travelId",orderId));
            if(orderRide!=null) {
                pushUtil.pushOrderState(1, orderRide.getUserId(), orderRide.getId(), 8, 6, null);
            }
//            if(orderRide!=null) {
//                pushUtil.pushOrderState(1, orderRide.getUserId(), orderRide.getId(), 8, 6, null);
//            }
            //取消乘客订单
            if(orderRide!=null && orderRide.getState()!=6){
                orderRide.setTuiMoney(orderRide.getMoney());
                orderRideService.updateById(orderRide);
                userCancelTuik(orderRide);
//                orderRide.setTuiMoney(orderRide.getMoney());
//                orderRideService.updateById(orderRide);
//                userCancelTuik(orderRide);
                orderRide.setState(2);
                orderRide.setTravelId(null);
                orderRide.setDriverId(null);
                orderRideService.updateAllColumnById(orderRide);
                if(null != orderRide.getZttravelId()){
                    //中台修改订单状态
                    ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
                    request.setOrderId(orderRide.getZttravelId());
                    request.setStatus(getState(orderRide.getState()));
                    if (null != orderRide.getDriverId()) {
                        request.setDriverId(driverRide.getEmpId().toString());
                    }
                    OrderUtil.modifyTravelItinerary(request);
                }
            }

            return ResultUtil.success("");

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java

@@ -17,6 +17,7 @@
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.*;
import com.stylefeng.guns.modular.system.util.qianyuntong.AESUtils;
import com.stylefeng.guns.modular.system.util.qianyuntong.QianYunTongConfig;
import com.stylefeng.guns.modular.system.util.qianyuntong.SMSUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.UserUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.QYTUserInfo;
@@ -124,6 +125,9 @@

    @Autowired
    private PayMoneyUtil payMoneyUtil;

    @Autowired
    private QianYunTongConfig qianYunTongConfig;



@@ -343,7 +347,10 @@
            request.setEncryptType("aesbase64");
            request.setPassword(AESUtils.encryptBase64("123456"));
            request.setNickname(nickName);
            RegisterViaMobile register = UserUtil.registerViaMobile(request);
            request.setAppid(qianYunTongConfig.getAppid());
//            request.setVerify_code("@&^%~%");
//            request.setVerify_code_type("0");
            RegisterViaMobile register = UserUtil.registerViaMobileNoCode(request);
            if (!"0".equals(register.getStatus())) {
                return ResultUtil.error(register.getDesc());
            }
@@ -683,7 +690,10 @@
            request.setEncryptType("aesbase64");
            request.setPassword(AESUtils.encryptBase64("123456"));
            request.setNickname(nickName);
            RegisterViaMobile register = UserUtil.registerViaMobile(request);
            request.setAppid(qianYunTongConfig.getAppid());
//            request.setVerify_code("@&^%~%");
//            request.setVerify_code_type("0");
            RegisterViaMobile register = UserUtil.registerViaMobileNoCode(request);
            if (!"0".equals(register.getStatus())) {
                return ResultUtil.error(register.getDesc());
            }

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java

@@ -19,6 +19,10 @@
     */
    private String appkey;
    /**
     * appid
     */
    private String appid;
    /**
     * 私钥地址
     */
    private String privateKeyPath;
@@ -157,9 +161,18 @@
        this.secretKey = secretKey;
    }

    public String getAppid() {
        return appid;
    }

    public void setAppid(String appid) {
        this.appid = appid;
    }

    public QianYunTongConfig getQianYunTongConfig() {
        if("dev".equals(activeProfile)){
            this.appkey = "10001104";
            this.appId = "yx_8vlsvdfxgtcufjx8";
            this.privateKeyPath = "E:\\项目文档\\黔云通\\private_key_test.pem";
            this.userName = "xiaofei";
            this.status = "1";
@@ -173,6 +186,7 @@
        }
        if("test".equals(activeProfile)){
            this.setAppkey("10001104");
            this.appid = "yx_8vlsvdfxgtcufjx8";
            this.setPrivateKeyPath("/etraffic/server/private_key_test.pem");
            this.setUserName("xiaofei");
            this.setStatus("1");
@@ -186,6 +200,7 @@
        }
        if("prod".equals(activeProfile)){
            this.setAppkey("10001104");
            this.appid = "yx_mdkrc2i9jcyvaggi";
            this.setPrivateKeyPath("/etraffic/server/private_key.pem");
            this.setUserName("xiwang");
            this.setStatus("1");

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/UserUtil.java

@@ -180,6 +180,52 @@
        }
        return jsonObject.getObject("object", RegisterViaMobile.class);
    }


    /**
     * 根据手机号注册用户
     *
     * @param request
     * @return
     */
    public static RegisterViaMobile registerViaMobileNoCode(RegisterViaMobileRequest request) {
        //请求路径
        String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/m1_register_via_mobile";
        //私钥文件
        String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
        //注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
        String appKey = qianYunTongConfig.getAppkey();//appkey
        Map<String, String> headers = new HashMap<>();
        headers.put("Content-Type", "application/json");
        Map<String, Object> contentMap = new HashMap<String, Object>();
        Date nowdate = new Date();
        SimpleDateFormat date = new SimpleDateFormat("yyyyMMddHHmmss");

        String timeStamp = date.format(nowdate);
        String messageId = UUID.randomUUID().toString().replaceAll("-", "");
        contentMap.put(SystemParameterNames.getAppKey(), appKey);
        contentMap.put(SystemParameterNames.getMessage_id(), messageId);
        contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
        contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
        contentMap.put("content", new Gson().toJson(request));
        log.info("【根据手机号注册用户】请求地址:" + url);
        log.info("【根据手机号注册用户】请求参数:" + JSON.toJSONString(contentMap));
        String result = OpenApiClient.sendCommonHttpRequst(url, headers, "POST", skprivateKeyFile, timeStamp, contentMap);
        log.info("【根据手机号注册用户】请求结果:" + result);
        JSONObject jsonObject = JSON.parseObject(result);
        String retCode = jsonObject.getString("retCode");
        if (!"0".equals(retCode)) {
            log.error("【根据手机号注册用户】请求失败:" + result);
            throw new RuntimeException("【根据手机号注册用户】请求失败:" + result);
        }
        JSONObject object = jsonObject.getJSONObject("object");
        String status = object.getString("status");
        if (!"0".equals(status)) {
            log.error("【根据手机号注册用户】失败:" + object.toJSONString());
            throw new RuntimeException("【根据手机号注册用户】失败:" + object.toJSONString());
        }
        return jsonObject.getObject("object", RegisterViaMobile.class);
    }
    
    
    /**

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/RegisterViaMobileRequest.java

@@ -13,6 +13,9 @@
     */
    private String mobile;
    /**
     */
    private String appid;
    /**
     * 客户端appid
     */
    private String appId;