autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-03 17:40:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

解绑鉴权卡

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-11-28 16:39:39 +08:00
parent 3928f4d555
commit a24398fa44
6 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) {

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

@@ -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);
}
}

2
jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml
View File

@@ -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=")">

2
jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml
View File

@@ -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>

21
jsowell-pile/src/main/resources/mapper/pile/PileMemberRelationMapper.xml
View File

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

8
jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml
View File

@@ -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
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'
<if test="dto.deptIds != null and dto.deptIds.size() != 0">
and t1.dept_id in
<foreach collection="dto.deptIds" item="deptId" open="(" separator="," close=")">