From e1b2be97ccbfaf15a3709adeb2f56ddff17b79b6 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Thu, 15 Jun 2023 14:40:11 +0800 Subject: [PATCH] update --- .../com/jsowell/service/OrderService.java | 9 +- .../common/constant/CacheConstants.java | 2 +- .../adapay/service/AdapayMemberService.java | 35 +-- .../pile/service/AdapayMemberInfoService.java | 21 -- .../service/IAdapayMemberAccountService.java | 2 + .../service/IAdapaySettleAccountService.java | 63 ----- .../impl/AdapayMemberAccountServiceImpl.java | 33 ++- .../impl/AdapayMemberInfoServiceImpl.java | 78 ------ .../impl/AdapaySettleAccountServiceImpl.java | 95 ------- .../impl/OrderBasicInfoServiceImpl.java | 9 +- .../mapper/pile/AdapayMemberInfoMapper.xml | 232 ------------------ .../mapper/pile/AdapaySettleAccountMapper.xml | 152 ------------ 12 files changed, 49 insertions(+), 682 deletions(-) delete mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/service/AdapayMemberInfoService.java delete mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/service/IAdapaySettleAccountService.java delete mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberInfoServiceImpl.java delete mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapaySettleAccountServiceImpl.java delete mode 100644 jsowell-pile/src/main/resources/mapper/pile/AdapayMemberInfoMapper.xml delete mode 100644 jsowell-pile/src/main/resources/mapper/pile/AdapaySettleAccountMapper.xml diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index 2bb5d74d7..0e38b6c23 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -129,8 +129,9 @@ public class OrderService { @Value("${adapay.callback}") private String ADAPAY_CALLBACK_URL; + @Autowired - private AdapayMemberInfoService adapayMemberInfoService; + private IAdapayMemberAccountService adapayMemberAccountService; /** * 生成订单 @@ -295,10 +296,10 @@ public class OrderService { createAdaPaymentParam.setExpend(JSONObject.toJSONString( ImmutableMap.of("open_id", openId))); // 分账对象信息 - AdapayMemberInfo adapayMemberInfo = adapayMemberInfoService.selectByStationId(orderInfo.getStationId()); - if (adapayMemberInfo != null) { + String adapayMemberId = adapayMemberAccountService.selectAdapayMemberIdByStationId(orderInfo.getStationId()); + if (StringUtils.isNotBlank(adapayMemberId)) { JSONObject jsonObject = new JSONObject(); - jsonObject.put("member_id", adapayMemberInfo.getMemberId()); + jsonObject.put("member_id", adapayMemberId); jsonObject.put("amount", amount); jsonObject.put("fee_flag", Constants.Y); diff --git a/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java b/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java index 4dfeb5114..16d8a6ed7 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java +++ b/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java @@ -23,7 +23,7 @@ public class CacheConstants { public static final int cache_expire_time_1d = 60 * 60 * 24; - public static final String ADAPAY_MEMBER_INFO = "adapay_member_info:"; + public static final String ADAPAY_MEMBER_ACCOUNT = "adapay_member_account:"; public static final String PILE_PROGRAM_VERSION = "pile_program_version_"; diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java index 37319468f..21b8c2a04 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java @@ -14,13 +14,8 @@ import com.jsowell.common.exception.BusinessException; import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.id.IdUtils; import com.jsowell.pile.domain.AdapayMemberAccount; -import com.jsowell.pile.domain.AdapayMemberInfo; -import com.jsowell.pile.domain.AdapaySettleAccount; -import com.jsowell.pile.service.AdapayMemberInfoService; import com.jsowell.pile.service.IAdapayMemberAccountService; -import com.jsowell.pile.service.IAdapaySettleAccountService; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -37,12 +32,6 @@ public class AdapayMemberService { @Value("${adapay.appId}") private String ADAPAY_APP_ID; - @Autowired - private AdapayMemberInfoService adapayMemberInfoService; - - @Autowired - private IAdapaySettleAccountService adapaySettleAccountService; - @Autowired private IAdapayMemberAccountService adapayMemberAccountService; @@ -127,16 +116,7 @@ public class AdapayMemberService { */ public AdapayMemberVO selectAdapayMember(String merchantId) { AdapayMemberVO resultVO = new AdapayMemberVO(); - AdapayMemberInfo adapayMemberInfo = adapayMemberInfoService.selectByMerchantId(merchantId); - if (adapayMemberInfo != null) { - BeanUtils.copyProperties(adapayMemberInfo, resultVO); - } - // 通过merchantId 查询出汇付会员id 和 结算账户id，用来查询余额 - AdapaySettleAccount adapaySettleAccount = adapaySettleAccountService.selectByMerchantId(merchantId); - if (adapaySettleAccount != null) { - BeanUtils.copyProperties(adapaySettleAccount, resultVO); - } return resultVO; } @@ -174,12 +154,12 @@ public class AdapayMemberService { public AdapayAccountBalanceVO queryAdapayAccountBalance(String merchantId) throws BaseAdaPayException { AdapayAccountBalanceVO vo = AdapayAccountBalanceVO.builder().build(); // 通过merchantId 查询出汇付会员id 和 结算账户id，用来查询余额 - AdapaySettleAccount adapaySettleAccount = adapaySettleAccountService.selectByMerchantId(merchantId); - if (adapaySettleAccount == null) { + AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId); + if (adapayMemberAccount == null) { return vo; } - String settle_account_id = adapaySettleAccount.getAdapayMemberId(); - String member_id = adapaySettleAccount.getAdapayMemberId(); + String settle_account_id = adapayMemberAccount.getAdapayMemberId(); + String member_id = adapayMemberAccount.getAdapayMemberId(); Map queryParams = Maps.newHashMap(); queryParams.put("settle_account_id", settle_account_id); queryParams.put("member_id", member_id); @@ -197,12 +177,7 @@ public class AdapayMemberService { public AdapaySettleAccountVO selectSettleAccount(String merchantId) { AdapaySettleAccountVO vo = new AdapaySettleAccountVO(); - // 通过merchantId 查询出汇付会员id 和 结算账户id，用来查询余额 - AdapaySettleAccount adapaySettleAccount = adapaySettleAccountService.selectByMerchantId(merchantId); - if (adapaySettleAccount == null) { - return vo; - } - BeanUtils.copyProperties(adapaySettleAccount, vo); + return vo; } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/AdapayMemberInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/AdapayMemberInfoService.java deleted file mode 100644 index 8eeac5c36..000000000 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/AdapayMemberInfoService.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jsowell.pile.service; - -import com.jsowell.pile.domain.AdapayMemberInfo; - -public interface AdapayMemberInfoService { - int deleteByPrimaryKey(Integer id); - - int insert(AdapayMemberInfo record); - - int insertSelective(AdapayMemberInfo record); - - AdapayMemberInfo selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(AdapayMemberInfo record); - - int updateByPrimaryKey(AdapayMemberInfo record); - - AdapayMemberInfo selectByMerchantId(String merchantId); - - AdapayMemberInfo selectByStationId(String stationId); -} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IAdapayMemberAccountService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IAdapayMemberAccountService.java index 759d231e1..426968865 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IAdapayMemberAccountService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IAdapayMemberAccountService.java @@ -60,4 +60,6 @@ public interface IAdapayMemberAccountService { public int deleteAdapayMemberAccountById(Long id); AdapayMemberAccount selectByMerchantId(String merchantId); + + String selectAdapayMemberIdByStationId(String stationId); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IAdapaySettleAccountService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IAdapaySettleAccountService.java deleted file mode 100644 index de939b12a..000000000 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IAdapaySettleAccountService.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.jsowell.pile.service; - -import com.jsowell.pile.domain.AdapaySettleAccount; - -import java.util.List; - -/** - * 汇付结算账户Service接口 - * - * @author jsowell - * @date 2023-06-12 - */ -public interface IAdapaySettleAccountService { - /** - * 查询汇付结算账户 - * - * @param id 汇付结算账户主键 - * @return 汇付结算账户 - */ - public AdapaySettleAccount selectAdapaySettleAccountById(Long id); - - /** - * 查询汇付结算账户列表 - * - * @param adapaySettleAccount 汇付结算账户 - * @return 汇付结算账户集合 - */ - public List selectAdapaySettleAccountList(AdapaySettleAccount adapaySettleAccount); - - /** - * 新增汇付结算账户 - * - * @param adapaySettleAccount 汇付结算账户 - * @return 结果 - */ - public int insertAdapaySettleAccount(AdapaySettleAccount adapaySettleAccount); - - /** - * 修改汇付结算账户 - * - * @param adapaySettleAccount 汇付结算账户 - * @return 结果 - */ - public int updateAdapaySettleAccount(AdapaySettleAccount adapaySettleAccount); - - /** - * 批量删除汇付结算账户 - * - * @param ids 需要删除的汇付结算账户主键集合 - * @return 结果 - */ - public int deleteAdapaySettleAccountByIds(Long[] ids); - - /** - * 删除汇付结算账户信息 - * - * @param id 汇付结算账户主键 - * @return 结果 - */ - public int deleteAdapaySettleAccountById(Long id); - - AdapaySettleAccount selectByMerchantId(String merchantId); -} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java index 7c18ca1a2..e4c13f8b5 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java @@ -1,9 +1,13 @@ package com.jsowell.pile.service.impl; +import com.jsowell.common.constant.CacheConstants; +import com.jsowell.common.core.redis.RedisCache; import com.jsowell.common.util.DateUtils; import com.jsowell.pile.domain.AdapayMemberAccount; +import com.jsowell.pile.domain.PileStationInfo; import com.jsowell.pile.mapper.AdapayMemberAccountMapper; import com.jsowell.pile.service.IAdapayMemberAccountService; +import com.jsowell.pile.service.IPileStationInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -20,6 +24,12 @@ public class AdapayMemberAccountServiceImpl implements IAdapayMemberAccountServi @Autowired private AdapayMemberAccountMapper adapayMemberAccountMapper; + @Autowired + private IPileStationInfoService pileStationInfoService; + + @Autowired + private RedisCache redisCache; + /** * 查询【请填写功能名称】 * @@ -90,6 +100,27 @@ public class AdapayMemberAccountServiceImpl implements IAdapayMemberAccountServi @Override public AdapayMemberAccount selectByMerchantId(String merchantId) { - return adapayMemberAccountMapper.selectByMerchantId(merchantId); + String redisKey = CacheConstants.ADAPAY_MEMBER_ACCOUNT + merchantId; + AdapayMemberAccount adapayMemberAccount = redisCache.getCacheObject(redisKey); + if (adapayMemberAccount == null) { + adapayMemberAccount = adapayMemberAccountMapper.selectByMerchantId(merchantId); + if (adapayMemberAccount != null) { + redisCache.setCacheObject(redisKey, adapayMemberAccount, CacheConstants.cache_expire_time_1h); + } + } + return adapayMemberAccount; + } + + @Override + public String selectAdapayMemberIdByStationId(String stationId) { + PileStationInfo pileStationInfo = pileStationInfoService.selectPileStationInfoById(Long.parseLong(stationId)); + if (pileStationInfo == null) { + return null; + } + AdapayMemberAccount adapayMemberAccount = selectByMerchantId(pileStationInfo.getMerchantId() + ""); + if (adapayMemberAccount == null) { + return null; + } + return adapayMemberAccount.getAdapayMemberId(); } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberInfoServiceImpl.java deleted file mode 100644 index de703bcd1..000000000 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberInfoServiceImpl.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.jsowell.pile.service.impl; - -import com.jsowell.common.constant.CacheConstants; -import com.jsowell.common.core.redis.RedisCache; -import com.jsowell.pile.domain.AdapayMemberInfo; -import com.jsowell.pile.domain.PileStationInfo; -import com.jsowell.pile.mapper.AdapayMemberInfoMapper; -import com.jsowell.pile.service.AdapayMemberInfoService; -import com.jsowell.pile.service.IPileStationInfoService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -@Service -public class AdapayMemberInfoServiceImpl implements AdapayMemberInfoService { - - @Resource - private AdapayMemberInfoMapper adapayMemberInfoMapper; - - @Autowired - private RedisCache redisCache; - - @Autowired - private IPileStationInfoService pileStationInfoService; - - @Override - public int deleteByPrimaryKey(Integer id) { - return adapayMemberInfoMapper.deleteByPrimaryKey(id); - } - - @Override - public int insert(AdapayMemberInfo record) { - return adapayMemberInfoMapper.insert(record); - } - - @Override - public int insertSelective(AdapayMemberInfo record) { - return adapayMemberInfoMapper.insertSelective(record); - } - - @Override - public AdapayMemberInfo selectByPrimaryKey(Integer id) { - return adapayMemberInfoMapper.selectByPrimaryKey(id); - } - - @Override - public int updateByPrimaryKeySelective(AdapayMemberInfo record) { - return adapayMemberInfoMapper.updateByPrimaryKeySelective(record); - } - - @Override - public int updateByPrimaryKey(AdapayMemberInfo record) { - return adapayMemberInfoMapper.updateByPrimaryKey(record); - } - - @Override - public AdapayMemberInfo selectByMerchantId(String merchantId) { - String redisKey = CacheConstants.ADAPAY_MEMBER_INFO + merchantId; - AdapayMemberInfo adapayMemberInfo = redisCache.getCacheObject(redisKey); - if (adapayMemberInfo == null) { - adapayMemberInfo = adapayMemberInfoMapper.selectByMerchantId(merchantId); - if (adapayMemberInfo != null) { - redisCache.setCacheObject(redisKey, adapayMemberInfo, CacheConstants.cache_expire_time_1d); - } - } - return adapayMemberInfo; - } - - @Override - public AdapayMemberInfo selectByStationId(String stationId) { - PileStationInfo pileStationInfo = pileStationInfoService.selectPileStationInfoById(Long.parseLong(stationId)); - if (pileStationInfo != null) { - return selectByMerchantId(pileStationInfo.getMerchantId() + ""); - } - return null; - } - -} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapaySettleAccountServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapaySettleAccountServiceImpl.java deleted file mode 100644 index 33eebf7e8..000000000 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapaySettleAccountServiceImpl.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.jsowell.pile.service.impl; - -import com.jsowell.common.util.DateUtils; -import com.jsowell.pile.domain.AdapaySettleAccount; -import com.jsowell.pile.mapper.AdapaySettleAccountMapper; -import com.jsowell.pile.service.IAdapaySettleAccountService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 汇付结算账户Service业务层处理 - * - * @author jsowell - * @date 2023-06-12 - */ -@Service -public class AdapaySettleAccountServiceImpl implements IAdapaySettleAccountService { - @Autowired - private AdapaySettleAccountMapper adapaySettleAccountMapper; - - /** - * 查询汇付结算账户 - * - * @param id 汇付结算账户主键 - * @return 汇付结算账户 - */ - @Override - public AdapaySettleAccount selectAdapaySettleAccountById(Long id) { - return adapaySettleAccountMapper.selectAdapaySettleAccountById(id); - } - - /** - * 查询汇付结算账户列表 - * - * @param adapaySettleAccount 汇付结算账户 - * @return 汇付结算账户 - */ - @Override - public List selectAdapaySettleAccountList(AdapaySettleAccount adapaySettleAccount) { - return adapaySettleAccountMapper.selectAdapaySettleAccountList(adapaySettleAccount); - } - - /** - * 新增汇付结算账户 - * - * @param adapaySettleAccount 汇付结算账户 - * @return 结果 - */ - @Override - public int insertAdapaySettleAccount(AdapaySettleAccount adapaySettleAccount) { - adapaySettleAccount.setCreateTime(DateUtils.getNowDate()); - return adapaySettleAccountMapper.insertAdapaySettleAccount(adapaySettleAccount); - } - - /** - * 修改汇付结算账户 - * - * @param adapaySettleAccount 汇付结算账户 - * @return 结果 - */ - @Override - public int updateAdapaySettleAccount(AdapaySettleAccount adapaySettleAccount) { - adapaySettleAccount.setUpdateTime(DateUtils.getNowDate()); - return adapaySettleAccountMapper.updateAdapaySettleAccount(adapaySettleAccount); - } - - /** - * 批量删除汇付结算账户 - * - * @param ids 需要删除的汇付结算账户主键 - * @return 结果 - */ - @Override - public int deleteAdapaySettleAccountByIds(Long[] ids) { - return adapaySettleAccountMapper.deleteAdapaySettleAccountByIds(ids); - } - - /** - * 删除汇付结算账户信息 - * - * @param id 汇付结算账户主键 - * @return 结果 - */ - @Override - public int deleteAdapaySettleAccountById(Long id) { - return adapaySettleAccountMapper.deleteAdapaySettleAccountById(id); - } - - @Override - public AdapaySettleAccount selectByMerchantId(String merchantId) { - return adapaySettleAccountMapper.selectByMerchantId(merchantId); - } -} 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 daf460150..c9875bbca 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 @@ -147,8 +147,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { private ISettleOrderReportService settleOrderReportService; @Autowired - private AdapayMemberInfoService adapayMemberInfoService; - + private IAdapayMemberAccountService adapayMemberAccountService; /** * 条件查询订单基本信息 * @@ -1853,10 +1852,10 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { // 分账对象信息 OrderBasicInfo orderBasicInfo = getOrderInfoByOrderCode(dto.getOrderCode()); if (orderBasicInfo != null) { - AdapayMemberInfo adapayMemberInfo = adapayMemberInfoService.selectByStationId(orderBasicInfo.getStationId()); - if (adapayMemberInfo != null) { + String adapayMemberId = adapayMemberAccountService.selectAdapayMemberIdByStationId(orderBasicInfo.getStationId()); + if (StringUtils.isNotBlank(adapayMemberId)) { JSONObject jsonObject = new JSONObject(); - jsonObject.put("member_id", adapayMemberInfo.getMemberId()); + jsonObject.put("member_id", adapayMemberId); jsonObject.put("amount", amount); jsonObject.put("fee_flag", Constants.Y); diff --git a/jsowell-pile/src/main/resources/mapper/pile/AdapayMemberInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/AdapayMemberInfoMapper.xml deleted file mode 100644 index b5b777ee7..000000000 --- a/jsowell-pile/src/main/resources/mapper/pile/AdapayMemberInfoMapper.xml +++ /dev/null @@ -1,232 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - id, merchant_id, member_id, gender, `identified`, tel_no, prod_mode, nickname, disabled, `location`, - app_id, email, `object`, `status`, create_time, del_flag - - - - - delete from adapay_member_info - where id = #{id,jdbcType=INTEGER} - - - - insert into adapay_member_info (merchant_id, member_id, gender, `identified`, - tel_no, prod_mode, nickname, - disabled, `location`, app_id, - email, `object`, `status` - ) - values (#{merchantId,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, #{gender,jdbcType=VARCHAR}, #{identified,jdbcType=VARCHAR}, - #{telNo,jdbcType=INTEGER}, #{prodMode,jdbcType=VARCHAR}, #{nickname,jdbcType=VARCHAR}, - #{disabled,jdbcType=VARCHAR}, #{location,jdbcType=VARCHAR}, #{appId,jdbcType=VARCHAR}, - #{email,jdbcType=VARCHAR}, #{object,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR} - ) - - - - insert into adapay_member_info - - - merchant_id, - - - member_id, - - - gender, - - - `identified`, - - - tel_no, - - - prod_mode, - - - nickname, - - - disabled, - - - `location`, - - - app_id, - - - email, - - - `object`, - - - `status`, - - - create_time, - - - del_flag, - - - - - #{merchantId,jdbcType=VARCHAR}, - - - #{memberId,jdbcType=VARCHAR}, - - - #{gender,jdbcType=VARCHAR}, - - - #{identified,jdbcType=VARCHAR}, - - - #{telNo,jdbcType=INTEGER}, - - - #{prodMode,jdbcType=VARCHAR}, - - - #{nickname,jdbcType=VARCHAR}, - - - #{disabled,jdbcType=VARCHAR}, - - - #{location,jdbcType=VARCHAR}, - - - #{appId,jdbcType=VARCHAR}, - - - #{email,jdbcType=VARCHAR}, - - - #{object,jdbcType=VARCHAR}, - - - #{status,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{delFlag,jdbcType=VARCHAR}, - - - - - - update adapay_member_info - - - merchant_id = #{merchantId,jdbcType=VARCHAR}, - - - member_id = #{memberId,jdbcType=VARCHAR}, - - - gender = #{gender,jdbcType=VARCHAR}, - - - `identified` = #{identified,jdbcType=VARCHAR}, - - - tel_no = #{telNo,jdbcType=INTEGER}, - - - prod_mode = #{prodMode,jdbcType=VARCHAR}, - - - nickname = #{nickname,jdbcType=VARCHAR}, - - - disabled = #{disabled,jdbcType=VARCHAR}, - - - `location` = #{location,jdbcType=VARCHAR}, - - - app_id = #{appId,jdbcType=VARCHAR}, - - - email = #{email,jdbcType=VARCHAR}, - - - `object` = #{object,jdbcType=VARCHAR}, - - - `status` = #{status,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - del_flag = #{delFlag,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=INTEGER} - - - - update adapay_member_info - set merchant_id = #{merchantId,jdbcType=VARCHAR}, - member_id = #{memberId,jdbcType=VARCHAR}, - gender = #{gender,jdbcType=VARCHAR}, - `identified` = #{identified,jdbcType=VARCHAR}, - tel_no = #{telNo,jdbcType=INTEGER}, - prod_mode = #{prodMode,jdbcType=VARCHAR}, - nickname = #{nickname,jdbcType=VARCHAR}, - disabled = #{disabled,jdbcType=VARCHAR}, - `location` = #{location,jdbcType=VARCHAR}, - app_id = #{appId,jdbcType=VARCHAR}, - email = #{email,jdbcType=VARCHAR}, - `object` = #{object,jdbcType=VARCHAR}, - `status` = #{status,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - del_flag = #{delFlag,jdbcType=VARCHAR} - where id = #{id,jdbcType=INTEGER} - - - - \ No newline at end of file diff --git a/jsowell-pile/src/main/resources/mapper/pile/AdapaySettleAccountMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/AdapaySettleAccountMapper.xml deleted file mode 100644 index 3438b107a..000000000 --- a/jsowell-pile/src/main/resources/mapper/pile/AdapaySettleAccountMapper.xml +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - id, merchant_id, adapay_member_id, settle_account_id, card_id, card_name, cert_id, cert_type, tel_no, bank_code, bank_name, bank_acct_type, prov_code, area_code, create_time, create_by, update_time, update_by, del_flag - - - - select - - from adapay_settle_account - - - - - - - - insert into adapay_settle_account - - id, - merchant_id, - adapay_member_id, - settle_account_id, - card_id, - card_name, - cert_id, - cert_type, - tel_no, - bank_code, - bank_name, - bank_acct_type, - prov_code, - area_code, - create_time, - create_by, - update_time, - update_by, - del_flag, - - - #{id}, - #{merchantId}, - #{adapayMemberId}, - #{settleAccountId}, - #{cardId}, - #{cardName}, - #{certId}, - #{certType}, - #{telNo}, - #{bankCode}, - #{bankName}, - #{bankAcctType}, - #{provCode}, - #{areaCode}, - #{createTime}, - #{createBy}, - #{updateTime}, - #{updateBy}, - #{delFlag}, - - - - - update adapay_settle_account - - merchant_id = #{merchantId}, - adapay_member_id = #{adapayMemberId}, - settle_account_id = #{settleAccountId}, - card_id = #{cardId}, - card_name = #{cardName}, - cert_id = #{certId}, - cert_type = #{certType}, - tel_no = #{telNo}, - bank_code = #{bankCode}, - bank_name = #{bankName}, - bank_acct_type = #{bankAcctType}, - prov_code = #{provCode}, - area_code = #{areaCode}, - create_time = #{createTime}, - create_by = #{createBy}, - update_time = #{updateTime}, - update_by = #{updateBy}, - del_flag = #{delFlag}, - - where id = #{id} - - - - delete from adapay_settle_account where id = #{id} - - - - delete from adapay_settle_account where id in - - #{id} - - - - - \ No newline at end of file