From bbaa150261aeec15a636f51eab56609fa169c260 Mon Sep 17 00:00:00 2001 From: "YAS\\29473" <2947326429@qq.com> Date: Wed, 23 Jul 2025 15:42:08 +0800 Subject: [PATCH 1/7] update --- .../UploadRealTimeMonitorHandler.java | 6 -- .../thirdparty/common/CommonService.java | 61 ++++++++++--------- 2 files changed, 31 insertions(+), 36 deletions(-) diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/UploadRealTimeMonitorHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/UploadRealTimeMonitorHandler.java index 0448a2ff3..973b3b085 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/UploadRealTimeMonitorHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/UploadRealTimeMonitorHandler.java @@ -358,12 +358,6 @@ public class UploadRealTimeMonitorHandler extends AbstractYkcHandler { // 异步推送第三方平台实时数据V2 CompletableFuture.runAsync(() -> { try { - log.info("thirdpartyTaskExecutor状态：活跃线程数={}, 队列大小={}, 任务总数={}, 拒绝任务数={}", - thirdpartyTaskExecutor.getActiveCount(), - thirdpartyTaskExecutor.getThreadPoolExecutor().getQueue().size(), - thirdpartyTaskExecutor.getThreadPoolExecutor().getTaskCount(), - thirdpartyTaskExecutor.getThreadPoolExecutor().getRejectedExecutionHandler().toString()); - commonService.pushRealTimeInfoV2(pileSn, connectorCode, connectorStatus, realTimeMonitorData, transactionCode); // log.info("统一推送第三方平台实时数据V2 success, pileSn:{}, connectorCode:{}, connectorStatus:{}, realTimeMonitorData:{}, transactionCode:{}", pileSn, connectorCode, connectorStatus, realTimeMonitorData, transactionCode); } catch (Exception e) { diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java index 0cc8f9738..2fe8d7939 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java @@ -419,42 +419,43 @@ public class CommonService { String stationId = String.valueOf(pileBasicInfo.getStationId()); // 查询该站点是否推送第三方平台 List thirdPartySecretInfoVOS = thirdpartySecretInfoService.queryStationToPlatformList(stationId); - - log.info("推送实时数据到第三方平台 stationId:{}, thirdPartySecretInfoVOS:{}", stationId, thirdPartySecretInfoVOS); - if (CollectionUtils.isEmpty(thirdPartySecretInfoVOS)) { return; } - - // 推送 - for (ThirdPartySecretInfoVO thirdPartySecretInfoVO : thirdPartySecretInfoVOS) { - NotificationDTO dto = new NotificationDTO(); - dto.setStationId(stationId); - dto.setPileConnectorCode(pileConnectorCode); - dto.setStatus(changedStatus); - dto.setPlatformType(thirdPartySecretInfoVO.getPlatformType()); - - notificationService.notificationStationStatus(dto); - - log.info("交易流水号transactionCode:{}", transactionCode); - // 查询订单信息 - OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode); - // 新运有三个平台,当这个transactionCode为null或orderInfo为null时,这里就不会继续推送其它两家平台,直接return了 - // 也就是说,只要这台桩没有订单,为空闲状态,就只推送一家平台循环就终止了 - - //判断transactionCode和orderInfo是否为空,为空就不推送充电状态 - if (Strings.isEmpty(transactionCode)){ -// return; - continue; + OrderBasicInfo orderInfo = new OrderBasicInfo(); + if(Constants.ILLEGAL_TRANSACTION_CODE.equals(transactionCode)){ + //表示为非法交易流水号"00000000000000000000000000000000",不推送充电状态 + orderInfo = null; + }else{ + // 查询订单信息，避免每个平台都查询一次 + if (transactionCode != null) { + orderInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode); } - if (Objects.isNull(orderInfo)) { - continue; - } - dto.setOrderCode(orderInfo.getOrderCode()); - notificationService.notificationConnectorChargeStatus(dto); - } + for (ThirdPartySecretInfoVO thirdPartySecretInfoVO : thirdPartySecretInfoVOS) { + try { + NotificationDTO dto = new NotificationDTO(); + dto.setStationId(stationId); + dto.setPileConnectorCode(pileConnectorCode); + dto.setStatus(changedStatus); + dto.setPlatformType(thirdPartySecretInfoVO.getPlatformType()); + + // 先推送站点状态 + notificationService.notificationStationStatus(dto); + + // 如果有订单信息，推送充电状态 + if (orderInfo != null) { + dto.setOrderCode(orderInfo.getOrderCode()); + notificationService.notificationConnectorChargeStatus(dto); + } else { + log.info("无订单信息，仅推送站点状态，平台类型：{}", thirdPartySecretInfoVO.getPlatformType()); + } + } catch (Exception e) { + log.error("推送实时数据到平台失败，平台类型：{}，错误信息：{}", + thirdPartySecretInfoVO.getPlatformType(), e.getMessage(), e); + } + } } From 70fb9053e88b4f3c30ff8fbc5b1275924db5dc12 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Wed, 23 Jul 2025 17:00:16 +0800 Subject: [PATCH 2/7] =?UTF-8?q?commons-io=E7=89=88=E6=9C=AC2.11.0=20->=202?= =?UTF-8?q?.16.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 84ce530c9..0a03e06e4 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 2.0.23 6.2.2 - 2.11.0 + 2.16.1 1.4 3.2.2 4.1.2 From 75c501377f0e99ad34ca0c7e259830a6fb33d799 Mon Sep 17 00:00:00 2001 From: "YAS\\29473" <2947326429@qq.com> Date: Thu, 24 Jul 2025 09:42:34 +0800 Subject: [PATCH 3/7] =?UTF-8?q?update=20pre=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E4=B8=BA=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-pre.yml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/jsowell-admin/src/main/resources/application-pre.yml b/jsowell-admin/src/main/resources/application-pre.yml index 793a9ba7f..a970fb4c5 100644 --- a/jsowell-admin/src/main/resources/application-pre.yml +++ b/jsowell-admin/src/main/resources/application-pre.yml @@ -8,17 +8,17 @@ spring: # redis 配置 redis: # 地址 - host: r-uf6k0uet7mihr5z78f.redis.rds.aliyuncs.com -# host: 106.14.94.149 +# host: r-uf6k0uet7mihr5z78f.redis.rds.aliyuncs.com + host: 106.14.94.149 # 端口，默认为6379 port: 6379 # 数据库索引 database: 0 # 账号 - username: jsowell +# username: jsowell # 密码 - password: js@160829 -# password: js160829 +# password: js@160829 + password: js160829 # 连接超时时间 timeout: 10s lettuce: @@ -38,12 +38,12 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://rm-uf6ra51u33dc3798l.mysql.rds.aliyuncs.com:3306/jsowell_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: jsowell - password: js@160829 -# url: jdbc:mysql://106.14.94.149:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 -# username: jsowell_pre -# password: Js@160829 +# url: jdbc:mysql://rm-uf6ra51u33dc3798l.mysql.rds.aliyuncs.com:3306/jsowell_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# username: jsowell +# password: js@160829 + url: jdbc:mysql://106.14.94.149:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: jsowell_pre + password: Js@160829 # 从库数据源 slave: # 从数据源开关/默认关闭 From 2664e42e039727760a07a1297311f8f20837c3b5 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Thu, 24 Jul 2025 14:17:35 +0800 Subject: [PATCH 4/7] update --- .../src/main/java/com/jsowell/adapay/service/AdapayService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java index a612d0662..b1ace922a 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java @@ -1105,6 +1105,7 @@ public class AdapayService { } /** + * 实时分账的调退款接口 * 创建退款请求 */ public RefundResponse createRefundRequest(String paymentId, BigDecimal refundAmt, String wechatAppId, String memberId, String scenarioType, String orderCode) { From ef55dd04af0102b191deeba0704d64fde90525bd Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Thu, 24 Jul 2025 14:20:57 +0800 Subject: [PATCH 5/7] =?UTF-8?q?add=E6=89=B9=E9=87=8F=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/pile/domain/MemberWalletInfo.java | 10 +- .../pile/mapper/MemberWalletInfoMapper.java | 56 +-- .../mapper/pile/MemberWalletInfoMapper.xml | 345 +++++++++++++++++- 3 files changed, 355 insertions(+), 56 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberWalletInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberWalletInfo.java index 75e04d98a..1f9415f8a 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberWalletInfo.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberWalletInfo.java @@ -4,15 +4,17 @@ import java.math.BigDecimal; import java.util.Date; import lombok.AllArgsConstructor; import lombok.Builder; -import lombok.Getter; +import lombok.Data; import lombok.NoArgsConstructor; -import lombok.Setter; +import lombok.experimental.Accessors; +import lombok.experimental.SuperBuilder; /** * 会员钱包信息表 */ -@Getter -@Setter +@Data +@Accessors(chain = true) +@SuperBuilder @Builder @AllArgsConstructor @NoArgsConstructor diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletInfoMapper.java index db221124d..c7b481256 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletInfoMapper.java @@ -1,22 +1,31 @@ package com.jsowell.pile.mapper; import com.jsowell.pile.domain.MemberWalletInfo; -import com.jsowell.pile.vo.base.MemberWalletVO; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; import java.util.List; -@Repository +import com.jsowell.pile.vo.base.MemberWalletVO; +import org.apache.ibatis.annotations.Param; + public interface MemberWalletInfoMapper { - /** - * delete by primary key - * - * @param id primaryKey - * @return deleteCount - */ int deleteByPrimaryKey(Integer id); + int insertSelective(MemberWalletInfo record); + + MemberWalletInfo selectByPrimaryKey(Integer id); + + int updateByPrimaryKeySelective(MemberWalletInfo record); + + int updateBatch(@Param("list") List list); + + int updateBatchSelective(@Param("list") List list); + + int batchInsert(@Param("list") List list); + + int insertOrUpdate(MemberWalletInfo record); + + int insertOrUpdateSelective(MemberWalletInfo record); + /** * insert record to table * @@ -25,30 +34,6 @@ public interface MemberWalletInfoMapper { */ int insert(MemberWalletInfo record); - /** - * insert record to table selective - * - * @param record the record - * @return insert count - */ - int insertSelective(MemberWalletInfo record); - - /** - * select by primary key - * - * @param id primary key - * @return object by primary key - */ - MemberWalletInfo selectByPrimaryKey(Integer id); - - /** - * update record selective - * - * @param record the updated record - * @return update count - */ - int updateByPrimaryKeySelective(MemberWalletInfo record); - /** * update record * @@ -57,10 +42,9 @@ public interface MemberWalletInfoMapper { */ int updateByPrimaryKey(MemberWalletInfo record); - // MemberWalletInfo selectByMemberId(String memberId); - /** * 根据会员id和目标运营商id查询用户钱包信息 + * * @param memberId * @param merchantId * @return diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml index b0944611e..25e895828 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml @@ -34,17 +34,6 @@ delete from member_wallet_info where id = #{id,jdbcType=INTEGER} - - - insert into member_wallet_info (member_id, merchant_id, wallet_code, - principal_balance, gift_balance, version, - create_by, create_time, update_by, - update_time, del_flag) - values (#{memberId,jdbcType=VARCHAR}, #{merchantId,jdbcType=VARCHAR}, #{walletCode,jdbcType=VARCHAR}, - #{principalBalance,jdbcType=DECIMAL}, #{giftBalance,jdbcType=DECIMAL}, #{version,jdbcType=INTEGER}, - #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, - #{updateTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=CHAR}) - insert into member_wallet_info @@ -159,10 +148,214 @@ where id = #{id,jdbcType=INTEGER} - + update member_wallet_info - set member_id = #{memberId,jdbcType=VARCHAR}, + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.memberId,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.merchantId,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.walletCode,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.principalBalance,jdbcType=DECIMAL} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.giftBalance,jdbcType=DECIMAL} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.version,jdbcType=INTEGER} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.createBy,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.createTime,jdbcType=TIMESTAMP} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.updateBy,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.updateTime,jdbcType=TIMESTAMP} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.delFlag,jdbcType=CHAR} + + + + where id in + + #{item.id,jdbcType=INTEGER} + + + + + update member_wallet_info + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.memberId,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.merchantId,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.walletCode,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.principalBalance,jdbcType=DECIMAL} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.giftBalance,jdbcType=DECIMAL} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.version,jdbcType=INTEGER} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.createBy,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.createTime,jdbcType=TIMESTAMP} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.updateBy,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.updateTime,jdbcType=TIMESTAMP} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.delFlag,jdbcType=CHAR} + + + + + where id in + + #{item.id,jdbcType=INTEGER} + + + + + insert into member_wallet_info + (member_id, merchant_id, wallet_code, principal_balance, gift_balance, version, create_by, + create_time, update_by, update_time, del_flag) + values + + (#{item.memberId,jdbcType=VARCHAR}, #{item.merchantId,jdbcType=VARCHAR}, #{item.walletCode,jdbcType=VARCHAR}, + #{item.principalBalance,jdbcType=DECIMAL}, #{item.giftBalance,jdbcType=DECIMAL}, + #{item.version,jdbcType=INTEGER}, #{item.createBy,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, + #{item.updateBy,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, #{item.delFlag,jdbcType=CHAR} + ) + + + + + insert into member_wallet_info + + + id, + + member_id, + merchant_id, + wallet_code, + principal_balance, + gift_balance, + version, + create_by, + create_time, + update_by, + update_time, + del_flag, + + values + + + #{id,jdbcType=INTEGER}, + + #{memberId,jdbcType=VARCHAR}, + #{merchantId,jdbcType=VARCHAR}, + #{walletCode,jdbcType=VARCHAR}, + #{principalBalance,jdbcType=DECIMAL}, + #{giftBalance,jdbcType=DECIMAL}, + #{version,jdbcType=INTEGER}, + #{createBy,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, + #{updateBy,jdbcType=VARCHAR}, + #{updateTime,jdbcType=TIMESTAMP}, + #{delFlag,jdbcType=CHAR}, + + on duplicate key update + + + id = #{id,jdbcType=INTEGER}, + + member_id = #{memberId,jdbcType=VARCHAR}, merchant_id = #{merchantId,jdbcType=VARCHAR}, wallet_code = #{walletCode,jdbcType=VARCHAR}, principal_balance = #{principalBalance,jdbcType=DECIMAL}, @@ -172,9 +365,129 @@ create_time = #{createTime,jdbcType=TIMESTAMP}, update_by = #{updateBy,jdbcType=VARCHAR}, update_time = #{updateTime,jdbcType=TIMESTAMP}, - del_flag = #{delFlag,jdbcType=CHAR} - where id = #{id,jdbcType=INTEGER} - + del_flag = #{delFlag,jdbcType=CHAR}, + + + + + insert into member_wallet_info + + + id, + + + member_id, + + + merchant_id, + + + wallet_code, + + + principal_balance, + + + gift_balance, + + + version, + + + create_by, + + + create_time, + + + update_by, + + + update_time, + + + del_flag, + + + values + + + #{id,jdbcType=INTEGER}, + + + #{memberId,jdbcType=VARCHAR}, + + + #{merchantId,jdbcType=VARCHAR}, + + + #{walletCode,jdbcType=VARCHAR}, + + + #{principalBalance,jdbcType=DECIMAL}, + + + #{giftBalance,jdbcType=DECIMAL}, + + + #{version,jdbcType=INTEGER}, + + + #{createBy,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateBy,jdbcType=VARCHAR}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{delFlag,jdbcType=CHAR}, + + + on duplicate key update + + + id = #{id,jdbcType=INTEGER}, + + + member_id = #{memberId,jdbcType=VARCHAR}, + + + merchant_id = #{merchantId,jdbcType=VARCHAR}, + + + wallet_code = #{walletCode,jdbcType=VARCHAR}, + + + principal_balance = #{principalBalance,jdbcType=DECIMAL}, + + + gift_balance = #{giftBalance,jdbcType=DECIMAL}, + + + version = #{version,jdbcType=INTEGER}, + + + create_by = #{createBy,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_by = #{updateBy,jdbcType=VARCHAR}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + del_flag = #{delFlag,jdbcType=CHAR}, + + + - select + select from member_wallet_info where id = #{id,jdbcType=INTEGER} @@ -34,6 +34,17 @@ delete from member_wallet_info where id = #{id,jdbcType=INTEGER} + + + insert into member_wallet_info (member_id, merchant_id, wallet_code, + principal_balance, gift_balance, version, + create_by, create_time, update_by, + update_time, del_flag) + values (#{memberId,jdbcType=VARCHAR}, #{merchantId,jdbcType=VARCHAR}, #{walletCode,jdbcType=VARCHAR}, + #{principalBalance,jdbcType=DECIMAL}, #{giftBalance,jdbcType=DECIMAL}, #{version,jdbcType=INTEGER}, + #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, + #{updateTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=CHAR}) + insert into member_wallet_info @@ -148,6 +159,22 @@ where id = #{id,jdbcType=INTEGER} + + + update member_wallet_info + set member_id = #{memberId,jdbcType=VARCHAR}, + merchant_id = #{merchantId,jdbcType=VARCHAR}, + wallet_code = #{walletCode,jdbcType=VARCHAR}, + principal_balance = #{principalBalance,jdbcType=DECIMAL}, + gift_balance = #{giftBalance,jdbcType=DECIMAL}, + version = #{version,jdbcType=INTEGER}, + create_by = #{createBy,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_by = #{updateBy,jdbcType=VARCHAR}, + update_time = #{updateTime,jdbcType=TIMESTAMP}, + del_flag = #{delFlag,jdbcType=CHAR} + where id = #{id,jdbcType=INTEGER} + update member_wallet_info @@ -303,13 +330,13 @@ insert into member_wallet_info - (member_id, merchant_id, wallet_code, principal_balance, gift_balance, version, create_by, + (member_id, merchant_id, wallet_code, principal_balance, gift_balance, version, create_by, create_time, update_by, update_time, del_flag) values - (#{item.memberId,jdbcType=VARCHAR}, #{item.merchantId,jdbcType=VARCHAR}, #{item.walletCode,jdbcType=VARCHAR}, - #{item.principalBalance,jdbcType=DECIMAL}, #{item.giftBalance,jdbcType=DECIMAL}, - #{item.version,jdbcType=INTEGER}, #{item.createBy,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, + (#{item.memberId,jdbcType=VARCHAR}, #{item.merchantId,jdbcType=VARCHAR}, #{item.walletCode,jdbcType=VARCHAR}, + #{item.principalBalance,jdbcType=DECIMAL}, #{item.giftBalance,jdbcType=DECIMAL}, + #{item.version,jdbcType=INTEGER}, #{item.createBy,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateBy,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, #{item.delFlag,jdbcType=CHAR} ) @@ -350,7 +377,7 @@ #{updateTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=CHAR}, - on duplicate key update + on duplicate key update id = #{id,jdbcType=INTEGER}, @@ -448,7 +475,7 @@ #{delFlag,jdbcType=CHAR}, - on duplicate key update + on duplicate key update id = #{id,jdbcType=INTEGER}, @@ -539,4 +566,12 @@ and sub_type = '11') t3 on t3.wallet_code = t1.wallet_code where t1.wallet_code = #{walletCode,jdbcType=VARCHAR} - \ No newline at end of file + + + From 724d847d38380e5a5b1852658cf461e89b315fce Mon Sep 17 00:00:00 2001 From: "YAS\\29473" <2947326429@qq.com> Date: Thu, 24 Jul 2025 15:06:27 +0800 Subject: [PATCH 7/7] =?UTF-8?q?update=20pre=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E4=B8=BA=E7=94=9F=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-pre.yml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/jsowell-admin/src/main/resources/application-pre.yml b/jsowell-admin/src/main/resources/application-pre.yml index a970fb4c5..793a9ba7f 100644 --- a/jsowell-admin/src/main/resources/application-pre.yml +++ b/jsowell-admin/src/main/resources/application-pre.yml @@ -8,17 +8,17 @@ spring: # redis 配置 redis: # 地址 -# host: r-uf6k0uet7mihr5z78f.redis.rds.aliyuncs.com - host: 106.14.94.149 + host: r-uf6k0uet7mihr5z78f.redis.rds.aliyuncs.com +# host: 106.14.94.149 # 端口，默认为6379 port: 6379 # 数据库索引 database: 0 # 账号 -# username: jsowell + username: jsowell # 密码 -# password: js@160829 - password: js160829 + password: js@160829 +# password: js160829 # 连接超时时间 timeout: 10s lettuce: @@ -38,12 +38,12 @@ spring: druid: # 主库数据源 master: -# url: jdbc:mysql://rm-uf6ra51u33dc3798l.mysql.rds.aliyuncs.com:3306/jsowell_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 -# username: jsowell -# password: js@160829 - url: jdbc:mysql://106.14.94.149:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: jsowell_pre - password: Js@160829 + url: jdbc:mysql://rm-uf6ra51u33dc3798l.mysql.rds.aliyuncs.com:3306/jsowell_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: jsowell + password: js@160829 +# url: jdbc:mysql://106.14.94.149:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# username: jsowell_pre +# password: Js@160829 # 从库数据源 slave: # 从数据源开关/默认关闭