diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponPrintController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponPrintController.java index cf474d1..fafdc57 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponPrintController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponPrintController.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.controller; +import java.text.SimpleDateFormat; import java.util.Date; import javax.servlet.http.HttpServletRequest; @@ -15,7 +16,6 @@ import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.RespBuilder; import com.lyms.platform.common.result.ResponseCode; -import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.PropertiesUtils; import com.lyms.platform.operate.web.utils.HospitalCouponPrintUtils; import com.lyms.platform.pojo.Patients; @@ -58,8 +58,8 @@ public class CouponPrintController { Integer XSJE =0;// 销售金额 Integer CZZKL =100;//充值折扣率 Integer YE = KMJE;//余额 - String result = HospitalCouponPrintUtils.getDZdjq(cardType, cardNum, sendReason, sendPersonName, patientUserName, DateUtil.getyyyy_MM_dd(new Date()),remark, JSFS, KMJE, XSJE, CZZKL, YE); - System.out.println("result="+result); + SimpleDateFormat nowFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String result = HospitalCouponPrintUtils.getDZdjq(cardType, cardNum, sendReason, sendPersonName, patientUserName, nowFormat.format(new Date()),remark, JSFS, KMJE, XSJE, CZZKL, YE); if("0".equals(result)){ return RespBuilder.buildErro(ResponseCode.SUCCESS); }else{