liquanyu / regional-platform

Download as
Browse Code »

Commit b0e639822773e58dafa3ef02df46f206f42fb4f3

Authored by litao
1 parent 89a1eebd18
Exists in master and in 1 other branch dev

bug修复

Showing 5 changed files with 29 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ b0e6398
... ... @@ -27,7 +27,6 @@
27 27 import com.lyms.platform.pojo.*;
28 28 import com.lyms.platform.query.*;
29 29 import org.apache.commons.collections.CollectionUtils;
30   -import org.omg.CosNaming.NameHelper;
31 30 import org.springframework.beans.factory.annotation.Autowired;
32 31 import org.springframework.beans.factory.annotation.Qualifier;
33 32 import org.springframework.data.domain.Sort;
... ... @@ -1027,6 +1026,8 @@
1027 1026  
1028 1027 }
1029 1028  
  1029 + /** 优惠券编号 */
  1030 + result.setCouponCode(couponService.findByUsedId(id));
1030 1031  
1031 1032 BaseObjectResponse objectResponse = new BaseObjectResponse();
1032 1033 objectResponse.setData(result);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ b0e6398
... ... @@ -843,10 +843,12 @@
843 843 if (checkModels != null && checkModels.size() > 0) {
844 844 BabyCheckModel checkModel = checkModels.get(0);
845 845 result = getBabyCheckResult(checkModel);
846   -
  846 + result.setCouponCode(couponService.findByUsedId(id));
847 847 }
848 848  
849 849 }
  850 +
  851 +
850 852  
851 853 br.setData(result);
852 854 br.setErrorcode(ErrorCodeConstants.SUCCESS);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ b0e6398
... ... @@ -1324,6 +1324,9 @@
1324 1324 map.put("treatOpinion",data.getTreatOpinion());
1325 1325 map.put("dirOpinion",data.getDirOpinion());
1326 1326  
  1327 + /** 优惠券编号 */
  1328 + map.put("couponCode", couponService.findByUsedId(id));
  1329 +
1327 1330 br.setErrorcode(ErrorCodeConstants.SUCCESS);
1328 1331 br.setErrormsg("成功");
1329 1332 br.setData(map);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java View file @ b0e6398
... ... @@ -151,6 +151,16 @@
151 151  
152 152 //病历号(住院号)
153 153 private String blNo;
  154 +
  155 + private String couponCode;
  156 +
  157 + public String getCouponCode() {
  158 + return couponCode;
  159 + }
  160 +
  161 + public void setCouponCode(String couponCode) {
  162 + this.couponCode = couponCode;
  163 + }
154 164  
155 165 public String getBlNo() {
156 166 return blNo;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java View file @ b0e6398
... ... @@ -48,6 +48,17 @@
48 48 private Map drugGllergic;
49 49 private String ylSelect;
50 50  
  51 + private String couponCode;
  52 +
  53 + public String getCouponCode() {
  54 + return couponCode;
  55 + }
  56 +
  57 + public void setCouponCode(String couponCode) {
  58 + this.couponCode = couponCode;
  59 + }
  60 +
  61 +
51 62 public String getYlSelect() {
52 63 return ylSelect;
53 64 }