diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java index 7206703..f694838 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java @@ -16,7 +16,7 @@ public interface CouponService{ BaseObjectResponse validate(String code, Integer type, String hospitalId); - BaseObjectResponse findList(String userId, String hospitalId, String url); + BaseObjectResponse findList(String userId, String hospitalId, String url,Integer type); BaseObjectResponse use(String hospitalId, String code, Integer userId, String usedId); @@ -32,7 +32,7 @@ public interface CouponService{ BaseObjectResponse areas(String hospitalId); - String findUrl(String code); + String findUrl(String code,Integer type); List> queryCouponItemsByType(Map params); diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java index 4149026..68f5fea 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java @@ -10,8 +10,11 @@ import com.lyms.platform.common.utils.PropertiesUtil; import com.lyms.platform.permission.dao.master.CouponMapper; import com.lyms.platform.permission.model.CouponInfo; import com.lyms.platform.permission.model.Organization; +import com.lyms.platform.permission.model.WeixinQrcodeConfig; +import com.lyms.platform.permission.model.WeixinQrcodeConfigQuery; import com.lyms.platform.permission.service.CouponService; import com.lyms.platform.permission.service.OrganizationService; +import com.lyms.platform.permission.service.WeixinQrcodeConfigService; import com.lyms.platform.pojo.*; import net.sf.json.JSONObject; import org.apache.commons.collections.CollectionUtils; @@ -57,8 +60,8 @@ public class CouponServiceImpl implements CouponService { /** 建档 */ private static final String PUT_ON_RECORD = "4"; - - +@Autowired + private WeixinQrcodeConfigService weixinQrcodeConfigService; @Autowired private CouponMapper couponMapper; @@ -395,26 +398,40 @@ public class CouponServiceImpl implements CouponService { } @Override - public String findUrl(String code) { - try { - Map map = couponMapper.findUrl(code); - String hId = map.get("create_hospital_id").toString(); - String userId = map.get("user_id").toString(); - - PersonModel person = mongoTemplate.findById(userId, PersonModel.class); - - Map params = new HashMap<>(); - params.put("hId", hId); -// params.put("dpId", person.getType() == 2 ? "1" : "2"); - params.put("dpId", person.getType() == 2 ? "2" : "1"); - String s = HttpClientUtil.doGet(PropertiesUtil.getInstance().getDefault("or.code.create.url"), params, "utf-8", null); + public String findUrl(String code, Integer type) { + + Map map = couponMapper.findUrl(code); + String hId = map.get("create_hospital_id").toString(); + String userId = map.get("user_id").toString(); + + PersonModel person = mongoTemplate.findById(userId, PersonModel.class); + + if (person == null) + return "http://weixin.qq.com/r/Fi9bQyLEgH--rWYg93oE"; + + Map params = new HashMap<>(); + params.put("hId", hId); + params.put("dpId", person.getType() == 2 ? "2" : "1"); + + if(type == 1) { + WeixinQrcodeConfigQuery query = new WeixinQrcodeConfigQuery(); + query.setDpId(person.getType() == 2 ? 2 : 1); + query.setHospitalId(hId); + + + List weixinQrcodeConfigs = weixinQrcodeConfigService.queryWeixinShowqrcodeConfig(query); + if(CollectionUtils.isNotEmpty(weixinQrcodeConfigs)) { + String url = weixinQrcodeConfigs.get(0).getWxUrl(); + return url; + } + } + try {String s = HttpClientUtil.doGet(PropertiesUtil.getInstance().getDefault("or.code.create.url"), params, "utf-8", null); JSONObject jsonObject = JSONObject.fromObject(s); return jsonObject.get("url").toString(); } catch (Exception e) { e.printStackTrace(); return "http://weixin.qq.com/r/Fi9bQyLEgH--rWYg93oE"; } - } @Override @@ -516,7 +533,7 @@ public class CouponServiceImpl implements CouponService { } @Override - public BaseObjectResponse findList(String userId, String hospitalId, String url) { + public BaseObjectResponse findList(String userId, String hospitalId, String url,Integer type) { Map param = new HashMap<>(); param.put("userId", userId); param.put("hospitalId", hospitalId); @@ -526,7 +543,7 @@ public class CouponServiceImpl implements CouponService { List> couponInfos = couponMapper.findInfo(param); for (Map map : couponInfos) { // map.put("url", PropertiesUtil.getInstance().getDefault("or.code.url", map.get("sequence_id").toString())); - map.put("url", findUrl(map.get("sequence_id").toString())); + map.put("url", findUrl(map.get("sequence_id").toString(),type)); } restMap.put("couponInfos", couponInfos); return RespBuilder.buildSuccess(restMap); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java index 0d745cf..a1041f8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java @@ -6,6 +6,7 @@ import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.RespBuilder; +import com.lyms.platform.common.utils.PropertiesUtil; import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.permission.service.CouponService; import org.slf4j.Logger; @@ -36,8 +37,6 @@ public class CouponController extends BaseController { @Autowired AutoMatchFacade autoMatchFacade; - @Value("${or.code.url}") - private String url; @Autowired private MongoTemplate mongoTemplate; @@ -47,6 +46,13 @@ public class CouponController extends BaseController { private static final Logger LOG = LoggerFactory.getLogger(CouponController.class); + private static String url; + private static String type; + + static { + type = PropertiesUtil.getInstance().getDefault("or.code.create.type"); + url = PropertiesUtil.getInstance().getDefault("or.code.url"); + } /** * 创建用户产检券 @@ -71,7 +77,7 @@ public class CouponController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/{userId}/{hospitalId}") @ResponseBody public BaseObjectResponse list(@PathVariable String userId, @PathVariable String hospitalId) { - return couponService.findList(userId, hospitalId, url); + return couponService.findList(userId, hospitalId, url, Integer.parseInt(type)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ScanController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ScanController.java index 4ab8fc5..b1de306 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ScanController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ScanController.java @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.common.utils.PropertiesUtil; import com.lyms.platform.permission.service.CouponService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -18,7 +19,13 @@ public class ScanController extends BaseController { @Autowired private CouponService couponService; + private static String url; + private static String type; + static { + type = PropertiesUtil.getInstance().getDefault("or.code.create.type"); + url = PropertiesUtil.getInstance().getDefault("or.code.url"); + } /** * @auther HuJiaqi * @createTime 2017年01月10日 16时23分 @@ -27,7 +34,7 @@ public class ScanController extends BaseController { @RequestMapping("/scan") public void scan(HttpServletResponse httpServletResponse, String code) throws Exception { // httpServletResponse.sendRedirect("http://m.healthbaby.com.cn/download/download.html"); - httpServletResponse.sendRedirect(couponService.findUrl(code)); + httpServletResponse.sendRedirect(couponService.findUrl(code,Integer.valueOf(type))); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java index 54ad190..2a764dd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java @@ -1,7 +1,6 @@ package com.lyms.platform.operate.web.utils; import org.apache.commons.lang3.StringUtils; -import org.eclipse.jetty.util.StringUtil; import org.springframework.util.Assert; import java.util.*; @@ -22,7 +21,7 @@ public class CollectionUtils extends org.apache.commons.collections.CollectionUt for (int i = 0; i < args.length; i++) { String key = args[i++].toString(); Object value = args[i]; - if(value != null && StringUtil.isNotBlank(value.toString())) { + if(value != null && StringUtils.isNotBlank(value.toString())) { map.put(key, value); } }