Ai舌诊 订单确认单配置

fs-service/src/main/java/com/fs/aiTongueApi/service/impl/AiTongueServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fs.aiTongueApi.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.fs.aiTongueApi.config.AiTongueConfig;
 import com.fs.aiTongueApi.domain.AITongueResult;
@@ -12,6 +13,8 @@ import com.fs.aiTongueApi.service.AiTongueService;
 import com.fs.common.utils.uuid.UUID;
 import com.fs.his.domain.FsHealthTongue;
 import com.fs.his.service.IFsHealthTongueService;
+import com.fs.system.domain.SysConfig;
+import com.fs.system.mapper.SysConfigMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hc.core5.net.URIBuilder;
 import org.apache.http.HttpEntity;
@@ -43,10 +46,12 @@ public class AiTongueServiceImpl implements AiTongueService {
 
     @Autowired
     private IFsHealthTongueService tongueService;
+    @Autowired
+    private SysConfigMapper sysConfigMapper;
 
     @Override
     public AITongueResult<TongueData> getHistoryTongue(QueryAiTongue queryAiTongue) {
-        queryAiTongue.setAppkey(AiTongueConfig.appKey);
+        queryAiTongue.setAppkey(getAppKey());
         String result = sendPost(AiTongueConfig.getFaceHistoryByIDUrl, queryAiTongue);
         System.out.println(result);
         AITongueResult<TongueData> aiTongueResult = JSON.parseObject(result, new TypeReference<AITongueResult<TongueData>>(){});
@@ -65,7 +70,7 @@ public class AiTongueServiceImpl implements AiTongueService {
             // 添加文件或表单参数
             builder.addBinaryBody("file", inputStream, ContentType.DEFAULT_BINARY, "图片.jpg");
 
-            builder.addTextBody("appkey", AiTongueConfig.appKey);
+            builder.addTextBody("appkey", getAppKey());
             HttpEntity multipart = builder.build();
             httpPost.setEntity(multipart);
             // 执行请求
@@ -81,6 +86,12 @@ public class AiTongueServiceImpl implements AiTongueService {
         return aiTongueResult;
     }
 
+    private String getAppKey() {
+        SysConfig config = sysConfigMapper.selectConfigByConfigKey("his.config");
+        JSONObject json = JSON.parseObject(config.getConfigValue());
+        return json.getString("tongueAppKey");
+    }
+
     @Override
     public AITongueResult<TongueData> quanXiTongue(QueryQuanXi queryQuanXi) {
         String s="";
@@ -95,7 +106,7 @@ public class AiTongueServiceImpl implements AiTongueService {
 
             builder.addTextBody("age", queryQuanXi.getAge(), ContentType.create("text/plain", Charset.forName("UTF-8")));
             builder.addTextBody("male", queryQuanXi.getMale(), ContentType.create("text/plain", Charset.forName("UTF-8")));
-            builder.addTextBody("appkey", AiTongueConfig.appKey);
+            builder.addTextBody("appkey", getAppKey());
             if (queryQuanXi.getIsYuejin()!=null){
                 builder.addTextBody("isYuejin", queryQuanXi.getIsYuejin(), ContentType.create("text/plain", Charset.forName("UTF-8")));
             }

fs-service/src/main/java/com/fs/his/config/AgreementConfig.java

@@ -12,4 +12,5 @@ public class AgreementConfig implements Serializable {
     String vipService;
     String vipAutomaticService;
     String userRemoveService;
+    String orderConfirm;
 }

fs-service/src/main/java/com/fs/his/service/IFsHealthTongueService.java

@@ -74,6 +74,13 @@ public interface IFsHealthTongueService
 
     R insertFsHealthTongueByImgUrl(FsHealthTongueUParam param);
 
+    /**
+     * 爱看舌-旧版的舌诊功能
+     * @param param
+     * @return
+     */
+    R insertFsHealthTongueByImgUrlOld(FsHealthTongueUParam param);
+
     FsHealthTongueUVO selectFsHealthTongueByUserId(long userId);
 
     List<FsHealthTongueListVO> selectFsHealthTongueListVO(FsHealthTongueParam param);

fs-service/src/main/java/com/fs/hisStore/config/AgreementConfig.java

@@ -20,4 +20,10 @@ public class AgreementConfig implements Serializable {
     String userHealth;
     //会员服务协议
     String vipService;
+    //会员自动续费协议
+    String vipAutomaticService;
+    //用户注销协议
+    String userRemoveService;
+    //订单确认协议
+    String orderConfirm;
 }

fs-user-app/src/main/java/com/fs/app/controller/H5Controller.java

@@ -86,5 +86,16 @@ public class H5Controller
         return mv;
     }
 
+    @GetMapping("/orderConfirm")
+    public ModelAndView orderConfirm( )
+    {
+        String json=configService.selectConfigByKey("his.agreementConfig");
+        AgreementConfig config= JSONUtil.toBean(json, AgreementConfig.class);
+        ModelAndView mv=new ModelAndView();
+        mv.addObject("orderConfirm", config.getOrderConfirm());
+        mv.setViewName("orderConfirm");
+        return mv;
+    }
+
 
 }

fs-user-app/src/main/java/com/fs/app/controller/HealthTongueController.java

@@ -152,6 +152,6 @@ public class HealthTongueController extends AppBaseController
 //            }
 //        }
         param.setUserId(Long.parseLong(getUserId()));
-        return fsHealthTongueService.insertFsHealthTongueByImgUrl(param);
+        return fsHealthTongueService.insertFsHealthTongueByImgUrlOld(param);
     }
 }

fs-user-app/src/main/java/com/fs/app/controller/store/H5ScrmController.java

@@ -87,5 +87,16 @@ public class H5ScrmController
         return mv;
     }
 
+    @GetMapping("/orderConfirm")
+    public ModelAndView orderConfirm( )
+    {
+        String json=configService.selectConfigByKey("his.agreementConfig");
+        AgreementConfig config= JSONUtil.toBean(json, AgreementConfig.class);
+        ModelAndView mv=new ModelAndView();
+        mv.addObject("orderConfirm", config.getOrderConfirm());
+        mv.setViewName("orderConfirm");
+        return mv;
+    }
+
 
 }

fs-user-app/src/main/java/com/fs/app/controller/store/IndexScrmController.java

@@ -256,6 +256,9 @@ public class IndexScrmController extends AppBaseController {
             case "userRemoveService":
                 data = config.getUserRemoveService();
                 break;
+            case "orderConfirm":
+                data = config.getOrderConfirm();
+                break;
             default:
                 break;
         }