Commit 2be330372b699f5ea9cd219aa1cb81e59b44109f

Authored by litao@lymsh.com
1 parent b6a8967e26

加字段

Showing 2 changed files with 4 additions and 4 deletions

platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml View file @ 2be3303
... ... @@ -70,7 +70,7 @@
70 70 </select>
71 71  
72 72 <select id="findInfo" parameterType="map" resultType="map">
73   - select a.create_date, b.name, b.title, b.show_start, b.show_end, b.unit_type, b.content, a.sequence_id, a.status
  73 + select a.create_date, b.name, b.title, b.show_start, b.show_end, b.unit_type, b.content, a.sequence_id, a.status, c.type
74 74 from coupon_info a, coupon_template b, coupon_type c, hospital_coupon_template_group d
75 75 where a.user_id = #{userId} and a.create_hospital_id = #{hospitalId} and a.coupon_template_id = b.id and b.type_id=c.id and d.hospital_id = #{hospitalId}
76 76 order by c.type desc, b.coupon_order desc
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java View file @ 2be3303
... ... @@ -93,9 +93,9 @@
93 93  
94 94  
95 95 /** 使用优惠券 */
96   - if(StringUtils.isNotBlank(newbornVisit.getHemoglobinCoupon())) {
97   - couponService.use(autoMatchFacade.getHospitalId(userId), newbornVisit.getHemoglobinCoupon(), userId, newbornVisit.getId());
98   - newbornVisit.setHemoglobinCoupon(null); /** 去除掉优惠券信息 不保存到数据库 */
  96 + if(StringUtils.isNotBlank(newbornVisit.getCouponCode())) {
  97 + couponService.use(autoMatchFacade.getHospitalId(userId), newbornVisit.getCouponCode(), userId, newbornVisit.getId());
  98 + newbornVisit.setCouponCode(null); /** 去除掉优惠券信息 不保存到数据库 */
99 99 }
100 100  
101 101 newbornVisit.setOperationId(userId.toString());