liquanyu / regional-platform

Download as
Browse Code »

Commit 29334f21e5ca38e68d2d84a236fde591d14819fb

Authored by litao
1 parent 649ea0e736
Exists in master and in 1 other branch dev

bug修复

Showing 6 changed files with 25 additions and 4 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java View file @ 29334f2
... ... @@ -43,5 +43,6 @@
43 43 String findByUsedId(String usedId);
44 44  
45 45 String findCityId(String hospitalId);
  46 +
46 47 }
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java View file @ 29334f2
... ... @@ -158,6 +158,7 @@
158 158 Map<String, Object> param = new HashMap<>();
159 159 param.put("userId", userId);
160 160 param.put("hospitalId", hospitalId);
  161 + param.put("status", 1);
161 162 List<CouponInfo> list = couponMapper.findList(param);
162 163 return CollectionUtils.isNotEmpty(list);
163 164 }
platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml View file @ 29334f2
... ... @@ -33,6 +33,9 @@
33 33 <if test="hospitalId != null">
34 34 and create_hospital_id = #{hospitalId}
35 35 </if>
  36 + <if test="status != null">
  37 + and status = #{status}
  38 + </if>
36 39 </where>
37 40 </select>
38 41  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java View file @ 29334f2
... ... @@ -105,9 +105,9 @@
105 105 @RequestMapping(value = "/queryChooseBabys", method = RequestMethod.GET)
106 106 @ResponseBody
107 107 @TokenRequired
108   - public BaseObjectResponse queryChooseBabys(HttpServletRequest request,@RequestParam(required = false)String vcCardNo,@RequestParam(required = false)String cardNo){
  108 + public BaseObjectResponse queryChooseBabys(HttpServletRequest request,@RequestParam(required = false)String vcCardNo,@RequestParam(required = false)String cardNo, String coupon){
109 109 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
110   - return babyCheckFacade.queryChooseBabys(vcCardNo, cardNo, loginState.getId());
  110 + return babyCheckFacade.queryChooseBabys(vcCardNo, cardNo, loginState.getId(), coupon);
111 111 }
112 112  
113 113  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 29334f2
... ... @@ -9,6 +9,7 @@
9 9 import com.lyms.platform.common.utils.*;
10 10 import com.lyms.platform.operate.web.request.BabyCheckRequest;
11 11 import com.lyms.platform.operate.web.result.*;
  12 +import com.lyms.platform.permission.dao.master.CouponMapper;
12 13 import com.lyms.platform.permission.model.Organization;
13 14 import com.lyms.platform.permission.model.Users;
14 15 import com.lyms.platform.permission.service.CouponService;
... ... @@ -68,6 +69,9 @@
68 69 @Autowired
69 70 private QhdfyHisService qhdfyHisService;
70 71  
  72 + @Autowired
  73 + private CouponMapper couponMapper;
  74 +
71 75 public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version");
72 76  
73 77 /**
74 78  
... ... @@ -740,9 +744,10 @@
740 744 *
741 745 * @param vcCardNo
742 746 * @param cardNo
  747 + * @param coupon
743 748 * @return
744 749 */
745   - public BaseObjectResponse queryChooseBabys(String vcCardNo, String cardNo, Integer userId) {
  750 + public BaseObjectResponse queryChooseBabys(String vcCardNo, String cardNo, Integer userId, String coupon) {
746 751  
747 752  
748 753 Map map = new HashMap();
749 754  
... ... @@ -761,11 +766,20 @@
761 766 boolean isBuild = false;
762 767 List<BabyChooseResult> results = new ArrayList<>();
763 768  
764   - if (!StringUtils.isEmpty(vcCardNo) || !StringUtils.isEmpty(cardNo)) {
  769 + if (!StringUtils.isEmpty(vcCardNo) || !StringUtils.isEmpty(cardNo) || StringUtils.isNotEmpty(coupon)) {
765 770 BabyModelQuery babyQuery = new BabyModelQuery();
766 771 babyQuery.setPhoneOrcardNo(StringUtils.isEmpty(cardNo) ? null : cardNo); //手机号码或者身份证号码
767 772 babyQuery.setVcCardNo(StringUtils.isEmpty(vcCardNo) ? null : vcCardNo);
768 773 babyQuery.setYn(YnEnums.YES.getId());
  774 +
  775 + /** 处理优惠券查询 */
  776 + if(StringUtils.isNotEmpty(coupon)) {
  777 + Map<String, Object> m = couponMapper.findUrl(coupon);
  778 + Object personId = m.get("user_id");
  779 + if(personId != null) {
  780 + babyQuery.setPid(personId.toString());
  781 + }
  782 + }
769 783  
770 784 //表示区域的
771 785 if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 29334f2
... ... @@ -246,6 +246,8 @@
246 246 patient.setOperator(userId);
247 247 Patients p = yunBookbuildingService.addPregnantBookbuilding(patient);
248 248  
  249 + /** 孕妇建档后把所有以前未使用的优惠券作废 */
  250 + couponService.invalid(p.getPid(), "1,2,3,4,5,6,7,8");
249 251  
250 252  
251 253 if (resperson != null) {