核销返回

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

@@ -44,18 +44,19 @@ public class CouponController {
      * @return
      */
     @RequestMapping("/clerk-write-off")
-    public RestResponse<Void> writeOff(String cardLogId,
+    public RestResponse<CoupCardVO> writeOff(String cardLogId,
                                        String enterpriseId,String clerkId) {
         HaobanWriteOffCardQDTO writeOffCardQDTO = new HaobanWriteOffCardQDTO();
         writeOffCardQDTO.setEnterpriseId(enterpriseId);
         writeOffCardQDTO.setCardLogId(cardLogId);
         writeOffCardQDTO.setClerkId(clerkId);
         writeOffCardQDTO.setCardType(2);
-        ServiceResponse<Void> response = couponHBOuterService.scanWriteOff(writeOffCardQDTO);
+        ServiceResponse<CoupCardClerkLogDTO> response = couponHBOuterService.scanWriteOff(writeOffCardQDTO);
         if (!response.isSuccess()) {
             return RestResponse.failure(response.getCode(), response.getMessage());
         }
-        return RestResponse.successResult();
+        CoupCardVO cardVO = getCardVO(response.getResult());
+        return RestResponse.successResult(cardVO);
     }
 
     /**
@@ -98,7 +99,14 @@ public class CouponController {
         if (response.getResult() == null) {
             return RestResponse.successResult();
         }
-        CoupCardClerkLogDTO result = response.getResult();
+        CoupCardVO coupCardVO = getCardVO(response.getResult());
+        return RestResponse.successResult(coupCardVO);
+    }
+
+    private static CoupCardVO getCardVO(CoupCardClerkLogDTO result) {
+        if (result == null) {
+            return null;
+        }
         CoupCardVO coupCardVO = EntityUtil.changeEntityNew(CoupCardVO.class, result);
         CoupCardDTO coupCardDTO = result.getCoupCardDTO();
         if (coupCardDTO != null) {
@@ -112,7 +120,7 @@ public class CouponController {
             coupCardVO.setCardNum(coupCardDTO.getCardNum());
         }
         coupCardVO.setWriteOffTime(result.getCreateTime());
-        return RestResponse.successResult(coupCardVO);
+        return coupCardVO;
     }
 
     /**