From cf412d702a4e9b662cc977979511cf1b6c36e53b Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Tue, 14 Nov 2017 15:13:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/permission/dao/master/CouponMapper.java    |  2 ++
 .../com/lyms/platform/permission/service/CouponService.java  |  3 +++
 .../platform/permission/service/impl/CouponServiceImpl.java  |  9 +++++++++
 .../src/main/resources/mainOrm/master/CouponMapper.xml       | 12 ++++++++++++
 .../lyms/platform/operate/web/facade/BookbuildingFacade.java |  3 ++-
 5 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java
index 18e15a7..8f75692 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java
@@ -124,4 +124,6 @@ public interface CouponMapper {
     List<Map<String,Object>> findUserTypeInfo(Map<String, Object> map);
 
     List<Map<String,Object>> findHospitalInfoByIds2(Map<String, Object> map);
+
+    void invalid2(Map<String, Object> param);
 }
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java
index e813a8d..b295463 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java
@@ -2,6 +2,7 @@ package com.lyms.platform.permission.service;
 
 import com.lyms.platform.common.result.BaseObjectResponse;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -56,4 +57,6 @@ public interface CouponService{
      * @return
      */
     String findByType(String id, int i);
+
+    void invalid2(String pid, Date created, String s);
 }
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 a744093..92ded98 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
@@ -565,6 +565,15 @@ public class CouponServiceImpl implements CouponService {
     }
 
     @Override
+    public void invalid2(String pid, Date created, String couponTypes) {
+        Map<String, Object> param = new HashMap<>();
+        param.put("personId", pid);
+        param.put("couponTypes", com.lyms.platform.common.utils.StringUtils.covertToList(couponTypes, Integer.class));
+        param.put("created", created);
+        couponMapper.invalid2(param);
+    }
+
+    @Override
     public List<Map<String, Object>> queryCouponItemsByType(Map<String, Object> params) {
         return couponMapper.queryCouponItemsByType(params);
     }
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
index 189e589..2b01566 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -133,6 +133,18 @@
         ) b on a.id = b.id set a.status = 3
     </update>
 
+    <update id="invalid2" parameterType="map">
+        update coupon_info a inner join (
+        select a.id
+        from coupon_info a, coupon_template b, coupon_type c
+        where a.coupon_template_id = b.id and b.type_id = c.id and a.status=1 and a.create_date > #{created} and c.type in
+        <foreach collection="couponTypes" open="(" close=")" separator="," item="type">
+            #{type}
+        </foreach>
+        and a.user_id = #{personId}
+        ) b on a.id = b.id set a.status = 3
+    </update>
+
     <select id="findByUsedId" parameterType="string" resultType="string">
         select sequence_id from coupon_info where used_id = #{id} limit 0,1
     </select>
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
index a9cb742..4d73432 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
@@ -1429,7 +1429,8 @@ public class BookbuildingFacade {
 
 
             /** 删除建档应该是把全部未使用的优惠券状态更新为3【已作废】  */
-            couponService.invalid(patients.getPid(), "1,2,3,4,5,6,7,8");
+//            couponService.invalid(patients.getPid(), "1,2,3,4,5,6,7,8");
+            couponService.invalid2(patients.getPid(), patients.getCreated(), "1,2,3,4,5,6,7,8,9,10");
         }
 
         return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
-- 
1.8.3.1