diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index b27e9050d..5b04be2f3 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/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 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) { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java index a2b58d9c5..682a8d3ff 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java +++ b/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); } } diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml index b4195cf06..d94de0142 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml +++ b/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' and t2.dept_id in diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml index 9151eca4c..952b0eee9 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml @@ -149,7 +149,7 @@ from pile_auth_card - where 1 = 1 + where del_flag = '0' and status = #{status,jdbcType=VARCHAR} diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileMemberRelationMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileMemberRelationMapper.xml index 7fcaaedb8..6a1c33d73 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileMemberRelationMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileMemberRelationMapper.xml @@ -73,16 +73,17 @@ select from pile_member_relation - where 1 = 1 - - and pile_sn = #{pileSn,jdbcType=VARCHAR} - - - and member_id = #{memberId,jdbcType=VARCHAR} - - - and type = #{type,jdbcType=VARCHAR} - + + + and pile_sn = #{pileSn,jdbcType=VARCHAR} + + + and member_id = #{memberId,jdbcType=VARCHAR} + + + and type = #{type,jdbcType=VARCHAR} + + diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml index cf6a3841f..2781d498b 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml +++ b/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' and app_id = #{appId,jdbcType=VARCHAR} @@ -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 - AND t1.del_flag = '0' - AND t2.del_flag = '0' - where 1 = 1 + left JOIN adapay_member_account t2 ON t1.id = t2.merchant_id AND t2.del_flag = '0' + where t1.del_flag = '0' and t1.dept_id in