解绑鉴权卡

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

@@ -3159,7 +3159,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
      * 去除赠送金额相关的代码
      * @param dto
      */
-    /*private void balancePayOrder(PayOrderDTO dto) {
+    private void balancePayOrder(PayOrderDTO dto) {
         // 记录支付流水
         List<OrderPayRecord> payRecordList = Lists.newArrayList();
         String orderCode = dto.getOrderCode();
@@ -3249,7 +3249,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
         if (CollectionUtils.isNotEmpty(payRecordList)) {
             orderPayRecordService.batchInsert(payRecordList);
         }
-    }*/
+    }
 
     @Transactional(rollbackFor = Exception.class)
     public void balancePayOrderV2(PayOrderDTO dto) {

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

@@ -268,7 +268,10 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService {
         if (!StringUtils.equals(pileAuthCard.getMemberId(), dto.getMemberId())) {
             throw new BusinessException(ReturnCodeEnum.CODE_THIS_CARD_BIND_INFO_ERROR);
         }
-        pileAuthCard.setDelFlag("1");
+        // pileAuthCard.setDelFlag("1");
+        pileAuthCard.setMemberId("");
+        String secretKey = RandomStringUtils.randomAlphanumeric(8).toUpperCase(Locale.ROOT); // 生成8位数的字母 + 数字随机数
+        pileAuthCard.setSecretKey(secretKey);
         return updatePileAuthCard(pileAuthCard);
     }
 }

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

@@ -155,7 +155,7 @@
         FROM
             order_invoice_record t1
                 LEFT JOIN pile_merchant_info t2 ON t1.merchant_id = t2.id  and t1.del_flag = '0'
-        where 1 = 1
+        where t1.del_flag = '0'
         <if test="dto.merchantDeptIds != null and dto.merchantDeptIds.size() != 0">
             and t2.dept_id in
         <foreach collection="dto.merchantDeptIds" item="deptId" open="(" separator="," close=")">

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

@@ -149,7 +149,7 @@
         <include refid="Base_Column_List"/>
         from
             pile_auth_card
-        where 1 = 1
+        where del_flag = '0'
         <if test="status != null and status != ''">
             and status = #{status,jdbcType=VARCHAR}
         </if>

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

@@ -73,7 +73,7 @@
         select
         <include refid="Base_Column_List"/>
         from pile_member_relation
-        where 1 = 1
+        <where>
             <if test="pileSn != null and pileSn != ''">
                 and pile_sn = #{pileSn,jdbcType=VARCHAR}
             </if>
@@ -83,6 +83,7 @@
             <if test="type != null and type != ''">
                 and type = #{type,jdbcType=VARCHAR}
             </if>
+        </where>
     </select>
 
     <delete id="deleteRelationByIds">

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

@@ -365,7 +365,7 @@
             dept_id as deptId
         from
             pile_merchant_info
-        where 1 = 1
+        where del_flag = '0'
         <if test="appId != null and appId != ''">
             and app_id = #{appId,jdbcType=VARCHAR}
         </if>
@@ -386,10 +386,8 @@
             t1.create_time AS createTime
         FROM
             pile_merchant_info t1
-                left JOIN adapay_member_account t2 ON t1.id = t2.merchant_id
+        left JOIN adapay_member_account t2 ON t1.id = t2.merchant_id AND t2.del_flag = '0'
-                AND t1.del_flag = '0'
+        where t1.del_flag = '0'
-                AND t2.del_flag = '0'
-        where 1 = 1
         <if test="dto.deptIds != null and dto.deptIds.size() != 0">
             and t1.dept_id in
             <foreach collection="dto.deptIds" item="deptId" open="(" separator="," close=")">