diff --git a/src/main/java/com/supwisdom/dlpay/restaurant/service/impl/CheckTransdtlServiceImpl.java b/src/main/java/com/supwisdom/dlpay/restaurant/service/impl/CheckTransdtlServiceImpl.java
index 32258a5..1ae54cb 100644
--- a/src/main/java/com/supwisdom/dlpay/restaurant/service/impl/CheckTransdtlServiceImpl.java
+++ b/src/main/java/com/supwisdom/dlpay/restaurant/service/impl/CheckTransdtlServiceImpl.java
@@ -241,7 +241,7 @@
       return checkDetailDao.save(detail);
     }
 
-    if (!detail.getAccdate().equals(transDtl.getAccdate()) || !detail.getShopaccno().equals(transDtl.getShopid())) {
+    if (!detail.getAccdate().equals(transDtl.getTransdate()) || !detail.getShopaccno().equals(transDtl.getShopid())) {
       detail.setChkresult(RestaurantConstant.CHKDTL_CHKRESULT_ERROR);
       detail.setResolved(RestaurantConstant.CHKDTL_RESOLVED_HANGUP);
       detail.setRemark("记账日期或结算商户错误");
diff --git a/src/main/java/com/supwisdom/dlpay/restaurant/task/RestaurantTask.java b/src/main/java/com/supwisdom/dlpay/restaurant/task/RestaurantTask.java
index ae8cb33..1763742 100644
--- a/src/main/java/com/supwisdom/dlpay/restaurant/task/RestaurantTask.java
+++ b/src/main/java/com/supwisdom/dlpay/restaurant/task/RestaurantTask.java
@@ -6,6 +6,7 @@
 import com.supwisdom.dlpay.paysdk.proxy.UserProxy;
 import com.supwisdom.dlpay.restaurant.bean.CustomerSearchBean;
 import com.supwisdom.dlpay.restaurant.bean.CustomerShowBean;
+import com.supwisdom.dlpay.restaurant.dao.CardDao;
 import com.supwisdom.dlpay.restaurant.dao.CustomerDao;
 import com.supwisdom.dlpay.restaurant.domain.TCard;
 import com.supwisdom.dlpay.restaurant.domain.TCustomer;
@@ -40,6 +41,8 @@
   @Autowired
   private CardService cardService;
   @Autowired
+  private CardDao cardDao;
+  @Autowired
   private CustomerService customerService;
   @Autowired
   private CustomerDao customerDao;
@@ -85,7 +88,7 @@
               card.setBankcardno(resp.getBankcardno());
               card.setStatus(resp.getCardstatus());
               card.setTransstatus(resp.getTransstatus());
-              cardService.saveCard(card);
+              cardDao.save(card);
             }
             customer.setPhone(resp.getPhone());
             customer.setCheckstatus(RestaurantConstant.STATUS_CHECKSTATUS_NORMAL);
