Browse Source

定制修改

zhs 3 years ago
parent
commit
f96bf81e75

+ 7 - 4
src/main/java/com/travel/baidu/Test.java

@@ -12,6 +12,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+/**
+ * 翻译
+ */
 @Controller
 @RequestMapping("translationInterface")
 public class Test {
@@ -22,15 +25,15 @@ public class Test {
      */
     @RequestMapping("translation")
     @ResponseBody
-    public String translation(String translationVal){
+    public String translation(String translationVal, String from, String to){
         // 请求url
         String url = "https://aip.baidubce.com/rpc/2.0/mt/texttrans/v1";
 
         try {
             Map<String, Object> map = new HashMap<>();
-            map.put("from", "zh");
-            map.put("to", "en");
-            map.put("q", "这是一次测试用例,测试成功与否");
+            map.put("from", from);
+            map.put("to", to);
+            map.put("q", translationVal);
             map.put("termIds", "bak,pl");
             String param = GsonUtils.toJson(map);
             // 注意这里仅为了简化编码每一次请求都去获取access_token,线上环境access_token有过期时间, 客户端可自行缓存,过期后重新获取。

+ 6 - 6
src/main/java/com/travel/controller/PersonalController.java

@@ -60,19 +60,19 @@ public class PersonalController {
             List<User> list = loginService.getUser(user);
             //如果手机号不存在则新增
             if(list.size() == 0){
-//                int maxId = loginService.getMaxId(user);//查询最大的id
                 loginService.insetUser(user); //先新增信息
                 Integer maxId = loginService.getMaxId(user);
-                user.setId(maxId.toString()).setName("tuya_" + (maxId + 1)).setCode("CUS0000000" + (maxId + 1)).setHeadpir("https://lidaotech.oss-cn-beijing.aliyuncs.com/test/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20220622112747.png");
+                user.setId(maxId.toString()).setName("tuya_" + maxId).setCode("CUS0000000" + maxId).setHeadpir("https://lidaotech.oss-cn-beijing.aliyuncs.com/test/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20220622112747.png");
                 loginService.updateKeyToLog(user);//添加用户昵称  编号  头像
+                list.add(user);
             }
             Map<String, String> payload = new HashMap<>();
-            payload.put("phone", user.getPhone());
-            payload.put("code", user.getCode());
+            payload.put("phone", list.get(0).getPhone());
+            payload.put("code", list.get(0).getCode());
             // 生成jwt的令牌
             String token = JWTUtil.getToken(payload);
-            user.setToken(token);
-            map.put("data", user);
+            list.get(0).setToken(token);
+            map.put("data", list.get(0));
             map.put("msg", "200");
         } catch (Exception e) {
             map.put("msg", "500");

+ 8 - 0
src/main/java/com/travel/model/PrivateOrder.java

@@ -115,4 +115,12 @@ public class PrivateOrder implements Serializable {
      * 金额
      */
     private String priceAll;
+    /**
+     * 图片
+     */
+    private String titleImg;
+    /**
+     * 旅游名称
+     */
+    private String offerName;
 }

+ 1 - 0
src/main/resources/config/mapping/PrivateOrderMapper.xml

@@ -24,6 +24,7 @@
             <if test="code != null and code != ''">
                 and b.code = #{code}
             </if>
+            AND b.order_type = #{orderType}
     </select>
     <!-- 查询私人订制 -->
     <select id="getPrivateAll" resultType="PrivateOrder">