Merge branch 'dev' of huangzhanpeng/wlyy_management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/BookingController.java

@@ -7,6 +7,7 @@ import com.yihu.wlyy.logs.BusinessLogs;
import com.yihu.wlyy.repository.message.SMSDao;
import com.yihu.wlyy.service.app.consult.ConsultService;
import com.yihu.wlyy.service.app.reservation.PatientReservationService;
import com.yihu.wlyy.service.common.SMSService;
import com.yihu.wlyy.service.common.account.DoctorService;
import com.yihu.wlyy.service.common.account.PatientService;
import com.yihu.wlyy.service.third.guahao.GuahaoXMService;
@@ -494,6 +495,31 @@ public class BookingController extends WeixinBaseController {
        }
    }*/
    @Autowired
    SMSService smsService;
    @RequestMapping(value = "testSMS", method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation("测试短信")
    public String testSMS(@ApiParam(name = "msg") @RequestParam(value = "msg", required = true) String msg)
    {
        String re = "";
        try {
            //发送短信消息，调用总部发送信息的接口
            JSONObject resultJson = smsService.sendMsg("13559207522", msg);
            if (resultJson != null && resultJson.getInt("result") != 0) {
                re = "短信提醒失败！（原因：" + resultJson.getString("description") + "）";
            }
            re = "短信发送成功！";
        }
        catch (Exception ex)
        {
            ex.printStackTrace();
            re = ex.getMessage();
        }
        return re;
    }
    @RequestMapping(value = "CreateOrderByDoctor", method = RequestMethod.POST)
    @ResponseBody
@@ -537,9 +563,7 @@ public class BookingController extends WeixinBaseController {
                            obj.getDeptName() + obj.getDoctorName() + "医生的号源。您可直接前往医院就诊。";
                    //发送短信消息，调用总部发送信息的接口
                    String result = HttpClientUtil.post(SystemConf.getInstance().getSmsUrl(), buildSmsParams(msg, patientPhone), "GBK");
                    System.out.print(result);
                    JSONObject resultJson = toJson(result);
                    JSONObject resultJson = smsService.sendMsg(patientPhone,msg);
                    if (resultJson != null && resultJson.getInt("result") != 0) {
                        des = "短信提醒失败！（原因："+resultJson.getString("description")+"）";
                    }