From c5bee43b37c2e3909ec94aa171eaf0b506468ef4 Mon Sep 17 00:00:00 2001
From: litao <litao@lymsh.com>
Date: Thu, 25 May 2017 23:27:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=8A=BD=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../permission/service/impl/CouponServiceImpl.java |   3 +
 .../mainOrm/master/WeixinQrcodeConfigMapper.xml    | 116 +++++++++++++++++++++
 .../src/main/resources/database.properties         |   2 +-
 3 files changed, 120 insertions(+), 1 deletion(-)
 create mode 100644 platform-biz-service/src/main/resources/mainOrm/master/WeixinQrcodeConfigMapper.xml

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java
index 27963b9..8e7c525 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java
@@ -392,6 +392,9 @@ public class CouponServiceImpl implements CouponService {
 
             PersonModel person = mongoTemplate.findById(userId, PersonModel.class);
 
+            if (person == null)
+            return "http://weixin.qq.com/r/Fi9bQyLEgH--rWYg93oE";
+
             Map<String, String> params = new HashMap<>();
             params.put("hId", hId);
             params.put("dpId", person.getType() == 2 ? "2" : "1");
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/WeixinQrcodeConfigMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/WeixinQrcodeConfigMapper.xml
new file mode 100644
index 0000000..5172d6d
--- /dev/null
+++ b/platform-biz-service/src/main/resources/mainOrm/master/WeixinQrcodeConfigMapper.xml
@@ -0,0 +1,116 @@
+<?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.WeixinQrcodeConfigMapper">
+
+ <resultMap id="WeixinShowqrcodeConfigResultMap" type="com.lyms.platform.permission.model.WeixinQrcodeConfig">
+  <id column="id" property="id" jdbcType="INTEGER" />
+  <result column="hospitalId" property="hospitalId" jdbcType="VARCHAR" />
+  <result column="dp_id" property="dpId" jdbcType="INTEGER" />
+  <result column="ticket" property="ticket" jdbcType="VARCHAR" />
+  <result column="wx_url" property="wxUrl" jdbcType="VARCHAR" />
+  <result column="created" property="created" jdbcType="TIMESTAMP" />
+  <result column="modified" property="modified" jdbcType="TIMESTAMP" />
+ </resultMap>
+
+
+
+ <insert id="addWeixinShowqrcodeConfig" parameterType="com.lyms.platform.permission.model.WeixinQrcodeConfig">
+  <selectKey resultType="java.lang.Integer" keyProperty="id" order="AFTER">
+   SELECT LAST_INSERT_ID()
+  </selectKey>
+  insert into weixin_qrcode_config (hospitalId,dp_id,ticket,created,modified,wx_url) values (#{hospitalId},#{dpId},#{ticket},#{created},#{modified},#{wxUrl})
+ </insert>
+
+
+
+ <update id="updateWeixinShowqrcodeConfig" parameterType="com.lyms.platform.permission.model.WeixinQrcodeConfig">
+  update weixin_qrcode_config <set><if test="hospitalId != null and hospitalId != ''">
+  hospitalId = #{hospitalId,jdbcType=VARCHAR},
+ </if>
+
+  <if test="dpId != null and dpId >= 0">
+   dp_id = #{dpId,jdbcType=INTEGER},
+  </if>
+  <if test="wxUrl != null">
+   wx_url = #{wxUrl,jdbcType=VARCHAR},
+  </if>
+  <if test="ticket != null and ticket != ''">
+   ticket = #{ticket,jdbcType=VARCHAR},
+  </if>
+  <if test="created != null">
+   created = #{created,jdbcType=TIMESTAMP},
+  </if>
+  <if test="modified != null">
+   modified = #{modified,jdbcType=TIMESTAMP},
+  </if>
+ </set>
+  where id = #{id,jdbcType=INTEGER}
+ </update>
+
+
+ <delete id="deleteWeixinShowqrcodeConfig" parameterType="java.lang.Integer">
+delete from weixin_qrcode_config where id = #{id,jdbcType=INTEGER}
+</delete>
+
+
+
+ <select id="getWeixinShowqrcodeConfig" resultMap="WeixinShowqrcodeConfigResultMap" parameterType="java.lang.Integer">
+select id,hospitalId,dp_id,ticket,created,modified,wx_url
+ from weixin_qrcode_config where id = #{id,jdbcType=INTEGER}
+</select>
+
+
+ <sql id="orderAndLimit">
+  <if test="sort != null and sort != '' ">
+   order by ${sort}
+   <if test="need != null">
+    limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER}
+   </if>
+  </if>
+ </sql>
+
+
+
+ <sql id="WeixinShowqrcodeConfigCondition">
+  <where>
+   1 = 1
+   <if test="id != null and id >= 0">
+    and id = #{id,jdbcType=INTEGER}
+   </if>
+   <if test="hospitalId != null and hospitalId != ''">
+    and hospitalId = #{hospitalId,jdbcType=VARCHAR}
+   </if>
+   <if test="dpId != null and dpId >= 0">
+    and dp_id = #{dpId,jdbcType=INTEGER}
+   </if>
+   <if test="ticket != null and ticket != ''">
+    and ticket = #{ticket,jdbcType=VARCHAR}
+   </if>
+   <if test="created != null">
+    and created = #{created,jdbcType=TIMESTAMP}
+   </if>
+   <if test="wxUrl != null">
+    and wx_url = #{wxUrl,jdbcType=VARCHAR}
+   </if>
+   <if test="modified != null">
+    and modified = #{modified,jdbcType=TIMESTAMP}
+   </if>
+  </where>
+ </sql>
+
+
+
+ <select id="queryWeixinShowqrcodeConfig" resultMap="WeixinShowqrcodeConfigResultMap" parameterType="com.lyms.platform.permission.model.WeixinQrcodeConfigQuery">
+  select id,hospitalId,dp_id,ticket,created,modified,wx_url
+  from weixin_qrcode_config
+  <include refid="WeixinShowqrcodeConfigCondition" />
+  <include refid="orderAndLimit" />
+ </select>
+
+
+
+ <select id="queryWeixinShowqrcodeConfigCount" resultType="int" parameterType="com.lyms.platform.permission.model.WeixinQrcodeConfigQuery">
+  select count(1) from weixin_qrcode_config
+  <include refid="WeixinShowqrcodeConfigCondition" />
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/platform-operate-api/src/main/resources/database.properties b/platform-operate-api/src/main/resources/database.properties
index 1ea0dc1..54bcff1 100644
--- a/platform-operate-api/src/main/resources/database.properties
+++ b/platform-operate-api/src/main/resources/database.properties
@@ -88,4 +88,4 @@ sequence.schedule.expression=0 */1 * * * ?
 or.code.url=https://rp-api.healthbaby.com.cn/scan?code={0}
 or.code.create.url=http://ams.api.healthbaby.com.cn/v1/create/qrcode
 # 二维码地址生成方式 1=本地 2=线上
-or.code.create.type=2
+or.code.create.type=1
-- 
1.8.3.1