update 鉴权卡启动充电

jsowell-admin/src/main/java/com/jsowell/service/MemberService.java

@@ -278,10 +278,7 @@ public class MemberService {
 				.build();
 		checkVerificationCode(registerAndLoginDTO);
 		// 判断当前鉴权卡是否被绑定过
-		PileAuthCard authCard = PileAuthCard.builder()
+		PileAuthCard pileAuthCardInfo = pileAuthCardService.selectCardInfoByLogicCard(dto.getLogicCard());
-				.logicCard(dto.getLogicCard())
-				.build();
-		PileAuthCard pileAuthCardInfo = pileAuthCardService.selectPileAuthCardInfo(authCard);
 		if (pileAuthCardInfo == null){
 			// 为空说明没查到此卡信息
 			throw new BusinessException(ReturnCodeEnum.CODE_THIS_CARD_HAS_NO_INFO);
@@ -294,10 +291,12 @@ public class MemberService {
 			// 密钥不一致，不能绑定
 			throw new BusinessException(ReturnCodeEnum.CODE_SECRET_KEY_NOT_SAME);
 		}
-		authCard.setMemberId(dto.getMemberId());
+		PileAuthCard authCard = PileAuthCard.builder()
-		authCard.setStatus("1"); // 1-正常使用
+				.memberId(dto.getMemberId())
-		authCard.setCreateBy(dto.getMemberId());
+				.status("1") // 1-正常使用
-		authCard.setId(pileAuthCardInfo.getId());
+				.createBy(dto.getMemberId())
+				.id(pileAuthCardInfo.getId())
+				.build();
 		return pileAuthCardService.updatePileAuthCard(authCard);
 	}
 

jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java

@@ -128,10 +128,7 @@ public class ConfirmStartChargingRequestHandler extends AbstractHandler{
             if (StringUtils.equals("01", startMode)) {
                 // 刷卡启动充电
                 // 根据传过来的物理卡号查询数据库中此卡信息
-                PileAuthCard pileAuthCard = PileAuthCard.builder()
+                PileAuthCard pileAuthCardInfo = pileAuthCardService.selectCardInfoByLogicCard(physicsCard);
-                        .logicCard(physicsCard)
-                        .build();
-                PileAuthCard pileAuthCardInfo = pileAuthCardService.selectPileAuthCardInfo(pileAuthCard);
                 if (pileAuthCardInfo == null) {
                     // 未查到此卡信息
                     throw new BusinessException(ReturnCodeEnum.CODE_THIS_CARD_HAS_NO_INFO);
@@ -202,8 +199,11 @@ public class ConfirmStartChargingRequestHandler extends AbstractHandler{
                 pileTransactionService.doCreateOrder(createOrderTransactionDTO);
 
                 // 将卡状态改为启动锁定
-                pileAuthCard.setId(pileAuthCardInfo.getId());
+                PileAuthCard pileAuthCard = PileAuthCard.builder()
-                pileAuthCard.setStatus("2");
+                        .id(pileAuthCardInfo.getId())
+                        .logicCard(physicsCard)
+                        .status("2")
+                        .build();
                 pileAuthCardService.updatePileAuthCard(pileAuthCard);
             }
         } catch (BusinessException e){

jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java

@@ -546,15 +546,15 @@ public class TransactionRecordsRequestHandler extends AbstractHandler {
 			}
 			if (!StringUtils.equals("0000000000000000", data.getLogicCard())) {
 				// 根据物理卡号查出所属用户
-				PileAuthCard pileAuthCard = PileAuthCard.builder()
+				PileAuthCard cardInfo = pileAuthCardService.selectCardInfoByLogicCard(data.getLogicCard());
-						.logicCard(data.getLogicCard())
-						.build();
-				PileAuthCard cardInfo = pileAuthCardService.selectPileAuthCardInfo(pileAuthCard);
 				if (cardInfo != null) {
 					orderBasicInfo.setMemberId(cardInfo.getMemberId());
 					// 将此卡状态改为正常
-					pileAuthCard.setId(cardInfo.getId());
+					PileAuthCard pileAuthCard = PileAuthCard.builder()
-					pileAuthCard.setStatus("1");
+							.logicCard(data.getLogicCard())
+							.id(cardInfo.getId())
+							.status("1")
+							.build();
 					pileAuthCardService.updatePileAuthCard(pileAuthCard);
 				}
 

jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileAuthCardMapper.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.jsowell.pile.domain.PileAuthCard;
 import com.jsowell.pile.dto.PileAuthCardDTO;
 import com.jsowell.pile.vo.web.PileAuthCardVO;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -87,4 +88,12 @@ public interface PileAuthCardMapper {
     public int deletePileAuthCardByIds(Long[] ids);
 
     int unBindingCard(PileAuthCard pileAuthCard);
+
+    /**
+     * 根据逻辑卡号查询某状态的鉴权卡信息
+     * @param status
+     * @param logicCard
+     * @return
+     */
+    PileAuthCard selectSomeStatusCardInfo(@Param("status") String status, @Param("logicCard") String logicCard);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/IPileAuthCardService.java

@@ -96,4 +96,19 @@ public interface IPileAuthCardService {
     int deactivateCard(Long id);
 
     int unBindingCard(PileAuthCard pileAuthCard);
+
+    /**
+     * 根据逻辑卡号查询某状态的鉴权卡信息
+     * @param status
+     * @param logicCard
+     * @return
+     */
+    PileAuthCard selectSomeStatusCardInfo(String status, String logicCard);
+
+    /**
+     * 通过逻辑卡号查询卡信息
+     * @param logicCard
+     * @return
+     */
+    PileAuthCard selectCardInfoByLogicCard(String logicCard);
 }

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

@@ -180,4 +180,25 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService {
     public int unBindingCard(PileAuthCard pileAuthCard) {
         return pileAuthCardMapper.unBindingCard(pileAuthCard);
     }
+
+    /**
+     * 根据逻辑卡号查询某状态的鉴权卡信息
+     * @param status
+     * @param logicCard
+     * @return
+     */
+    @Override
+    public PileAuthCard selectSomeStatusCardInfo(String status, String logicCard) {
+        return pileAuthCardMapper.selectSomeStatusCardInfo(status, logicCard);
+    }
+
+    /**
+     * 通过逻辑卡号查询卡信息
+     * @param logicCard
+     * @return
+     */
+    @Override
+    public PileAuthCard selectCardInfoByLogicCard(String logicCard) {
+        return selectSomeStatusCardInfo(null, logicCard);
+    }
 }

jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml

@@ -144,6 +144,21 @@
          and logic_card = #{logicCard,jdbcType=VARCHAR}
     </update>
 
+    <select id="selectSomeStatusCardInfo" resultType="com.jsowell.pile.domain.PileAuthCard">
+        select
+        <include refid="Base_Column_List"/>
+        from
+            pile_auth_card
+        where 1 = 1
+        <if test="status != null and status != ''">
+            and status = #{status,jdbcType=VARCHAR}
+        </if>
+        <if test="logicCard != null and logicCard != ''">
+            and logic_card = #{logicCard,jdbcType=VARCHAR}
+        </if>
+            limit 1
+    </select>
+
     <select id="getPileAuthCardInfoList" resultType="com.jsowell.pile.vo.web.PileAuthCardVO">
         select
             t1.id,