trick9191 7 lat temu
rodzic
commit
91e9c39059

+ 3 - 5
patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/common/account/BookingController.java

@ -411,15 +411,13 @@ public class BookingController extends WeixinBaseController {
    @RequestMapping(value = "CancelOrder", method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation("取消挂号单")
    public String CancelOrder(@ApiParam(name = "orderId", value = "订单id")
                              @RequestParam(value = "orderId", required = true) Long orderId,
                              @ApiParam(name = "code", value = "订单code")
    public String CancelOrder(@ApiParam(name = "code", value = "订单code")
                              @RequestParam(value = "code", required = false) String code,
                              @ApiParam(name = "ssc", value = "社保卡号")
                              @RequestParam(value = "ssc", required = false) String ssc) {
        try {
            //获取订单信息
            PatientReservation obj = patientReservationService.findById(orderId);
            PatientReservation obj = patientReservationService.findByCode(code);
            boolean re = false;
            if(obj==null){
                re = jwSmjkService.CancelOrder(code,ssc);
@ -431,7 +429,7 @@ public class BookingController extends WeixinBaseController {
            if (re) {
                //更新状态
                if(obj!=null){
                    patientReservationService.userCancelOrder(orderId,getUID());//"6c0cfe5065e011e69f7c005056850d66"
                    patientReservationService.userCancelOrder(code,getUID());//"6c0cfe5065e011e69f7c005056850d66"
                }
                return write(200, "取消挂号单成功!");

+ 2 - 2
patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/reservation/PatientReservationService.java

@ -114,8 +114,8 @@ public class PatientReservationService extends BaseService {
     * 客服取消预约
     */
    @Transactional
    public void userCancelOrder(Long id,String user) {
        PatientReservation obj = patientReservationDao.findOne(id);
    public void userCancelOrder(String code,String user) {
        PatientReservation obj = patientReservationDao.findByCode(code);
        if (obj.getStatus()!=0) {
            obj.setStatus(0);
            User u =userDao.findByCode(user);