update

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java

@@ -97,8 +97,6 @@ public class AdapayMemberAccountServiceImpl implements AdapayMemberAccountServic
         return adapayMemberAccountMapper.deleteAdapayMemberAccountByIds(ids);
     }
 
-
-
     @Override
     public AdapayMemberAccount selectByMerchantId(String merchantId) {
         if (StringUtils.isBlank(merchantId)) {

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java

@@ -132,7 +132,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
     private IPileBillingTemplateService pileBillingTemplateService;
 
     @Autowired
-    private IPileAuthCardService pileAuthCardService;
+    private PileAuthCardService pileAuthCardService;
 
     @Autowired
     private OrderMonitorDataService orderMonitorDataService;

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java

@@ -9,7 +9,7 @@ import com.jsowell.pile.domain.PileAuthCard;
 import com.jsowell.pile.dto.PileAuthCardDTO;
 import com.jsowell.pile.mapper.PileAuthCardMapper;
 import com.jsowell.pile.service.IMemberBasicInfoService;
-import com.jsowell.pile.service.IPileAuthCardService;
+import com.jsowell.pile.service.PileAuthCardService;
 import com.jsowell.pile.util.UserUtils;
 import com.jsowell.pile.vo.base.LoginUserDetailVO;
 import com.jsowell.pile.vo.base.MerchantInfoVO;
@@ -31,7 +31,7 @@ import java.util.stream.Collectors;
  * @date 2023-03-16
  */
 @Service
-public class PileAuthCardServiceImpl implements IPileAuthCardService {
+public class PileAuthCardServiceImpl implements PileAuthCardService {
     @Autowired
     private PileAuthCardMapper pileAuthCardMapper;
 
@@ -48,7 +48,6 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService {
     // public PileAuthCard selectPileAuthCardById(Long id) {
     //     return pileAuthCardMapper.selectPileAuthCardById(id);
     // }
-
     @Override
     public PileAuthCardVO getCardInfoById(Long id) {
         return pileAuthCardMapper.getCardInfoById(id);
@@ -56,6 +55,7 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService {
 
     /**
      * 查询充电站鉴权卡信息
+     *
      * @param pileAuthCard
      * @return
      */
@@ -112,7 +112,7 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService {
         String logicCard = dto.getLogicCard();
         // 根据卡号查询数据库
         PileAuthCard cardInfo = pileAuthCardMapper.selectSomeStatusCardInfo(null, logicCard);
-        if(cardInfo != null) {
+        if (cardInfo != null) {
             // 不为空说明此卡已存在
             throw new BusinessException(ReturnCodeEnum.CODE_AUTH_CARD_CODE_EXIST);
         }
@@ -136,10 +136,11 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService {
         PileAuthCard pileAuthCard = PileAuthCard.builder()
                 .logicCard(logicCard)
                 .memberId(memberId)
+                .merchantId(dto.getMerchantId())
                 .status(status)
                 .secretKey(secretKey)
                 .build();
-        return pileAuthCardMapper.insertPileAuthCard(pileAuthCard);
+        return pileAuthCardMapper.insertSelective(pileAuthCard);
     }
 
     /**
@@ -167,7 +168,7 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService {
                 .memberId(memberBasicInfo.getMemberId())
                 .status("1")
                 .build();
-        return pileAuthCardMapper.updatePileAuthCard(pileAuthCard);
+        return pileAuthCardMapper.updateByPrimaryKeySelective(pileAuthCard);
     }
 
     /**
@@ -204,6 +205,7 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService {
 
     /**
      * 根据逻辑卡号查询某状态的鉴权卡信息
+     *
      * @param status
      * @param logicCard
      * @return
@@ -215,6 +217,7 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService {
 
     /**
      * 通过逻辑卡号查询卡信息
+     *
      * @param logicCard
      * @return
      */
@@ -225,6 +228,7 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService {
 
     /**
      * 通过memberId查询鉴权卡列表 （小程序用）
+     *
      * @param memberId
      * @return
      */
@@ -239,6 +243,7 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService {
 
     /**
      * 用户绑定鉴权卡
+     *
      * @param dto
      */
     @Override
@@ -266,6 +271,7 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService {
 
     /**
      * 用户解绑鉴权卡
+     *
      * @param dto
      * @return
      */
@@ -287,4 +293,55 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService {
         pileAuthCard.setSecretKey(secretKey);
         return updatePileAuthCard(pileAuthCard);
     }
+
+    @Override
+    public int deleteByPrimaryKey(Integer id) {
+        return pileAuthCardMapper.deleteByPrimaryKey(id);
+    }
+
+    @Override
+    public int insert(PileAuthCard record) {
+        return pileAuthCardMapper.insert(record);
+    }
+
+    @Override
+    public int insertOrUpdate(PileAuthCard record) {
+        return pileAuthCardMapper.insertOrUpdate(record);
+    }
+
+    @Override
+    public int insertOrUpdateSelective(PileAuthCard record) {
+        return pileAuthCardMapper.insertOrUpdateSelective(record);
+    }
+
+    @Override
+    public int insertSelective(PileAuthCard record) {
+        return pileAuthCardMapper.insertSelective(record);
+    }
+
+    @Override
+    public PileAuthCard selectByPrimaryKey(Integer id) {
+        return pileAuthCardMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(PileAuthCard record) {
+        return pileAuthCardMapper.updateByPrimaryKeySelective(record);
+    }
+
+    @Override
+    public int updateByPrimaryKey(PileAuthCard record) {
+        return pileAuthCardMapper.updateByPrimaryKey(record);
+    }
+
+    @Override
+    public int updateBatch(List<PileAuthCard> list) {
+        return pileAuthCardMapper.updateBatch(list);
+    }
+
+    @Override
+    public int batchInsert(List<PileAuthCard> list) {
+        return pileAuthCardMapper.batchInsert(list);
+    }
 }
+