Merge branch 'medicare' of liubing/wlyy2.0 into medicare

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineOrderService.java

@@ -2200,7 +2200,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        }
        orders = orders.stream().distinct().collect(Collectors.toList());
        if (orders == null || orders.size() == 0) {
            result.put("msg", "无相关订单信息，请重新确认信息！");
            result.put("msg", "未查询到待取药订单，请前往窗口处理！");
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
@@ -2217,7 +2217,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
            Map<String, Object> map = new HashMap<>();
            DmHospitalDO dmHospitalDO = hospitalDao.findByCode(order.getBelongCommunity());
            if (!mediicinedevice.getBelongCommunity().equals(order.getBelongCommunity())) {
                result.put("msg", "无相关订单信息，请重新确认信息！");
                result.put("msg", "该订单不属于本社区，请联系管理员！");
                result.put("response", ConstantUtils.FAIL);
                return result;
            }

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/service/channel/MedicineService.java

@@ -389,24 +389,28 @@ public class MedicineService {
        jdbcTemplate.execute(sql);
        List<YlzMedicalRecharge> chargeList = ylzMedicalRechargeDao.findByChargeResult("ing");
        for (YlzMedicalRecharge tmp : chargeList) {
            Map<String, String> param = new HashMap<>();
            param.put("orgCode", tmp.getOrgCode());
            param.put("equ_num", tmp.getEquNum());
            param.put("tradeType", "hop.trade.recharge");
            param.put("outTradeNo", tmp.getOutChargeNo());
            JSONObject res = wlyyHttpService.sendWlyyMes("hlwyyQueryDetail_OUT", null, param);
            if (res.getString("status").equalsIgnoreCase("200")) {//i健康返回值
                JSONObject responseData = res.getJSONObject("data");
                JSONObject queryDetailParam = responseData.getJSONObject("param");
                String result = queryDetailParam.getString("result");
                String resultName = queryDetailParam.getString("resultDesc");
                if ("exp".equals(result)) {
                } else {
                    if ("succ".equals(result)) {//交易成功 (微信/支付宝成功,HIS成功)
                        hlwyyRechargeNotify(tmp.getOutChargeNo());
            try {
                Map<String, String> param = new HashMap<>();
                param.put("orgCode", tmp.getOrgCode());
                param.put("equ_num", tmp.getEquNum());
                param.put("tradeType", "hop.trade.recharge");
                param.put("outTradeNo", tmp.getOutChargeNo());
                JSONObject res = wlyyHttpService.sendWlyyMes("hlwyyQueryDetail_OUT", null, param);
                if (res.getString("status").equalsIgnoreCase("200")) {//i健康返回值
                    JSONObject responseData = res.getJSONObject("data");
                    JSONObject queryDetailParam = responseData.getJSONObject("param");
                    String result = queryDetailParam.getString("result");
                    String resultName = queryDetailParam.getString("resultDesc");
                    if ("exp".equals(result)) {
                    } else {
                        if ("succ".equals(result)) {//交易成功 (微信/支付宝成功,HIS成功)
                            hlwyyRechargeNotify(tmp.getOutChargeNo());
                        }
                    }
                }
            }catch (Exception e){
                e.printStackTrace();
            }
        }
    }