Browse Source

增加菜单栏项目,变更推送文案

刘韬 5 years ago
parent
commit
20994ff9a7

+ 0 - 1
PacsOnline_Wechat_Patient/src/main/java/com/zskk/controller/WebBridgeController.java

@@ -19,7 +19,6 @@ public class WebBridgeController extends ApiController {
 	public void examList() {
 	public void examList() {
 		System.out.println(ApiConfigKit.getApiConfig().getAppId());
 		System.out.println(ApiConfigKit.getApiConfig().getAppId());
 		System.out.println(getRequest().getRequestURL().toString());
 		System.out.println(getRequest().getRequestURL().toString());
-
 		this.process(WEB_BASR_URL+"/reportList");
 		this.process(WEB_BASR_URL+"/reportList");
 	}
 	}
 
 

+ 5 - 36
PacsOnline_Wechat_Patient/src/main/java/com/zskk/controller/WeixinApiController.java

@@ -84,6 +84,11 @@ public class WeixinApiController extends ApiController {
                 "\t    \"name\": \"远程诊断\",\n" +
                 "\t    \"name\": \"远程诊断\",\n" +
                 "\t    \"url\": \"http://wechat.pacsonline.cn/wx_patient/web/remoteDiagnosis?appId=" + ApiConfigKit.getApiConfig().getAppId() +"\",\n" +
                 "\t    \"url\": \"http://wechat.pacsonline.cn/wx_patient/web/remoteDiagnosis?appId=" + ApiConfigKit.getApiConfig().getAppId() +"\",\n" +
                 "\t    \"type\": \"view\"\n" +
                 "\t    \"type\": \"view\"\n" +
+                "        },\n" +
+                "        {\n" +
+                "\t    \"name\": \"会员福利专享\",\n" +
+                "\t    \"url\": \"http://leo.spread.newtank.cn/group0930\",\n" +
+                "\t    \"type\": \"view\"\n" +
                 "        }\n" +
                 "        }\n" +
                 "    ]\n" +
                 "    ]\n" +
                 "        },\n" +
                 "        },\n" +
@@ -233,42 +238,6 @@ public class WeixinApiController extends ApiController {
 			renderText(reports.getQrCode());;
 			renderText(reports.getQrCode());;
 		}
 		}
     }
     }
-
-    /**
-     * 统一支付
-     */
-    public void unifyPay()
-    {
-        String reportId = getPara("reportId");
-		Report reports = Report.dao.findById(reportId);
-		Exams exams = Exams.dao.findById(reports.getExamId());
-		Institution institution = Institution.dao.findById(exams.getInstitutionId());
-		String appId;
-		switch (institution.getWxSource()) {
-		case "中世康恺电子胶片平台":
-			appId = PropKit.get("appId_zskk");
-			break;
-
-		case "黑龙江省电子胶片平台":
-			appId = PropKit.get("appId_hlj");
-			break;
-
-		case "辽宁省电子胶片平台":
-			appId = PropKit.get("appId_ln");
-			break;
-			
-		case "河南省电子胶片平台":
-			appId = PropKit.get("appId_hn");
-			break;
-
-		default:
-			appId = PropKit.get("appId_zskk");
-			break;
-		}
-//		redirect("http://wechat.pacsonline.cn/wx_patient/api/getQrcode?appId=" + appId + "&reportId=" + reportId);
-        ApiConfigKit.setThreadLocalAppId(appId);
-//        String string = PaymentApi.pushOrder(j);
-    }
     
     
     /*/
     /*/
      * 获取JS-SDK的配置信息
      * 获取JS-SDK的配置信息

+ 1 - 1
PacsOnline_Wechat_Patient/src/main/java/com/zskk/controller/WeixinMsgController.java

@@ -36,7 +36,7 @@ public class WeixinMsgController extends MsgControllerAdapter {
 
 
     	if ("演示".equalsIgnoreCase(msgContent)) {
     	if ("演示".equalsIgnoreCase(msgContent)) {
     		
     		
-			CustomServiceApi.sendText(inTextMsg.getFromUserName(), "【声明】为保证客户数据隐私安全,电子胶片示例涉及检查信息、用户信息、医疗机构信息等均已经过数据脱敏与重构处理。\n通过以下途径了解更多或联系我们:\n官方网站:<a href=\"http://www.pacsonline.cn\">点击进入</a>\n咨询热线:010-53932350\n电子邮箱:company@pacsonline.cn\n您将在2分钟内收到电子胶片示例,谢谢!");
+			CustomServiceApi.sendText(inTextMsg.getFromUserName(), "【声明】为保证客户数据隐私安全,电子胶片示例涉及检查信息、用户信息、医疗机构信息等均已经过数据脱敏处理。\n通过以下途径了解更多或联系我们:\n官方网站:<a href=\"http://www.pacsonline.cn\">点击进入</a>\n咨询热线:010-53932350\n电子邮箱:company@pacsonline.cn\n您将收到电子胶片示例,请点击下方消息查看,谢谢您的使用!");
 
 
 			String toUrlString = String.format("http://wechat.client.pacsonline.cn/#/reportInfo/report?openid=%s&exam_id=%s&study_id=%s","test","8f0d2411134615e9","0c803a0934dfa1d8");
 			String toUrlString = String.format("http://wechat.client.pacsonline.cn/#/reportInfo/report?openid=%s&exam_id=%s&study_id=%s","test","8f0d2411134615e9","0c803a0934dfa1d8");
 
 

+ 1 - 2
PacsOnline_Wechat_Patient/src/main/java/com/zskk/controller/WeixinPayController.java

@@ -15,8 +15,7 @@ import com.jfinal.weixin.sdk.kit.IpKit;
 import com.jfinal.weixin.sdk.kit.PaymentKit;
 import com.jfinal.weixin.sdk.kit.PaymentKit;
 import com.jfinal.weixin.sdk.utils.HttpUtils;
 import com.jfinal.weixin.sdk.utils.HttpUtils;
 import com.jfinal.weixin.sdk.utils.JsonUtils;
 import com.jfinal.weixin.sdk.utils.JsonUtils;
-import com.zskk.service.ServiceFactory;
-import com.zskk.service.WeixinService;
+
 
 
 public class WeixinPayController extends Controller {
 public class WeixinPayController extends Controller {