jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 62652856bd93cf98e1474ae02f41b4d0dff4e786

Authored by litao
1 parent 9ced385eb2
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

二维码跳转地址

Showing 17 changed files with 146 additions and 74 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java View file @ 6265285
... ... @@ -33,5 +33,7 @@
33 33 List<Map<String, Object>> findOrgUsers(String hospitalId);
34 34  
35 35 List<Map<String, Object>> findOrgAreas(String hospitalId);
  36 +
  37 + Map<String,Object> findUrl(String code);
36 38 }
platform-biz-service/src/main/java/com/lyms/platform/permission/model/CouponInfo.java View file @ 6265285
... ... @@ -51,7 +51,7 @@
51 51 private String usedHospitalId;
52 52  
53 53 /**
54   - * 状态：1:未使用 2:已使用 -1:禁用 3：分娩销毁 4:建档删除 删除
  54 + * 状态：1=未使用 2=已使用 -1=禁用 3：分娩/删除档案/终止妊娠优惠券作废
55 55 */
56 56 private Integer status;
57 57  
platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java View file @ 6265285
... ... @@ -17,7 +17,7 @@
17 17  
18 18 BaseObjectResponse findList(String userId, String hospitalId, String url);
19 19  
20   - BaseObjectResponse use(String hospitalId, String code, Integer userId);
  20 + BaseObjectResponse use(String hospitalId, String code, Integer userId, String usedId);
21 21  
22 22 Set<Integer> findTypes(String hospital);
23 23  
... ... @@ -30,5 +30,7 @@
30 30 BaseObjectResponse doctors(String hospitalId);
31 31  
32 32 BaseObjectResponse areas(String hospitalId);
  33 +
  34 + String findUrl(String code);
33 35 }
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java View file @ 6265285
... ... @@ -5,14 +5,15 @@
5 5 import com.lyms.platform.common.result.RespBuilder;
6 6 import com.lyms.platform.common.result.ResponseCode;
7 7 import com.lyms.platform.common.utils.DateUtil;
  8 +import com.lyms.platform.common.utils.HttpClientUtil;
8 9 import com.lyms.platform.common.utils.PropertiesUtil;
9   -import com.lyms.platform.common.utils.PropertiesUtils;
10 10 import com.lyms.platform.permission.dao.master.CouponMapper;
11 11 import com.lyms.platform.permission.model.CouponInfo;
12 12 import com.lyms.platform.permission.model.Organization;
13 13 import com.lyms.platform.permission.service.CouponService;
14 14 import com.lyms.platform.permission.service.OrganizationService;
15 15 import com.lyms.platform.pojo.*;
  16 +import net.sf.json.JSONObject;
16 17 import org.apache.commons.collections.CollectionUtils;
17 18 import org.apache.commons.collections.MapUtils;
18 19 import org.apache.commons.lang3.StringUtils;
... ... @@ -339,6 +340,22 @@
339 340 return RespBuilder.buildSuccess(couponMapper.findOrgAreas(hospitalId));
340 341 }
341 342  
  343 + @Override
  344 + public String findUrl(String code) {
  345 + Map<String, Object> map = couponMapper.findUrl(code);
  346 + String hId = map.get("create_hospital_id").toString();
  347 + String userId = map.get("user_id").toString();
  348 +
  349 + PersonModel person = mongoTemplate.findById(userId, PersonModel.class);
  350 +
  351 + Map<String, String> params = new HashMap<>();
  352 + params.put("hId", hId);
  353 + params.put("dpId", person.getType() == 2 ? "1" : "2");
  354 + String s = HttpClientUtil.doGet(PropertiesUtil.getInstance().getDefault("or.code.create.url"), params, "utf-8", null);
  355 + JSONObject jsonObject = JSONObject.fromObject(s);
  356 + return jsonObject.get("url").toString();
  357 + }
  358 +
