Selaa lähdekoodia

接口增加修改

zhs 3 vuotta sitten
vanhempi
commit
bacfb22185

+ 26 - 0
src/main/java/com/travel/controller/SupplierController.java

@@ -8,6 +8,7 @@ import com.aliyuncs.IAcsClient;
 import com.aliyuncs.http.MethodType;
 import com.aliyuncs.profile.DefaultProfile;
 import com.travel.jwt.JWTUtil;
+import com.travel.model.ConfirmOrdering;
 import com.travel.model.Supplier;
 import com.travel.service.SupplierService;
 import com.travel.util.ParsingToken;
@@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -200,4 +202,28 @@ public class SupplierController {
         }
         return map;
     }
+
+    /**
+     * 查询该用户跟指定供应商的目的地
+     * @param confirmOrdering 参数
+     * @return 返回结果
+     */
+    @GetMapping("getSupplierDestination")
+    @ResponseBody
+    public Map<String, Object> getSupplierDestination(ConfirmOrdering confirmOrdering, HttpServletRequest request){
+        Map<String, Object> map = new HashMap<>();
+        try{
+            Map<String, Object> userMap = ParsingToken.tokenParsing(request);
+            confirmOrdering.setCode((String) userMap.get("code"));
+
+            List<ConfirmOrdering> list = supplierService.getSupplierDestination(confirmOrdering);
+            map.put("data", list);
+            map.put("msg", "200");
+        }catch (Exception e){
+            e.printStackTrace();
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常,请稍后再试");
+        }
+        return map;
+    }
 }

+ 5 - 0
src/main/java/com/travel/mapper/SupplierMapper.java

@@ -1,9 +1,12 @@
 package com.travel.mapper;
 
+import com.travel.model.ConfirmOrdering;
 import com.travel.model.Supplier;
 import com.travel.model.User;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface SupplierMapper {
     void addSupplier(Supplier supplier);
@@ -23,4 +26,6 @@ public interface SupplierMapper {
     Supplier checkUser(Supplier supplier);
 
     void updateCaptchaCode(Supplier supplier);
+
+    List<ConfirmOrdering> getSupplierDestination(ConfirmOrdering confirmOrdering);
 }

+ 5 - 0
src/main/java/com/travel/service/SupplierService.java

@@ -1,8 +1,11 @@
 package com.travel.service;
 
+import com.travel.model.ConfirmOrdering;
 import com.travel.model.Supplier;
 import com.travel.model.User;
 
+import java.util.List;
+
 public interface SupplierService {
     void upddateSupplier(Supplier supplier);
 
@@ -19,4 +22,6 @@ public interface SupplierService {
     void updateUser(Supplier user1);
 
     void updateCaptchaCode(Supplier supplier);
+
+    List<ConfirmOrdering> getSupplierDestination(ConfirmOrdering confirmOrdering);
 }

+ 8 - 0
src/main/java/com/travel/service/impl/SupplierServiceImpl.java

@@ -1,12 +1,15 @@
 package com.travel.service.impl;
 
 import com.travel.mapper.SupplierMapper;
+import com.travel.model.ConfirmOrdering;
 import com.travel.model.Supplier;
 import com.travel.service.SupplierService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 @Service
 public class SupplierServiceImpl implements SupplierService {
 
@@ -58,4 +61,9 @@ public class SupplierServiceImpl implements SupplierService {
     public void updateCaptchaCode(Supplier supplier) {
         supplierMapper.updateCaptchaCode(supplier);
     }
+
+    @Override
+    public List<ConfirmOrdering> getSupplierDestination(ConfirmOrdering confirmOrdering) {
+        return supplierMapper.getSupplierDestination(confirmOrdering);
+    }
 }

+ 29 - 0
src/main/resources/config/mapping/ConfirmOrderingMapper.xml

@@ -12,4 +12,33 @@
         insert into sys_confirm_used(confirm_uuid,name,nationality,sex,phone,document_type,id_number,date_of_birth,jdrq)
         values(#{confirmUuid},#{name},#{nationality},#{sex},#{phone},#{documentType},#{idNumber},#{dateOfBirth},GETDATE())
     </insert>
+    <!-- 查询该用户跟指定供应商的目的地 -->
+    <select id="getSupplierDestination" parameterType="ConfirmOrdering">
+        SELECT
+            ${supplierCode} AS supplierCode,
+            LEFT (
+                (
+                    SELECT
+                        a.destination + ','
+                    FROM
+                        bus_private_ordering a
+                        JOIN ( SELECT demand_uuid, code FROM bus_supplier_release WHERE code = #{supplierCode} ) b ON a.uuid = b.demand_uuid
+                        JOIN ( SELECT demand_uuid, code FROM bus_private_ordering_type WHERE code = #{supplierCode} and order_type = '1') c ON a.uuid = c.demand_uuid
+                    WHERE
+                        a.code = #{code} FOR xml path ( '' )
+                ),
+                LEN(
+                    (
+                    SELECT
+                        a.destination + ','
+                    FROM
+                        bus_private_ordering a
+                        JOIN ( SELECT demand_uuid, code FROM bus_supplier_release WHERE code = #{supplierCode} ) b ON a.uuid = b.demand_uuid
+                        JOIN ( SELECT demand_uuid, code FROM bus_private_ordering_type WHERE code = #{supplierCode} and order_type = '1') c ON a.uuid = c.demand_uuid
+                    WHERE
+                        a.code = #{code} FOR xml path ( '' )
+                    )
+                ) - 1
+            ) AS destination
+    </select>
 </mapper>