diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index ac95a2f94..819465327 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -267,7 +267,6 @@ public class WxCouponController extends BaseController { @SystemControllerLog(description = "券投放-查询") public ResultData findById(@RequestParam Long id) { logger.debug("[" + getIpAddr() + "] WxCouponController::findById"); - ; return new ResultData(wxCouponService.getVoById(id)); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index de96f12b7..babcb345e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -138,6 +138,7 @@ public class WxCoupon extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="领取条件",name="condition") private String conditions; + @io.swagger.annotations.ApiModelProperty(value="最后一次审批操作类型,取值同EnumFlowKey",name="approvalType") private Integer approvalType; @io.swagger.annotations.ApiModelProperty(value="卡密是否支持(0:不支持,1支持)",name="passwordSupport") diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCarCmd.java b/mallinkService/src/main/java/com/iformall/enums/EnumCarCmd.java index 562b3772c..39e72840f 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumCarCmd.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCarCmd.java @@ -11,8 +11,11 @@ public enum EnumCarCmd { CAR_ETCP_CALLBACK_UNBIND(603, "ETCP车辆解绑通知"), CAR_ETCP_CALLBACK_PAY_MANUAL(604, "ETCP支付结果通知"), CAR_ETCP_CALLBACK_UNPAY(605, "ETCP停车费获取"), - CAR_TJD_CALLBACK_PARK_IN(610, "停简单入场通知"), - CAR_TJD_CALLBACK_PARK_OUT(611, "停简单出场通知"), + CAR_TJD_CALLBACK_REGISTER(610, "停简单注册车牌"), + CAR_TJD_CALLBACK_PARK_IN(611, "停简单进场通知"), + CAR_TJD_CALLBACK_PARK_OUT(612, "停简单离场通知"), + CAR_TJD_CALLBACK_PAID(613, "停简单支付通知"), + CAR_TJD_CALLBACK_REFUND(614, "停简单退款通知"), ; public static EnumCarCmd getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 42076ae92..9bb1c8860 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -14,7 +14,6 @@ import com.iformall.domain.vo.WxCouponCVo; import com.iformall.domain.vo.WxCouponStatisVo; import com.iformall.domain.vo.WxMerchantVo; import com.iformall.enums.*; -import com.iformall.exception.BizMessageException; import com.iformall.exception.MallinkException; import com.iformall.mapper.*; import com.iformall.service.*; diff --git a/mallinkService/src/main/java/com/iformall/utils/DateUtils.java b/mallinkService/src/main/java/com/iformall/utils/DateUtils.java index 114f02929..e3810038f 100755 --- a/mallinkService/src/main/java/com/iformall/utils/DateUtils.java +++ b/mallinkService/src/main/java/com/iformall/utils/DateUtils.java @@ -1099,8 +1099,6 @@ public class DateUtils { * @return <0:已过n天;=0:当天 ;>0 n天前 */ public static int birthdaysBetween(Date date) { - Date today = new Date() ; - date.setYear(today.getYear()); Calendar todayCal = Calendar.getInstance(); Calendar birthdayCal = Calendar.getInstance(); birthdayCal.setTime(date);