From 706a582fecc5dc2902f8dc7ef7ce87d936d68343 Mon Sep 17 00:00:00 2001
From: wangbo <184677810@qq.com>
Date: Wed, 8 May 2019 14:19:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=97=A5=E6=9C=AB=E6=AC=A1=E6=9C=88?=
 =?UTF-8?q?=E7=BB=8F=E6=97=A5=E6=9C=9F=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../permission/dao/master/OrgCouponMapper.java     |  9 --------
 .../resources/mainOrm/master/OrgCouponMapper.xml   | 25 ----------------------
 .../web/controller/OrgCouponController.java        |  2 --
 .../web/service/impl/OrgCouponServiceImpl.java     |  2 +-
 4 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/OrgCouponMapper.java
 delete mode 100644 platform-biz-service/src/main/resources/mainOrm/master/OrgCouponMapper.xml

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/OrgCouponMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/OrgCouponMapper.java
deleted file mode 100644
index 5e9d158..0000000
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/OrgCouponMapper.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.lyms.platform.permission.dao.master;
-
-import com.lyms.platform.common.result.BaseObjectResponse;
-
-public interface OrgCouponMapper {
-
-    BaseObjectResponse orgCouponInfo();
-
-}
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/OrgCouponMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/OrgCouponMapper.xml
deleted file mode 100644
index 8e722b4..0000000
--- a/platform-biz-service/src/main/resources/mainOrm/master/OrgCouponMapper.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.lyms.platform.permission.dao.master.OrgCouponMapper">
-
-    <resultMap type="com.lyms.platform.permission.model.CouponInfo" id="couponInfoMap">
-        <result column="id" property="id"/>
-        <result column="sequence_id" property="sequenceId"/>
-        <result column="create_date" property="createDate"/>
-        <result column="use_date" property="useDate"/>
-        <result column="user_id" property="userId"/>
-        <result column="create_user_Id" property="createUserId"/>
-        <result column="coupon_template_id" property="couponTemplateId"/>
-        <result column="create_hospital_id" property="createHospitalId"/>
-        <result column="used_hospital_id" property="usedHospitalId"/>
-        <result column="status" property="status"/>
-        <result column="operator_use_id" property="operatorUseId"/>
-        <result column="used_id" property="usedId"/>
-        <result column="temp_hospital_id" property="tempHospitalId"/>
-        <result column="temp_status" property="tempStatus"/>
-    </resultMap>
-
-
-
-
-</mapper>
\ No newline at end of file
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrgCouponController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrgCouponController.java
index 9c6e909..6f08816 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrgCouponController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrgCouponController.java
@@ -33,9 +33,7 @@ public class OrgCouponController extends BaseController {
     public BaseObjectResponse orgCouponInfo(HttpServletRequest request, Date startDate, Date endDate, Integer type,
                                             String couponType, String doctor,
                                             Integer page, Integer limit, String key) {
-        System.out.println(getUserId(request));
         String hospitalId = autoMatchFacade.getHospitalId(getUserId(request));
-        System.out.println(hospitalId);
         Map<String, Object> param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate,
                 "endDate", endDate != null ? DateUtil.addDay(endDate, 1) : endDate, "hospitalId", CollectionUtils.asList(hospitalId), "type", type,
                 "couponType", couponType, "currentPage", page, "pageSize", limit, "doctor", doctor, "key", key);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/OrgCouponServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/OrgCouponServiceImpl.java
index 7a5d657..1a81a1b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/OrgCouponServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/OrgCouponServiceImpl.java
@@ -366,7 +366,7 @@ public class OrgCouponServiceImpl extends BaseServiceImpl implements OrgCouponSe
         map.put("week", week);
         map.put("number", number);
         map.put("doctorName", doctorName);
-        map.put("phone", com.lyms.platform.common.utils.StringUtils.encryPhone(phone));
+        map.put("phone", phone);
     }
 
     private String findUserNameByPid(String pid) {
-- 
1.8.3.1