Browse Source

微信支付

zhs 3 years ago
parent
commit
c91dd48491

+ 1 - 1
src/main/java/com/travel/controller/SupplierController.java

@@ -224,8 +224,8 @@ public class SupplierController {
                 ConfirmOrdering confirmOrdering1 = supplierService.getSupplierDestination(confirmOrdering);
                 if(null != confirmOrdering1){
                     confirmOrdering1.setSupplierCode(codeArray[i]);
+                    list.add(confirmOrdering1);
                 }
-                list.add(confirmOrdering1);
             }
             map.put("data", list);
             map.put("msg", "200");

+ 6 - 6
src/main/resources/config/mapping/ReleaseTravelMapper.xml

@@ -79,7 +79,7 @@
                         a.title_travel like CONCAT(CONCAT('%', #{titleTravel}), '%')
                     </if>
                     <if test="jdrq != null and jdrq != ''">
-                        #{startTime} <![CDATA[ <= ]]> jdrq and #{endTime} <![CDATA[ > ]]> jdrq
+                        #{startTime} <![CDATA[ <= ]]> a.jdrq and #{endTime} <![CDATA[ > ]]> jdrq
                     </if>
                 </trim>
                 UNION ALL
@@ -119,7 +119,7 @@
                         a.offer_name like CONCAT(CONCAT('%', #{titleTravel}), '%')
                     </if>
                     <if test="jdrq != null and jdrq != ''">
-                        #{startTime} <![CDATA[ <= ]]> jdrq and #{endTime} <![CDATA[ > ]]> jdrq
+                        #{startTime} <![CDATA[ <= ]]> a.jdrq and #{endTime} <![CDATA[ > ]]> jdrq
                     </if>
                 </trim>
             ) e
@@ -131,10 +131,10 @@
                 from bus_travel
                 <trim prefix="WHERE" prefixOverrides="and | or">
                     <if test="destination != null and destination != ''">
-                        a.destination like CONCAT(CONCAT('%', #{destination}), '%')
+                        destination like CONCAT(CONCAT('%', #{destination}), '%')
                     </if>
                     <if test="titleTravel != null and titleTravel != ''">
-                        a.title_travel like CONCAT(CONCAT('%', #{titleTravel}), '%')
+                        title_travel like CONCAT(CONCAT('%', #{titleTravel}), '%')
                     </if>
                     <if test="jdrq != null and jdrq != ''">
                         #{startTime} <![CDATA[ <= ]]> jdrq and #{endTime} <![CDATA[ > ]]> jdrq
@@ -146,10 +146,10 @@
                 from bus_supplier_route
                 <trim prefix="WHERE" prefixOverrides="and | or">
                     <if test="destination != null and destination != ''">
-                        a.destination like CONCAT(CONCAT('%', #{destination}), '%')
+                        destination like CONCAT(CONCAT('%', #{destination}), '%')
                     </if>
                     <if test="titleTravel != null and titleTravel != ''">
-                        a.offer_name like CONCAT(CONCAT('%', #{titleTravel}), '%')
+                        offer_name like CONCAT(CONCAT('%', #{titleTravel}), '%')
                     </if>
                     <if test="jdrq != null and jdrq != ''">
                         #{startTime} <![CDATA[ <= ]]> jdrq and #{endTime} <![CDATA[ > ]]> jdrq