核销时间

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/coupon/CouponController.java

@@ -3,15 +3,12 @@ package com.gic.haoban.manage.web.controller.coupon;
 import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
-import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.commons.webapi.reponse.RestResponse;
-import com.gic.haoban.manage.web.controller.order.GicOrderController;
 import com.gic.haoban.manage.web.vo.coupon.CoupCardClerkLogCountVO;
 import com.gic.haoban.manage.web.vo.coupon.CoupCardClerkLogVO;
 import com.gic.haoban.manage.web.vo.coupon.CoupCardVO;
-import com.gic.haoban.manage.web.vo.order.OrderListVO;
 import com.gic.marketing.api.dto.CoupCardDTO;
 import com.gic.marketing.api.dto.card.CoupCardClerkLogDTO;
 import com.gic.marketing.api.out.service.CouponHBOuterService;
@@ -119,7 +116,7 @@ public class CouponController {
             coupCardVO.setPhoneNum(coupCardDTO.getPhoneNum());
             coupCardVO.setCardNum(coupCardDTO.getCardNum());
         }
-        coupCardVO.setWriteOffTime(result.getCreateTime());
+        coupCardVO.setUseTime(result.getCreateTime());
         return coupCardVO;
     }
 

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/scan/ScanController.java

 package com.gic.haoban.manage.web.controller.scan;
 
-import cn.hutool.db.Entity;
 import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.business.order.dto.ordermanage.OrderDetailDTO;
@@ -122,7 +121,7 @@ public class ScanController {
                 cardVO.setStoreName(clerkDTO.getStoreName());
                 cardVO.setClerkName(clerkDTO.getClerkName());
             }
-            cardVO.setWriteOffTime(coupCardDTO.getUseTime());
+            cardVO.setUseTime(coupCardDTO.getUseTime());
             scanDetailVO.setCardVO(cardVO);
         }
         return RestResponse.successResult(scanDetailVO);

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/coupon/CoupCardVO.java

@@ -74,7 +74,7 @@ public class CoupCardVO implements Serializable {
     /**
      * 核销时间
      */
-    private Date writeOffTime;
+    private Date useTime;
 
     public String getCardLogId() {
         return cardLogId;
@@ -188,11 +188,11 @@ public class CoupCardVO implements Serializable {
         this.clerkName = clerkName;
     }
 
-    public Date getWriteOffTime() {
-        return writeOffTime;
+    public Date getUseTime() {
+        return useTime;
     }
 
-    public void setWriteOffTime(Date writeOffTime) {
-        this.writeOffTime = writeOffTime;
+    public void setUseTime(Date useTime) {
+        this.useTime = useTime;
     }
 }