342 359 /** 1=省 2=市 3=区 4=单医院 */
343 360 private boolean validateArea(String areaType, String createHospitalId, String useHospitald) {
344 361 Organization createHospital = organizationService.getOrganization(Integer.parseInt(createHospitalId));
... ... @@ -387,7 +404,7 @@
387 404 } else {
388 405 Patients patient = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)), Patients.class);
389 406  
390   - if(personType == 1 || couponType.equals("4")) { /** 孕妇根据末次月经对比 分娩券按照末次月经对比 */
  407 + if(personType == 1 || couponType == 4) { /** 孕妇根据末次月经对比 分娩券按照末次月经对比 */
391 408 midDate = patient.getLastMenses();
392 409 } else if(personType == 3) { /** 产妇根据分娩时间对比 */
393 410 midDate = patient.getFmDate();
394 411  
395 412  
... ... @@ -434,19 +451,15 @@
434 451 return RespBuilder.buildSuccess(restMap);
435 452 }
436 453  
437   - public static void main(String[] args) {
438   - System.out.println(PropertiesUtils.getPropertyValue("or.code.url"));
439   - }
440   -
441   -
442 454 @Override
443   - public BaseObjectResponse use(String hospitalId, String code, Integer userId) {
  455 + public BaseObjectResponse use(String hospitalId, String code, Integer userId, String usedId) {
444 456 Map<String, Object> param = new HashMap<>();
445 457 param.put("hospitalId", hospitalId);
446 458 param.put("operatorUseId", userId);
447 459 param.put("status", 2);
448 460 param.put("useDate", new Date());
449 461 param.put("code", code);
  462 + param.put("usedId", usedId);
450 463 couponMapper.use(param);
451 464 return RespBuilder.buildSuccess();
452 465 }
platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml View file @ 6265285
... ... @@ -72,7 +72,7 @@
72 72  
73 73 <update id="use" parameterType="map">
74 74 update coupon_info
75   - set use_date = #{useDate}, operator_use_id = #{operatorUseId}, used_hospital_id = #{hospitalId}, status = #{status}
  75 + set use_date = #{useDate}, operator_use_id = #{operatorUseId}, used_hospital_id = #{hospitalId}, status = #{status}, used_id = #{usedId}
76 76 where sequence_id = #{code}
77 77 </update>
78 78  
... ... @@ -98,6 +98,10 @@
98 98 select area_name as name
99 99 from coupon_hospial_area
100 100 where hospital_id = #{id}
  101 + </select>
  102 +
  103 + <select id="findUrl" parameterType="string" resultType="map">
  104 + SELECT create_hospital_id, user_id FROM coupon_info where sequence_id = #{id}
101 105 </select>
102 106  
103 107 </mapper>
platform-common/src/main/java/com/lyms/platform/common/utils/PropertiesUtil.java View file @ 6265285
... ... @@ -68,7 +68,7 @@
68 68 return get(DEFAULT_DATABASE_NAME, keyName, params);
69 69 }
70 70  
71   - public String format(String key, String... params) {
  71 + private String format(String key, String... params) {
72 72 return MessageFormat.format(key, params);
73 73 }
74 74  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java View file @ 6265285
... ... @@ -139,16 +139,8 @@
139 139 @TokenRequired
140 140 public BaseResponse addOneAntenatalExamination(@Valid @RequestBody AntExAddRequest antExAddRequest,HttpServletRequest request) {
141 141 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
142   - /** 验证产检券是否可用 可用就改为已使用状态 */
143   - if(org.apache.commons.lang3.StringUtils.isNotBlank(antExAddRequest.getCouponCode()) && antExAddRequest.getCouponType() != null) {
144   - BaseObjectResponse resp = couponService.validate(antExAddRequest.getCouponCode(), antExAddRequest.getCouponType(), autoMatchFacade.getHospitalId(loginState.getId()));
145   - if(resp.getErrorcode() != 0) {
146   - return resp;
147   - } else {
148   - couponService.use(autoMatchFacade.getHospitalId(getUserId(request)), antExAddRequest.getCouponCode(), getUserId(request));
149   - }
150   - }
151 142  
  143 +
152 144 BaseResponse baseResponse = antenatalExaminationFacade.addOneAntEx(antExAddRequest, loginState.getId());
153 145 baseResponse.setObject(couponService.getPatientsInfoByCode(antExAddRequest.getCouponCode()));
154 146 return baseResponse;
... ... @@ -165,16 +157,6 @@
165 157 @TokenRequired
166 158 public BaseResponse addOneAntEx(@Valid @RequestBody AntExcAddRequest antExcAddRequest,HttpServletRequest request) {
167 159 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
168   - /** 验证产检券是否可用 可用就改为已使用状态 */
169   - if(org.apache.commons.lang3.StringUtils.isNotBlank(antExcAddRequest.getCouponCode()) && antExcAddRequest.getCouponType() != null) {
170   - BaseObjectResponse resp = couponService.validate(antExcAddRequest.getCouponCode(), antExcAddRequest.getCouponType(), autoMatchFacade.getHospitalId(loginState.getId()));
171   - if(resp.getErrorcode() != 0) {
172   - return resp;
173   - } else {
174   - couponService.use(autoMatchFacade.getHospitalId(getUserId(request)), antExcAddRequest.getCouponCode(), getUserId(request));
175   - }
176   - }
177   -
178 160 BaseResponse baseResponse = antenatalExaminationFacade.addOneAnetExChu(antExcAddRequest, loginState.getId());
179 161 baseResponse.setObject(couponService.getPatientsInfoByCode(antExcAddRequest.getCouponCode()));
180 162 return baseResponse;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java View file @ 6265285
... ... @@ -47,15 +47,7 @@
47 47 @TokenRequired
48 48 public BaseResponse addOrUpBabyCheck(@Valid @RequestBody BabyCheckRequest request,HttpServletRequest httpServletRequest) {
49 49 LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext");
50   - /** 验证产检券是否可用 可用就改为已使用状态 */
51   - if(org.apache.commons.lang3.StringUtils.isNotBlank(request.getCouponCode()) && request.getCouponType() != null) {
52   - BaseObjectResponse resp = couponService.validate(request.getCouponCode(), request.getCouponType(), autoMatchFacade.getHospitalId(loginState.getId()));
53   - if(resp.getErrorcode() != 0) {
54   - return resp;
55   - } else {
56   - couponService.use(autoMatchFacade.getHospitalId(getUserId(httpServletRequest)), request.getCouponCode(), getUserId(httpServletRequest));
57   - }
58   - }
  50 +
59 51  
60 52 if (request != null && !StringUtils.isEmpty(request.getId()))
61 53 {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java View file @ 6265285
... ... @@ -6,8 +6,10 @@
6 6 import com.lyms.platform.common.result.BaseObjectResponse;
7 7 import com.lyms.platform.operate.web.facade.AutoMatchFacade;
8 8 import com.lyms.platform.permission.service.CouponService;
  9 +import com.lyms.platform.pojo.PatientCheckTicket;
9 10 import org.springframework.beans.factory.annotation.Autowired;
10 11 import org.springframework.beans.factory.annotation.Value;
  12 +import org.springframework.data.mongodb.core.MongoTemplate;
11 13 import org.springframework.stereotype.Controller;
12 14 import org.springframework.web.bind.annotation.PathVariable;
13 15 import org.springframework.web.bind.annotation.RequestMapping;
... ... @@ -34,6 +36,9 @@
34 36 @Value("${or.code.url}")
35 37 private String url;
36 38  
  39 + @Autowired
  40 + private MongoTemplate mongoTemplate;
  41 +
37 42 /**
38 43 * 创建用户产检券
39 44 * @param userId
40 45  
41 46  
... ... @@ -70,17 +75,15 @@
70 75  
71 76 /**
72 77 * 后期再建档的时候 先验证优惠券 然后再使用 这里先不验证优惠券
73   - * @param code
74   - * @param hospitalId
75   - * @param request
76 78 * @return
77 79 */
78   - @RequestMapping(method = RequestMethod.PUT, value = "/test")
79   - @TokenRequired
  80 + @RequestMapping(method = RequestMethod.POST, value = "/test")
80 81 @ResponseBody
81   - public BaseObjectResponse testUse(@PathVariable String code, @PathVariable String hospitalId, HttpServletRequest request) {
82   - LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
83   - return couponService.use(code, hospitalId, loginState.getId());
  82 + public BaseObjectResponse testUse() {
  83 + PatientCheckTicket ticket = new PatientCheckTicket();
  84 + mongoTemplate.save(ticket);
  85 + System.err.println("ticket > " + ticket + " : " + ticket.getId());
  86 + return null;
84 87 }
85 88  
86 89 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DischargeAbstractController.java View file @ 6265285
... ... @@ -52,19 +52,9 @@
52 52 BaseObjectResponse baseObjectResponse;
53 53 LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext");
54 54  
55   - /** 验证产检券是否可用 可用就改为已使用状态 */
56   - if(org.apache.commons.lang3.StringUtils.isNotBlank(dischargeAbstractSaveRequest.getCouponCode()) && dischargeAbstractSaveRequest.getCouponType() != null) {
57   - BaseObjectResponse resp = couponService.validate(dischargeAbstractSaveRequest.getCouponCode(), dischargeAbstractSaveRequest.getCouponType(), autoMatchFacade.getHospitalId(loginState.getId()));
58   - if(resp.getErrorcode() != 0) {
59   - return resp;
60   - } else {
61   - couponService.use(autoMatchFacade.getHospitalId(getUserId(httpServletRequest)), dischargeAbstractSaveRequest.getCouponCode(), getUserId(httpServletRequest));
62   - }
63   - }
64   -
65 55 try {
66 56 dischargeAbstractSaveRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId());
67   - DischargeAbstractSaveResult dischargeAbstractSaveResult = dischargeAbstractFacade.save(dischargeAbstractSaveRequest);
  57 + DischargeAbstractSaveResult dischargeAbstractSaveResult = dischargeAbstractFacade.save(dischargeAbstractSaveRequest, loginState.getId());
68 58 if (dischargeAbstractSaveResult.getErrorcode() != ErrorCodeConstants.SUCCESS) {
69 59 baseObjectResponse = new BaseObjectResponse().setErrorcode(dischargeAbstractSaveResult.getErrorcode()).setErrormsg(dischargeAbstractSaveResult.getErrormsg());
70 60 baseObjectResponse.setObject(couponService.getPatientsInfoByCode(dischargeAbstractSaveRequest.getCouponCode()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java View file @ 6265285
... ... @@ -4,7 +4,6 @@
4 4 import com.lyms.platform.common.base.BaseController;
5 5 import com.lyms.platform.common.base.LoginContext;
6 6 import com.lyms.platform.common.constants.ErrorCodeConstants;
7   -import com.lyms.platform.common.result.BaseObjectResponse;
8 7 import com.lyms.platform.common.result.BaseResponse;
9 8 import com.lyms.platform.operate.web.facade.AutoMatchFacade;
10 9 import com.lyms.platform.operate.web.facade.PostReviewFacade;
... ... @@ -54,15 +53,6 @@
54 53 public BaseResponse addPostReview(@Valid @RequestBody PostReviewRequest postReviewRequest,HttpServletRequest request){
55 54 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
56 55  
57   - /** 验证产检券是否可用 可用就改为已使用状态 */
58   - if(org.apache.commons.lang3.StringUtils.isNotBlank(postReviewRequest.getCouponCode()) && postReviewRequest.getCouponType() != null) {
59   - BaseObjectResponse resp = couponService.validate(postReviewRequest.getCouponCode(), postReviewRequest.getCouponType(), autoMatchFacade.getHospitalId(loginState.getId()));
60   - if(resp.getErrorcode() != 0) {
61   - return resp;
62   - } else {
63   - couponService.use(autoMatchFacade.getHospitalId(getUserId(request)), postReviewRequest.getCouponCode(), getUserId(request));
64   - }
65   - }
66 56 BaseResponse baseResponse = postReviewFacade.addPostReview(postReviewRequest, loginState.getId());
67 57 baseResponse.setObject(couponService.getPatientsInfoByCode(postReviewRequest.getCouponCode()));
68 58 return baseResponse;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ScanController.java View file @ 6265285
1 1 package com.lyms.platform.operate.web.controller;
2 2  
3 3 import com.lyms.platform.common.base.BaseController;
  4 +import com.lyms.platform.permission.service.CouponService;
  5 +import org.springframework.beans.factory.annotation.Autowired;
4 6 import org.springframework.stereotype.Controller;
5 7 import org.springframework.web.bind.annotation.RequestMapping;
6 8  
7 9  
... ... @@ -14,14 +16,18 @@
14 16 @Controller
15 17 public class ScanController extends BaseController {
16 18  
  19 + @Autowired
  20 + private CouponService couponService;
  21 +
17 22 /**
18 23 * @auther HuJiaqi
19 24 * @createTime 2017年01月10日 16时23分
20 25 * @discription 扫码接口，现在直接返回一个地址
21 26 */
22 27 @RequestMapping("/scan")
23   - public void scan(HttpServletResponse httpServletResponse) throws Exception {
24   - httpServletResponse.sendRedirect("http://m.healthbaby.com.cn/download/download.html");
  28 + public void scan(HttpServletResponse httpServletResponse, String code) throws Exception {
  29 +// httpServletResponse.sendRedirect("http://m.healthbaby.com.cn/download/download.html");
  30 + httpServletResponse.sendRedirect(couponService.findUrl(code));
25 31 }
26 32  
27 33 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 6265285
... ... @@ -13,6 +13,7 @@
13 13 import com.lyms.platform.operate.web.result.*;
14 14 import com.lyms.platform.permission.model.Organization;
15 15 import com.lyms.platform.permission.model.Users;
  16 +import com.lyms.platform.permission.service.CouponService;
16 17 import com.lyms.platform.permission.service.OrganizationService;
17 18 import com.lyms.platform.permission.service.UsersService;
18 19 import com.lyms.platform.pojo.*;
... ... @@ -66,6 +67,9 @@
66 67 @Autowired
67 68 private PatientCheckTicketService patientCheckTicketService;
68 69  
  70 + @Autowired
  71 + private CouponService couponService;
  72 +
69 73 /**
70 74 * 处理区域隐藏建档
71 75 *
... ... @@ -294,6 +298,15 @@
294 298 patientsService.updatePatientOneCol(patients.getId(), com.lyms.platform.common.utils.StringUtils.isEmpty(antExAddRequest.getNextCheckTime()) == true ? null : DateUtil.parseYMD(antExAddRequest.getNextCheckTime()));
295 299 antenatalExaminationService.addOneBabyAnt(model);
296 300  
  301 + /** 验证产检券是否可用 可用就改为已使用状态 */
  302 + if(StringUtils.isNotBlank(antExAddRequest.getCouponCode()) && antExAddRequest.getCouponType() != null) {
  303 + BaseObjectResponse resp = couponService.validate(antExAddRequest.getCouponCode(), antExAddRequest.getCouponType(), autoMatchFacade.getHospitalId(userId));
  304 + if(resp.getErrorcode() != 0) {
  305 + return resp;
  306 + } else {
  307 + couponService.use(autoMatchFacade.getHospitalId(userId), antExAddRequest.getCouponCode(), userId, model.getId());
  308 + }
  309 + }
297 310  
298 311 //修改最后一次检查时间
299 312 setLashCTimes(antExAddRequest.getParentId());
... ... @@ -370,6 +383,15 @@
370 383 * @return
371 384 */
372 385 public BaseResponse addOneAnetExChu(AntExcAddRequest excAddRequest, Integer userId) {
  386 +
  387 + /** 验证产检券是否可用 可用就改为已使用状态 */
  388 + if(StringUtils.isNotBlank(excAddRequest.getCouponCode()) && excAddRequest.getCouponType() != null) {
  389 + BaseObjectResponse resp = couponService.validate(excAddRequest.getCouponCode(), excAddRequest.getCouponType(), autoMatchFacade.getHospitalId(userId));
  390 + if(resp.getErrorcode() != 0) {
  391 + return resp;
  392 + }
  393 + }
  394 +
373 395 AntExChuModel antExChuModel = excAddRequest.convertToDataModel();
374 396 String hospitalId = autoMatchFacade.getHospitalId(userId);
375 397  
... ... @@ -462,6 +484,9 @@
462 484 antExChuModel.setYn(YnEnums.YES.getId());
463 485 antExChuModel.setHospitalId(autoMatchFacade.getHospitalId(userId));
464 486 antenatalExaminationService.addOneAntEx(antExChuModel);
  487 + /** 把优惠券设置为已使用状态 */
  488 + couponService.use(hospitalId, excAddRequest.getCouponCode(), userId, antExChuModel.getId());
  489 +
465 490 //修改患者风险等级
466 491  
467 492 patients.setLastCheckEmployeeId(excAddRequest.getProdDoctor());
468 493  
... ... @@ -507,12 +532,16 @@
507 532 referralApplyOrderQuery2.setTransferredHospital(outHospitalId);
508 533 referralApplyOrderQuery2.setPid(patients.getPid());
509 534 applyOrderService.updateByParentId(referralApplyOrderQuery2, model);
  535 +
  536 +
510 537 }
511 538 }
512 539 } else {
513 540 return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("您已经做过初诊");
514 541 }
515 542 }
  543 +
  544 +
516 545 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
517 546 }
518 547  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 6265285
... ... @@ -13,6 +13,7 @@
13 13 import com.lyms.platform.operate.web.result.*;
14 14 import com.lyms.platform.permission.model.Organization;
15 15 import com.lyms.platform.permission.model.Users;
  16 +import com.lyms.platform.permission.service.CouponService;
16 17 import com.lyms.platform.permission.service.OrganizationService;
17 18 import com.lyms.platform.permission.service.UsersService;
18 19 import com.lyms.platform.pojo.*;
... ... @@ -63,6 +64,9 @@
63 64 @Autowired
64 65 private AutoMatchFacade autoMatchFacade;
65 66  
  67 + @Autowired
  68 + private CouponService couponService;
  69 +
66 70 /**
67 71 * 更新检查
68 72 *
... ... @@ -227,6 +231,14 @@
227 231 */
228 232 public BaseResponse addBabyCheck(BabyCheckRequest request, Integer userId) {
229 233  
  234 + /** 验证产检券是否可用 可用就改为已使用状态 */
  235 + if(org.apache.commons.lang3.StringUtils.isNotBlank(request.getCouponCode()) && request.getCouponType() != null) {
  236 + BaseObjectResponse resp = couponService.validate(request.getCouponCode(), request.getCouponType(), autoMatchFacade.getHospitalId(userId));
  237 + if(resp.getErrorcode() != 0) {
  238 + return resp;
  239 + }
  240 + }
  241 +
230 242 String hospitalId = autoMatchFacade.getHospitalId(userId);
231 243 //表示区域的
232 244 if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) {
... ... @@ -269,6 +281,12 @@
269 281 model.setHospitalId(hospitalId);
270 282 model.setCreated(new Date());
271 283 model = babyCheckService.addBabyCheck(model);
  284 +
  285 + /** 使用优惠券 */
  286 + if(org.apache.commons.lang3.StringUtils.isNotBlank(request.getCouponCode()) && request.getCouponType() != null) {
  287 + couponService.use(autoMatchFacade.getHospitalId(userId), request.getCouponCode(), userId, model.getId());
  288 + }
  289 +
272 290 BaseObjectResponse br = new BaseObjectResponse();
273 291 if (model == null || model.getId() == null) {
274 292 br.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java View file @ 6265285
... ... @@ -7,11 +7,14 @@
7 7 import com.lyms.platform.common.constants.ErrorCodeConstants;
8 8 import com.lyms.platform.common.enums.RenShenJieJuEnums;
9 9 import com.lyms.platform.common.enums.YnEnums;
  10 +import com.lyms.platform.common.result.BaseObjectResponse;
  11 +import com.lyms.platform.common.result.ResponseCode;
10 12 import com.lyms.platform.common.utils.BeanUtils;
11 13 import com.lyms.platform.common.utils.DateUtil;
12 14 import com.lyms.platform.operate.web.request.DischargeAbstractQueryRequest;
13 15 import com.lyms.platform.operate.web.request.DischargeAbstractSaveRequest;
14 16 import com.lyms.platform.operate.web.result.*;
  17 +import com.lyms.platform.permission.service.CouponService;
15 18 import com.lyms.platform.permission.service.UsersService;
16 19 import com.lyms.platform.pojo.BabyModel;
17 20 import com.lyms.platform.pojo.DischargeAbstractBabyModel;
18 21  
... ... @@ -22,9 +25,9 @@
22 25 import com.lyms.platform.query.DischargeAbstractMotherQuery;
23 26 import com.lyms.platform.query.PatientsQuery;
24 27 import org.apache.commons.collections.CollectionUtils;
  28 +import org.apache.commons.lang3.StringUtils;
25 29 import org.springframework.beans.factory.annotation.Autowired;
26 30 import org.springframework.stereotype.Component;
27   -import org.springframework.util.StringUtils;
28 31  
29 32 import java.text.SimpleDateFormat;
30 33 import java.util.ArrayList;
31 34  
32 35  
... ... @@ -61,10 +64,26 @@
61 64 @Autowired
62 65 private UsersService usersService;
63 66  
64   - public DischargeAbstractSaveResult save(DischargeAbstractSaveRequest dischargeAbstractSaveRequest) {
  67 + @Autowired
  68 + private CouponService couponService;
65 69  
  70 + public DischargeAbstractSaveResult save(DischargeAbstractSaveRequest dischargeAbstractSaveRequest, Integer userId) {
  71 +
66 72 DischargeAbstractSaveResult dischargeAbstractSaveResult = new DischargeAbstractSaveResult();
67 73  
  74 + /** 验证产检券是否可用 可用就改为已使用状态 */
  75 + if(StringUtils.isNotBlank(dischargeAbstractSaveRequest.getCouponCode()) && dischargeAbstractSaveRequest.getCouponType() != null) {
  76 + BaseObjectResponse resp = couponService.validate(dischargeAbstractSaveRequest.getCouponCode(), dischargeAbstractSaveRequest.getCouponType(), autoMatchFacade.getHospitalId(userId));
  77 + if(resp.getErrorcode() != 0) {
  78 + ResponseCode data = (ResponseCode) resp.getData();
  79 + dischargeAbstractSaveResult.setErrorcode(data.getCode());
  80 + dischargeAbstractSaveResult.setErrormsg(data.getMsg());
  81 + return dischargeAbstractSaveResult;
  82 + }
  83 +
  84 + }
  85 +
  86 +
68 87 // 保存母亲信息
69 88 DischargeAbstractMotherModel dischargeAbstractMotherModel = new DischargeAbstractMotherModel();
70 89 BeanUtils.copy(dischargeAbstractSaveRequest, dischargeAbstractMotherModel);
... ... @@ -75,6 +94,11 @@
75 94 dischargeAbstractMotherModel.setpId(dischargeAbstractSaveRequest.getpId());
76 95 if (StringUtils.isEmpty(dischargeAbstractMotherModel.getId())) {
77 96 dischargeAbstractMotherModel = dischargeAbstractMotherService.save(dischargeAbstractMotherModel);
  97 +
  98 + /** 使用优惠券 */
  99 + if(StringUtils.isNotBlank(dischargeAbstractSaveRequest.getCouponCode()) && dischargeAbstractSaveRequest.getCouponType() != null) {
  100 + couponService.use(autoMatchFacade.getHospitalId(userId), dischargeAbstractSaveRequest.getCouponCode(), userId, dischargeAbstractMotherModel.getId());
  101 + }
78 102 } else {
79 103 dischargeAbstractMotherService.update(dischargeAbstractMotherModel);
80 104 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java View file @ 6265285
... ... @@ -18,6 +18,7 @@
18 18 import com.lyms.platform.operate.web.result.PostReviewResult;
19 19 import com.lyms.platform.permission.model.Organization;
20 20 import com.lyms.platform.permission.model.Users;
  21 +import com.lyms.platform.permission.service.CouponService;
21 22 import com.lyms.platform.permission.service.OrganizationService;
22 23 import com.lyms.platform.permission.service.UsersService;
23 24 import com.lyms.platform.pojo.*;
... ... @@ -63,6 +64,9 @@
63 64 @Autowired
64 65 private OrganizationGroupsService groupsService;
65 66  
  67 + @Autowired
  68 + private CouponService couponService;
  69 +
66 70 /**
67 71 * 增加产后复查记录
68 72 * <p/>
... ... @@ -75,6 +79,14 @@
75 79 * @return
76 80 */
77 81 public BaseResponse addPostReview(PostReviewRequest postReviewRequest, Integer userId) {
  82 + /** 验证产检券是否可用 可用就改为已使用状态 */
  83 + if(org.apache.commons.lang3.StringUtils.isNotBlank(postReviewRequest.getCouponCode()) && postReviewRequest.getCouponType() != null) {
  84 + BaseObjectResponse resp = couponService.validate(postReviewRequest.getCouponCode(), postReviewRequest.getCouponType(), autoMatchFacade.getHospitalId(userId));
  85 + if(resp.getErrorcode() != 0) {
  86 + return resp;
  87 + }
  88 + }
  89 +
78 90 PostReviewModel postReviewModel = postReviewRequest.convertToDataModel();
79 91 //表示区域的
80 92 String hospital = autoMatchFacade.getHospitalId(userId);
... ... @@ -110,6 +122,10 @@
110 122 postReviewModel.setPid(patients.getPid());
111 123  
112 124 postReviewService.addPostReview(postReviewModel);
  125 + /** 使用优惠券 */
  126 + if(org.apache.commons.lang3.StringUtils.isNotBlank(postReviewRequest.getCouponCode()) && postReviewRequest.getCouponType() != null) {
  127 + couponService.use(autoMatchFacade.getHospitalId(userId), postReviewRequest.getCouponCode(), userId, postReviewModel.getId());
  128 + }
113 129  
114 130 if (null != patients1.getPostViewTimes()) {
115 131 Patients patients2 = new Patients();
platform-operate-api/src/main/resources/database.properties View file @ 6265285
... ... @@ -86,4 +86,5 @@
86 86  
87 87 # 二维码地址
88 88 or.code.url=https://rp-api.healthbaby.com.cn/scan?code={0}
  89 +or.code.create.url=http://ams.api.stage.healthbaby.com.cn/v1/create/qrcode