From 84cf2a5c02f83612654b329a8bf5bd6773da64d4 Mon Sep 17 00:00:00 2001 From: litao Date: Tue, 2 May 2017 17:45:30 +0800 Subject: [PATCH] =?UTF-8?q?sql=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/permission/service/CouponService.java | 2 +- .../permission/service/impl/CouponServiceImpl.java | 20 +++++++++++++++----- .../operate/web/controller/CouponController.java | 5 +++-- .../src/main/resources/database.properties | 5 ++++- 4 files changed, 23 insertions(+), 9 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 9c9b8b2..8909b94 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 @@ -8,7 +8,7 @@ import com.lyms.platform.common.result.BaseObjectResponse; * @Version: V1.0 */ public interface CouponService{ - BaseObjectResponse create(String userId, String hospitalId, Integer createUserId); + BaseObjectResponse create(String userId, String hospitalId, String type, Integer createUserId); BaseObjectResponse validate(String userId, String code); 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 b2fcf28..1667de7 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 @@ -10,10 +10,12 @@ import com.lyms.platform.permission.model.CouponInfo; import com.lyms.platform.permission.service.CouponService; import com.lyms.platform.pojo.Patients; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; @@ -35,6 +37,9 @@ public class CouponServiceImpl implements CouponService { private Logger logger = LoggerFactory.getLogger(CouponServiceImpl.class); + @Value("${or.code.url}") + private String url; + @Autowired private CouponMapper couponMapper; @@ -45,13 +50,17 @@ public class CouponServiceImpl implements CouponService { private MongoTemplate mongoTemplate; @Override - public BaseObjectResponse create(String userId, String hospitalId, Integer createUserId) { - Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)), Patients.class); - if(patients == null || patients.getType() == null) return RespBuilder.buildErro(ResponseCode.PATIENTS_NOT_FOUND); - + public BaseObjectResponse create(String userId, String hospitalId, String userType, Integer createUserId) { Map param = new HashMap<>(); + if(StringUtils.isNoneBlank(userType)) { + Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)), Patients.class); + if(patients == null || patients.getType() == null) return RespBuilder.buildErro(ResponseCode.PATIENTS_NOT_FOUND); + param.put("type", patients.getType()); + } else { + param.put("type", userType); + } + param.put("hospitalId", hospitalId); - param.put("type", patients.getType()); List> temps = couponMapper.findTemp(param); if(CollectionUtils.isEmpty(temps)) return RespBuilder.buildErro(ResponseCode.COUPON_TEMP_NOT_FOUND); @@ -173,6 +182,7 @@ public class CouponServiceImpl implements CouponService { Map restMap = new HashMap<>(); restMap.put("topName", couponMapper.findTopName(hospitalId)); restMap.put("couponInfos", couponMapper.findInfo(param)); + restMap.put("url", url); return RespBuilder.buildSuccess(restMap); } 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 9df7f0c..e05aad7 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 @@ -30,14 +30,15 @@ public class CouponController extends BaseController { * 创建用户优惠券 * @param userId * @param hospitalId + * @param type 1=孕妇 2=产妇 3=儿童 * @return */ @RequestMapping(method = RequestMethod.POST) @ResponseBody @TokenRequired - public BaseObjectResponse create(String userId, String hospitalId, HttpServletRequest request) { + public BaseObjectResponse create(String userId, String hospitalId, String type, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return couponService.create(userId, hospitalId, loginState.getId()); + return couponService.create(userId, hospitalId, type, loginState.getId()); // return couponService.create(userId, hospitalId, 200); } diff --git a/platform-operate-api/src/main/resources/database.properties b/platform-operate-api/src/main/resources/database.properties index 3120653..a73dfe3 100644 --- a/platform-operate-api/src/main/resources/database.properties +++ b/platform-operate-api/src/main/resources/database.properties @@ -82,4 +82,7 @@ mongo_crypto_key=Lymsh@2016 sequence.create.size=3000 sequence.index=200000000000 sequence.min.size=300 -sequence.schedule.expression=0 */1 * * * ? \ No newline at end of file +sequence.schedule.expression=0 */1 * * * ? + +# 二维码地址 +or.code.url=http://api.meishengbb.com/scan \ No newline at end of file -- 1.8.3.1