修改支付宝支付方式

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

@@ -192,7 +192,7 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         List<Integer> userIds = list.stream().map(OrderListVo::getUserId).distinct().collect(Collectors.toList());
        if(userIds != null && userIds.size() >0) {
            ObjectRestResponse<List<AppUserVo>> objectRestResponse = userFeign.getByUserIds(userIds);
-           log.info("获取用户信息：objectRestResponse = {}", objectRestResponse.getMessage());
+           log.info("获取用户信息：objectRestResponse = {}", objectRestResponse.getData());
            Map<String, AppUserVo> appUserVoMap = objectRestResponse.getData() == null? new HashMap<String, AppUserVo>()
                    : objectRestResponse.getData().parallelStream().collect(Collectors.toMap(v -> v.getUserid().toString(), v -> v));
 

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -138,7 +138,7 @@
                 and (r.start_time between #{startTime} and #{endTime}
                 or t.start_time between #{startTime} and #{endTime})
             </if>
-            <if test="companyIds != null">
+            <if test="companyIds != null and companyIds.size > 0">
                 and (r.start_company_id in
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">
                     #{id}
@@ -149,7 +149,7 @@
                 </foreach>
                 )
             </if>
-            <if test="zoneIds != null">
+            <if test="zoneIds != null and zoneIds.size > 0">
                 and (r.start_zone_id in
                 <foreach collection="zoneIds" item="id" open="(" separator="," close=")">
                     #{id}

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyBiz.java

@@ -95,7 +95,7 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
         map.put("zoneId", zoneId);
         List<Integer> branchCompanies = Lists.newArrayList();
         if(DATA_ALL_FALSE.equals(userDTO.getDataAll())) { //不能获取全部数据
-            branchCompanies = vehicleBiz.dataCompany(userDTO.getDataCompany(), userDTO.getDataZone());
+            branchCompanies = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
         }
         map.put("ids", branchCompanies);
         return mapper.selectByZoneId(map);

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/BranchCompanyMapper.xml

@@ -42,7 +42,7 @@
     <select id="selectByZoneId" parameterType="java.util.Map" resultType="com.xxfc.platform.vehicle.entity.BranchCompany">
         select * from branch_company
         where zone_id = #{zoneId}
-        <if test="ids != null">
+        <if test="ids != null and ids > 0">
             and  id in
             <foreach collection="ids" item="id" open="(" separator="," close=")">
               #{id}

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookRecordMapper.xml

@@ -395,19 +395,13 @@
             <if test="bookType != null">
                 and v1.book_type = #{bookType}
             </if>
-            <if test="companyIds != null">
+            <if test="companyIds != null and companyIds > 0">
                 and v1.lift_company in
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">
                     #{id}
                 </foreach>
 
             </if>
-            <if test="zoneIds != null">
-                and bc1.zone_id in
-                <foreach collection="zoneIds" item="id" open="(" separator="," close=")">
-                    #{id}
-                </foreach>
-            </if>
             and v1.status between  1 and 2
         </where>
 
@@ -433,7 +427,7 @@
             <if test="bookType != null">
                 and v1.book_type = #{bookType}
             </if>
-            <if test="companyIds != null">
+            <if test="companyIds != null and companyIds > 0">
                 and (v1.lift_company in
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">
                     #{id}
@@ -443,12 +437,6 @@
                     #{id}
                 </foreach>)
             </if>
-            <if test="zoneIds != null">
-                and bc1.zone_id in
-                <foreach collection="zoneIds" item="id" open="(" separator="," close=")">
-                    #{id}
-                </foreach>
-            </if>
             <if test="status != null">
                 and v1.status = #{status}
             </if>