diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/MerchantInfoController.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/MerchantInfoController.java index b8a1327..e8c7444 100644 --- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/MerchantInfoController.java +++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/MerchantInfoController.java @@ -1,8 +1,11 @@ package com.chaozhanggui.admin.system.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.chaozhanggui.admin.system.annotation.OpLog; import com.chaozhanggui.admin.system.service.AccountService; import com.chaozhanggui.admin.system.service.MerchantInfoService; import com.chaozhanggui.admin.system.service.SxfMccInfoService; @@ -16,9 +19,12 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * @author lyf @@ -53,6 +59,7 @@ public class MerchantInfoController { * @param userApp * @return */ + @OpLog(opName = "更改实名认证信息", opDetail = "更改实名认证信息", opCode = "NAME_UPDATE") @PostMapping("/updatePromoterInformation") public RespBody updatePromoterInformation(@RequestBody TbPlussUserApp userApp){ if (userApp == null){ @@ -68,6 +75,7 @@ public class MerchantInfoController { * @return */ @PostMapping("/updateMerchantInformation") + @OpLog(opName = "修改商户相关信息", opDetail = "修改商户相关信息", opCode = "MERCHANT_UPDATE") public RespBody updateMerchantInformation(@RequestBody TbPlussMerchantBaseInfo merchantBaseInfo){ if (merchantBaseInfo == null ){ log.error("参数错误"); @@ -111,6 +119,15 @@ public class MerchantInfoController { return merchantInfoService.merchantAccount(userId); } + /** + * 更改结算信息D1或者D0 + * @param account + * @return + */ + @PostMapping("/detail/updateAccount") + public RespBody updateAccount(@RequestBody AccountDTO account){ + return merchantInfoService.updateAccountD1(account); + } /** * 获取对应的银行 @@ -147,6 +164,26 @@ public class MerchantInfoController { } + /** + * 实名认证信息页面(实名个数) + * @param userId + * @return + */ + @GetMapping("/connectInfo/{userId}") + public RespBody connectInfo(@PathVariable("userId") Integer userId) { + return merchantInfoService.connectInfo(userId); + } + +// /** +// * 通道进件信息 +// * @param userId +// * @return +// */ +// @GetMapping("/detail/channelAuditInfo/{userId}") +// public RespBody channelAuditInfo(@PathVariable("userId") Integer userId) { +// merchantInfoService.channelAuditInfo(userId); +// +// } // @PostMapping("/updateMerchantSettlement2") // public RespBody updateMerchantSettlement2(@RequestBody AccountDTO accountDTO) { @@ -216,9 +253,6 @@ public class MerchantInfoController { // // } - /** - * 获取所有省 - */ // private void getProvince() { // QueryWrapper queryWrapper = new QueryWrapper().eq("type", "1"); // List areaCitiesList = TbPlussAreaCityMapper.selectList(queryWrapper); diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/MerchantInfoService.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/MerchantInfoService.java index 9373783..fb9a988 100644 --- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/MerchantInfoService.java +++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/MerchantInfoService.java @@ -44,6 +44,8 @@ public class MerchantInfoService { @Resource private TbPlussMerchantChannelMapper merchantChannelMapper; @Resource + private TbPlussMerchantChannelStatusMapper merchantChannelStatusMapper; + @Resource private TbPlussUserInfoMapper userInfoMapper; @Resource private TbPlussUserAppMapper userAppMapper; @@ -93,6 +95,28 @@ public class MerchantInfoService { return new RespBody("000000",realAccount); } + public RespBody connectInfo(Integer userId){ + //实名身份证信息条数 + TbPlussIdCard certIdCard = idCardMapper.selectCertByUserId(userId, "01"); + HashMap map = new HashMap<>(); + if (certIdCard != null){ + map.put("CertNoCount",idCardMapper.countByCertno(certIdCard.getCertno())); + }else { + map.put("CertNoCount",0); + } + + // 结算身份证相关的结算信息条数 + map.put("countAccountCount",merchantBaseInfoMapper.countByIdCardNo(certIdCard.getCertno())); + // 结算身份证相关的结算信息条数 + TbPlussMerchantBaseInfo merchantBaseInfo = merchantBaseInfoMapper.selectByUserId(String.valueOf(userId)); + if (merchantBaseInfo != null) { + map.put("countMbiName", idCardMapper.countByAliasAndName(merchantBaseInfo.getAlias(), merchantBaseInfo.getMerchantname())); + }else { + map.put("countMbiName",0); + } + return new RespBody("000000",map); + } + public HashMap getRealAccount(Integer userId) { HashMap map = new HashMap<>(); //D1 @@ -224,6 +248,7 @@ public class MerchantInfoService { // UpdateWrapper merchantBaseInfoUpdateWrapper = new UpdateWrapper() // .eq("userId", userApp.getUserid()); // merchantChannelMapper.update(userApp.getMerchantBaseInfo(), merchantBaseInfoUpdateWrapper); + merchantBaseInfoMapper.updateByPrimaryKeySelective(merchantBaseInfo); } if (merchantBaseInfo.getMerchantcode() != null) { @@ -268,5 +293,23 @@ public class MerchantInfoService { } return new RespBody("000000"); } + @Transactional(rollbackFor = Exception.class) + public RespBody updateAccountD1(AccountDTO account){ + TbPlussAccount tbPlussAccount = accountMapper.selectByAccountD1(account.getUserid(), account.getChanneltype()); + if (tbPlussAccount == null){ + return new RespBody("000051"); + } + bankCardMapper.updateByPrimaryKeySelective(account.getBankCard()); + idCardMapper.updateByPrimaryKeySelective(account.getIdcard()); + return new RespBody("000000"); + } + +// public RespBody channelAuditInfo(Integer userId){ +// TbPlussMerchantBaseInfo merchantBaseInfo = merchantBaseInfoMapper.selectByUserId(String.valueOf(userId)); +// if(merchantBaseInfo != null) { +// List merchantCodeList = merchantChannelStatusMapper.getByMerchantCodeList(merchantBaseInfo.getMerchantcode()); +// merchantCodeList +// } +// } } diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/SxfMccInfoService.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/SxfMccInfoService.java index 1c8dc2e..192597b 100644 --- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/SxfMccInfoService.java +++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/SxfMccInfoService.java @@ -8,10 +8,13 @@ import com.chaozhanggui.common.system.config.RespBody; import com.chaozhanggui.dao.system.dao.TbPlussBankCodeSxfMapper; import com.chaozhanggui.dao.system.dao.TbPlussSxfMccInfoMapper; import com.chaozhanggui.dao.system.entity.TbPlussSxfMccInfo; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * @author lyf @@ -22,8 +25,10 @@ public class SxfMccInfoService{ private TbPlussBankCodeSxfMapper bankCodeSxfMapper; public RespBody pageData(Integer current, Integer size,String keyWord){ - current = (current-1)*size; - return new RespBody("000000",bankCodeSxfMapper.pageData(current,size,keyWord)); + PageHelper.startPage(current,size); + List list = bankCodeSxfMapper.pageData(keyWord); + PageInfo pageInfo = new PageInfo(list); + return new RespBody("000000",pageInfo); } } diff --git a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussAccountMapper.java b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussAccountMapper.java index 68f33b7..51d5cbe 100644 --- a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussAccountMapper.java +++ b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussAccountMapper.java @@ -18,7 +18,7 @@ public interface TbPlussAccountMapper { TbPlussAccount selectByPrimaryKey(Integer id); TbPlussAccount selectByUser(@Param("userId") Integer userId, @Param("channelType")String channelType); TbPlussAccount selectByAccount(TbPlussAccount record); - + TbPlussAccount selectByAccountD1(@Param("userId") String userId,@Param("channelType") String channelType); int updateByPrimaryKeySelective(TbPlussAccount record); int updateByPrimaryKeyWithBLOBs(TbPlussAccount record); diff --git a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussBankCodeSxfMapper.java b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussBankCodeSxfMapper.java index cdc9cca..cbcb15d 100644 --- a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussBankCodeSxfMapper.java +++ b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussBankCodeSxfMapper.java @@ -21,7 +21,7 @@ public interface TbPlussBankCodeSxfMapper extends BaseMapper TbPlussBankCodeSxf selectByPrimaryKey(Integer id); - List pageData(@Param("current") Integer current, @Param("size") Integer size, @Param("keyWord") String keyWord); + List pageData(@Param("keyWord") String keyWord); int updateByPrimaryKeySelective(TbPlussBankCodeSxf record); diff --git a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussIdCardMapper.java b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussIdCardMapper.java index 3c1bbdd..d71828e 100644 --- a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussIdCardMapper.java +++ b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussIdCardMapper.java @@ -19,6 +19,9 @@ public interface TbPlussIdCardMapper { TbPlussIdCard selectByPrimaryKey(Integer id); TbPlussIdCard selectCertByUserId(Integer userId, String type); + Integer countByCertno(@Param("Certno") String Certno); + Integer countByAliasAndName(@Param("alias") String alias, @Param("merchantName") String merchantName); + int updateByPrimaryKeySelective(TbPlussIdCard record); int updateByPrimaryKey(TbPlussIdCard record); diff --git a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussMerchantBaseInfoMapper.java b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussMerchantBaseInfoMapper.java index 63f6834..3a07b29 100644 --- a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussMerchantBaseInfoMapper.java +++ b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussMerchantBaseInfoMapper.java @@ -3,6 +3,7 @@ package com.chaozhanggui.dao.system.dao; import com.chaozhanggui.dao.system.entity.TbPlussMerchantBaseInfo; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; @Component @@ -20,6 +21,8 @@ public interface TbPlussMerchantBaseInfoMapper { int updateByPrimaryKey(TbPlussMerchantBaseInfo record); + Integer countByIdCardNo(@Param("idCardNo") String idCardNo); + TbPlussMerchantBaseInfo selectByUserId(String userId); TbPlussMerchantBaseInfo selectByMerchantcode(String merchantcode); diff --git a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussMerchantChannelStatusMapper.java b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussMerchantChannelStatusMapper.java index 24397a5..1807774 100644 --- a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussMerchantChannelStatusMapper.java +++ b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussMerchantChannelStatusMapper.java @@ -32,6 +32,7 @@ public interface TbPlussMerchantChannelStatusMapper { TbPlussMerchantChannelStatus getByMerchantCode(@Param("merchantCode") String merchantCode,@Param("channel") String channel ); + List getByMerchantCodeList(@Param("merchantCode") String merchantCode); TbPlussMerchantChannelStatus getValidData(String merchantCode); diff --git a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/TbPlussMerchantBaseInfo.java b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/TbPlussMerchantBaseInfo.java index 4f3b46b..3f33044 100644 --- a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/TbPlussMerchantBaseInfo.java +++ b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/TbPlussMerchantBaseInfo.java @@ -92,6 +92,13 @@ public class TbPlussMerchantBaseInfo implements Serializable { private String appid; + private String provinceCode; + + private String cityCode; + + private String districtCode; + + private Date firsttradetime; private Date lasttradetime; @@ -99,6 +106,31 @@ public class TbPlussMerchantBaseInfo implements Serializable { private Byte splitflag; private Byte validflag; + + public String getProvinceCode() { + return provinceCode; + } + + public void setProvinceCode(String provinceCode) { + this.provinceCode = provinceCode; + } + + public String getCityCode() { + return cityCode; + } + + public void setCityCode(String cityCode) { + this.cityCode = cityCode; + } + + public String getDistrictCode() { + return districtCode; + } + + public void setDistrictCode(String districtCode) { + this.districtCode = districtCode; + } + @TableField(exist = false) private String picUrl1; @TableField(exist = false) diff --git a/newadmin/dao-api/src/main/resources/mapper/TbPlussAccountMapper.xml b/newadmin/dao-api/src/main/resources/mapper/TbPlussAccountMapper.xml index c7d315c..392e8de 100644 --- a/newadmin/dao-api/src/main/resources/mapper/TbPlussAccountMapper.xml +++ b/newadmin/dao-api/src/main/resources/mapper/TbPlussAccountMapper.xml @@ -96,6 +96,20 @@ + delete from tb_pluss_account where id = #{id,jdbcType=INTEGER} diff --git a/newadmin/dao-api/src/main/resources/mapper/TbPlussBankCodeSxfMapper.xml b/newadmin/dao-api/src/main/resources/mapper/TbPlussBankCodeSxfMapper.xml index a8f4505..d56f84b 100644 --- a/newadmin/dao-api/src/main/resources/mapper/TbPlussBankCodeSxfMapper.xml +++ b/newadmin/dao-api/src/main/resources/mapper/TbPlussBankCodeSxfMapper.xml @@ -34,7 +34,6 @@ OR F_father_txt LIKE #{keyWord} - LIMIT #{size} offSET #{current} delete from tb_pluss_bank_code_sxf diff --git a/newadmin/dao-api/src/main/resources/mapper/TbPlussIdCardMapper.xml b/newadmin/dao-api/src/main/resources/mapper/TbPlussIdCardMapper.xml index 19976e2..acffd86 100644 --- a/newadmin/dao-api/src/main/resources/mapper/TbPlussIdCardMapper.xml +++ b/newadmin/dao-api/src/main/resources/mapper/TbPlussIdCardMapper.xml @@ -42,6 +42,16 @@ AND `userType` = '03' Limit 1 + + delete from tb_pluss_id_card where id = #{id,jdbcType=INTEGER} diff --git a/newadmin/dao-api/src/main/resources/mapper/TbPlussMerchantBaseInfoMapper.xml b/newadmin/dao-api/src/main/resources/mapper/TbPlussMerchantBaseInfoMapper.xml index 90d4c62..6e55840 100644 --- a/newadmin/dao-api/src/main/resources/mapper/TbPlussMerchantBaseInfoMapper.xml +++ b/newadmin/dao-api/src/main/resources/mapper/TbPlussMerchantBaseInfoMapper.xml @@ -390,6 +390,15 @@ #{validflag,jdbcType=TINYINT}, + + #{provinceCode}, + + + #{cityCode}, + + + #{districtCode}, + @@ -410,9 +419,6 @@ merchantName = #{merchantname,jdbcType=VARCHAR}, - - merchantType = #{merchanttype,jdbcType=VARCHAR}, - productDesc = #{productdesc,jdbcType=VARCHAR}, @@ -422,9 +428,6 @@ mcc = #{mcc,jdbcType=VARCHAR}, - - mccName = #{mccname,jdbcType=VARCHAR}, - alias = #{alias,jdbcType=VARCHAR}, @@ -533,6 +536,15 @@ validFlag = #{validflag,jdbcType=TINYINT}, + + provinceCode=#{provinceCode}, + + + cityCode=#{cityCode}, + + + districtCode=#{districtCode}, + where id = #{id,jdbcType=INTEGER} @@ -594,4 +606,13 @@ + \ No newline at end of file diff --git a/newadmin/dao-api/src/main/resources/mapper/TbPlussMerchantChannelStatusMapper.xml b/newadmin/dao-api/src/main/resources/mapper/TbPlussMerchantChannelStatusMapper.xml index 14ec0b8..07f0508 100644 --- a/newadmin/dao-api/src/main/resources/mapper/TbPlussMerchantChannelStatusMapper.xml +++ b/newadmin/dao-api/src/main/resources/mapper/TbPlussMerchantChannelStatusMapper.xml @@ -409,4 +409,11 @@ order by id desc + \ No newline at end of file diff --git a/newadmin/dao-api/src/main/resources/mapper/TbPlussUserPromotionMapper.xml b/newadmin/dao-api/src/main/resources/mapper/TbPlussUserPromotionMapper.xml index 37deb14..1aadfd4 100644 --- a/newadmin/dao-api/src/main/resources/mapper/TbPlussUserPromotionMapper.xml +++ b/newadmin/dao-api/src/main/resources/mapper/TbPlussUserPromotionMapper.xml @@ -229,7 +229,7 @@ ) d LEFT JOIN view_base_order o ON d.user_id = o.userId WHERE - date_format( `o`.`createDt`, '%Y-%m-%d' ) = date_format(( curdate() - INTERVAL 1 DAY ), '%Y-%m-%d' )) m ON t.id = m.id + date_format( `o`.`createDt`, '%Y-%m-%d' ) = date_format(( curdate() - INTERVAL 0 DAY ), '%Y-%m-%d' )) m ON t.id = m.id JOIN ( SELECT * FROM view_merchant_profit_sum WHERE userId = #{userId} ) p