jiangjiazhi / regional-platform

Download as
Browse Code »

Commit a8e78e20b410e782b2b4e2dc58c797d5004f145c

Authored by jiangjiazhi
2 parents 4fccaa3706 a3e97fafcf
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 5 changed files

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java View file @ a8e78e2
... ... @@ -15,7 +15,7 @@
15 15  
16 16 void save(CouponInfo couponInfo);
17 17  
18   - List<Map<String,Object>> findTemp(String hospitalId);
  18 + List<Map<String,Object>> findTemp(Map<String, Object> map);
19 19  
20 20 String findTopName(String hospitalId);
21 21  
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java View file @ a8e78e2
... ... @@ -46,7 +46,15 @@
46 46  
47 47 @Override
48 48 public BaseObjectResponse create(String userId, String hospitalId, Integer createUserId) {
49   - List<Map<String,Object>> temps = couponMapper.findTemp(hospitalId);
  49 + Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)), Patients.class);
  50 + if(patients == null || patients.getType() == null) return RespBuilder.buildErro(ResponseCode.PATIENTS_NOT_FOUND);
  51 +
  52 + Map<String, Object> param = new HashMap<>();
  53 + param.put("hospitalId", hospitalId);
  54 + param.put("type", patients.getType());
  55 + List<Map<String,Object>> temps = couponMapper.findTemp(param);
  56 +
  57 + if(CollectionUtils.isEmpty(temps)) return RespBuilder.buildErro(ResponseCode.COUPON_TEMP_NOT_FOUND);
50 58 for (Map<String, Object> temp : temps) {
51 59 Object sendType = temp.get("send_type");
52 60 if(sendType != null) {/** 1=全部发放 2=按有效时间发放 */
platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml View file @ a8e78e2
... ... @@ -29,10 +29,10 @@
29 29 insert into coupon_info(id, <include refid="columnList" />) values(#{id},#{sequenceId},#{createDate},#{useDate},#{userId},#{createUserId},#{couponTemplateId},#{createHospitalId},#{usedHospitalId},#{status})
30 30 </insert>
31 31  
32   - <select id="findTemp" parameterType="string" resultType="map">
  32 + <select id="findTemp" parameterType="map" resultType="map">
33 33 select b.id, b.id as coupon_template_id, b.actual_start, b.actual_end, b.unit_type, c.send_type, c.type from
34 34 hospital_coupon_template_group a, coupon_template b, coupon_type c
35   - where a.hospital_id = #{hospitalId} and a.coupon_template_group_id = b.group_id and b.type_id = c.id
  35 + where a.hospital_id = #{hospitalId} and a.coupon_template_group_id = b.group_id and b.type_id = c.id and c.type=#{type}
36 36 order by b.coupon_order
37 37 </select>
38 38  
platform-common/src/main/java/com/lyms/platform/common/result/ResponseCode.java View file @ a8e78e2
... ... @@ -9,6 +9,10 @@
9 9 SUCCESS(0, "成功"),
10 10 ERROR(500, "系统错误，请联系管理员"),
11 11  
  12 + PATIENTS_NOT_FOUND(2001, "Patients未查询到或type为空"),
  13 +
  14 + COUPON_TEMP_NOT_FOUND(1006, "医院未绑定模板"),
  15 +
12 16 COUPON_NOT_FOUND(1001, "优惠券不存在"),
13 17 COUPON_NOT_UNIQUE(1002, "优惠券有多个"),
14 18 COUPON_TIME_OUT(1003, "优惠券已过期"),
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java View file @ a8e78e2
... ... @@ -32,7 +32,7 @@
32 32 * @param hospitalId
33 33 * @return
34 34 */
35   - @RequestMapping(method = RequestMethod.POST, value = "/")
  35 + @RequestMapping(method = RequestMethod.POST)
36 36 @ResponseBody
37 37 @TokenRequired
38 38 public BaseObjectResponse create(String userId, String hospitalId, HttpServletRequest request) {