From 64a590daaef9f3e5e49e5a7a2a479f43b93381dc Mon Sep 17 00:00:00 2001 From: litao Date: Mon, 26 Jun 2017 11:12:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E4=BC=98=E6=83=A0=E5=88=B8?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=8F=91=E6=94=BE=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/permission/service/CouponService.java | 2 +- .../platform/permission/service/impl/CouponServiceImpl.java | 7 ++++++- .../src/main/java/com/lyms/platform/pojo/Patients.java | 11 +++++++++++ .../platform/operate/web/controller/CouponController.java | 4 ++-- .../lyms/platform/operate/web/facade/BookbuildingFacade.java | 4 ++++ .../java/com/lyms/platform/operate/web/facade/ViewFacade.java | 3 +++ .../lyms/platform/operate/web/result/PregnantInfoResult.java | 10 ++++++++++ 7 files changed, 37 insertions(+), 4 deletions(-) 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 7262d26..7206703 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 @@ -12,7 +12,7 @@ import java.util.Set; * @Version: V1.0 */ public interface CouponService{ - BaseObjectResponse create(String userId, String hospitalId, Integer createUserId); + BaseObjectResponse create(String userId, String hospitalId, Integer createUserId, String patientId); BaseObjectResponse validate(String code, Integer type, String hospitalId); 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 bcbfebe..4149026 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 @@ -25,6 +25,7 @@ import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; +import org.springframework.data.mongodb.core.query.Update; import org.springframework.stereotype.Service; import java.util.*; @@ -94,7 +95,7 @@ public class CouponServiceImpl implements CouponService { }; @Override - public BaseObjectResponse create(String userId, String hospitalId, Integer createUserId) { + public BaseObjectResponse create(String userId, String hospitalId, Integer createUserId, String patientId) { if(isCreated(userId, hospitalId)) { return RespBuilder.buildErro(ResponseCode.COUPON_IS_CREATED); } @@ -124,6 +125,10 @@ public class CouponServiceImpl implements CouponService { } sendCoupon(temps, hospitalId, createUserId, userId, person.getType(), areaCode); + + /** 记录为已经发放过优惠券 */ + mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(patientId)), Update.update("isSendCoupon", true), Patients.class); + return RespBuilder.buildSuccess(); } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index 057e6fa..0694ab3 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -247,6 +247,9 @@ public class Patients extends BaseModel { private Integer isAutoFm; + // 是否发放过优惠券 + private boolean isSendCoupon; + public Integer getIsAutoFm() { return isAutoFm; } @@ -1055,6 +1058,14 @@ public class Patients extends BaseModel { this.streetRegisterId = streetRegisterId; } + public boolean isSendCoupon() { + return isSendCoupon; + } + + public void setSendCoupon(boolean sendCoupon) { + isSendCoupon = sendCoupon; + } + @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java index 3ba85d9..0d745cf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java @@ -57,9 +57,9 @@ public class CouponController extends BaseController { @RequestMapping(method = RequestMethod.POST) @ResponseBody @TokenRequired - public BaseObjectResponse create(String userId, String hospitalId, HttpServletRequest request) { + public BaseObjectResponse create(String userId, String hospitalId, String patientId, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return couponService.create(userId, hospitalId, loginState.getId()); + return couponService.create(userId, hospitalId, loginState.getId(), patientId); } /** 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 1db5854..1dd6035 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 @@ -1075,6 +1075,10 @@ public class BookbuildingFacade { private PregnantInfoResult getResult(Patients p) { PregnantInfoResult result = new PregnantInfoResult(); + + /** 是否发放过优惠券 */ + result.setSendCoupon(p.isSendCoupon()); + result.setId(p.getId()); /**********孕妇基本信息***************/ result.setPregnantName(p.getUsername()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index e10990e..2729433 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -103,6 +103,9 @@ public class ViewFacade { Map map = new HashMap<>(); + + map.put("isSendCoupon", data.isSendCoupon()); + map.put("id", data.getId()); /* 孕妇基础数据 */ map.put("username", data.getUsername()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java index 01ee8fc..49b00af 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java @@ -6,6 +6,9 @@ import java.util.Map; * Created by Administrator on 2016/6/15. */ public class PregnantInfoResult { + + private boolean isSendCoupon; + /***********孕妇基本信息***********/ //建档Id @@ -135,6 +138,13 @@ public class PregnantInfoResult { //分娩状态 0未终止妊娠 1终止妊娠 private Integer dueStatus; + public boolean isSendCoupon() { + return isSendCoupon; + } + + public void setSendCoupon(boolean sendCoupon) { + isSendCoupon = sendCoupon; + } public Integer getDueStatus() { return dueStatus; -- 1.8.3.1