czg_team/newadmin
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

收银点

Browse Source
This commit is contained in:
19991905653
2024-02-29 13:40:23 +08:00
parent 1215911372
commit d1b45d4fc8
2 changed files with 88 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
newadmin/dao-api/src/main/resources/mapper/TbPlussMerchantCashPlaceMapper.xml
View File

@@ -196,152 +196,5 @@
pay_passage_name = #{payPassageName,jdbcType=VARCHAR} pay_passage_name = #{payPassageName,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
<resultMap id="BaseResultMap" type="com.chaozhanggui.dao.system.entity.TbPlussMerchantCashPlace">
<id column="id" jdbcType="INTEGER" property="id" />
<result column="logo" jdbcType="VARCHAR" property="logo" />
<result column="userId" jdbcType="INTEGER" property="userid" />
<result column="bindingCode" jdbcType="VARCHAR" property="bindingcode" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="code" jdbcType="VARCHAR" property="code" />
<result column="address" jdbcType="VARCHAR" property="address" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="createTime" jdbcType="TIMESTAMP" property="createtime" />
<result column="updateTime" jdbcType="TIMESTAMP" property="updatetime" />
</resultMap>
<sql id="Base_Column_List">
id, logo, userId, bindingCode, name, code, address, remark, createTime, updateTime
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from tb_pluss_merchant_cash_place
where id = #{id,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from tb_pluss_merchant_cash_place
where id = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.chaozhanggui.dao.system.entity.TbPlussMerchantCashPlace">
insert into tb_pluss_merchant_cash_place (id, logo, userId,
bindingCode, name, code,
address, remark, createTime,
updateTime)
values (#{id,jdbcType=INTEGER}, #{logo,jdbcType=VARCHAR}, #{userid,jdbcType=INTEGER},
#{bindingcode,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR},
#{address,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{createtime,jdbcType=TIMESTAMP},
#{updatetime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.chaozhanggui.dao.system.entity.TbPlussMerchantCashPlace">
insert into tb_pluss_merchant_cash_place
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="logo != null">
logo,
</if>
<if test="userid != null">
userId,
</if>
<if test="bindingcode != null">
bindingCode,
</if>
<if test="name != null">
name,
</if>
<if test="code != null">
code,
</if>
<if test="address != null">
address,
</if>
<if test="remark != null">
remark,
</if>
<if test="createtime != null">
createTime,
</if>
<if test="updatetime != null">
updateTime,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=INTEGER},
</if>
<if test="logo != null">
#{logo,jdbcType=VARCHAR},
</if>
<if test="userid != null">
#{userid,jdbcType=INTEGER},
</if>
<if test="bindingcode != null">
#{bindingcode,jdbcType=VARCHAR},
</if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
<if test="code != null">
#{code,jdbcType=VARCHAR},
</if>
<if test="address != null">
#{address,jdbcType=VARCHAR},
</if>
<if test="remark != null">
#{remark,jdbcType=VARCHAR},
</if>
<if test="createtime != null">
#{createtime,jdbcType=TIMESTAMP},
</if>
<if test="updatetime != null">
#{updatetime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.chaozhanggui.dao.system.entity.TbPlussMerchantCashPlace">
update tb_pluss_merchant_cash_place
<set>
<if test="logo != null">
logo = #{logo,jdbcType=VARCHAR},
</if>
<if test="userid != null">
userId = #{userid,jdbcType=INTEGER},
</if>
<if test="bindingcode != null">
bindingCode = #{bindingcode,jdbcType=VARCHAR},
</if>
<if test="name != null">
name = #{name,jdbcType=VARCHAR},
</if>
<if test="code != null">
code = #{code,jdbcType=VARCHAR},
</if>
<if test="address != null">
address = #{address,jdbcType=VARCHAR},
</if>
<if test="remark != null">
remark = #{remark,jdbcType=VARCHAR},
</if>
<if test="createtime != null">
createTime = #{createtime,jdbcType=TIMESTAMP},
</if>
<if test="updatetime != null">
updateTime = #{updatetime,jdbcType=TIMESTAMP},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.chaozhanggui.dao.system.entity.TbPlussMerchantCashPlace">
update tb_pluss_merchant_cash_place
set logo = #{logo,jdbcType=VARCHAR},
userId = #{userid,jdbcType=INTEGER},
bindingCode = #{bindingcode,jdbcType=VARCHAR},
name = #{name,jdbcType=VARCHAR},
code = #{code,jdbcType=VARCHAR},
address = #{address,jdbcType=VARCHAR},
remark = #{remark,jdbcType=VARCHAR},
createTime = #{createtime,jdbcType=TIMESTAMP},
updateTime = #{updatetime,jdbcType=TIMESTAMP}
where id = #{id,jdbcType=INTEGER}
</update>
</mapper> </mapper>

25
newadmin/merchant-service-api/src/main/java/com/chaozhanggui/merchant/service/HfMerService.java
View File

@@ -1768,6 +1768,7 @@ public class HfMerService {
} }
@Autowired @Autowired
TbPlussMerchantCashPlaceMapper merchantCashPlaceMapper; TbPlussMerchantCashPlaceMapper merchantCashPlaceMapper;
@Autowired @Autowired
@@ -1890,7 +1891,6 @@ public class HfMerService {
request.put("accountOpeningPermitId", map.get("accountOpeningPermitId"));//开户许可证图片 request.put("accountOpeningPermitId", map.get("accountOpeningPermitId"));//开户许可证图片
Map<String, Object> merchantResident = null; Map<String, Object> merchantResident = null;
try { try {
merchantResident = MerchantResident.auditProfileInfo(request); merchantResident = MerchantResident.auditProfileInfo(request);
@@ -2542,6 +2542,8 @@ public class HfMerService {
List<TbPlussMerchantBaseInfo> list = merchantBaseInfoMapper.selectListByCode(mcs.getMerchantcode()); List<TbPlussMerchantBaseInfo> list = merchantBaseInfoMapper.selectListByCode(mcs.getMerchantcode());
if (list.size() > 0) { if (list.size() > 0) {
TbPlussMerchantBaseInfo merchantBaseInfo = list.iterator().next(); TbPlussMerchantBaseInfo merchantBaseInfo = list.iterator().next();
TbPlussUserInfo userInfo = tbPlussUserInfoMapper.selectByPrimaryKey(Long.valueOf(merchantBaseInfo.getUserid()));
if (Objects.nonNull(userInfo) && !userInfo.getLoginname().contains("-")) {
TbPlussMerchantCashPlace merchantCashPlace = new TbPlussMerchantCashPlace(); TbPlussMerchantCashPlace merchantCashPlace = new TbPlussMerchantCashPlace();
merchantCashPlace.setAddress(merchantBaseInfo.getAddress()); merchantCashPlace.setAddress(merchantBaseInfo.getAddress());
merchantCashPlace.setUserid(merchantBaseInfo.getUserid()); merchantCashPlace.setUserid(merchantBaseInfo.getUserid());
@@ -2556,7 +2558,7 @@ public class HfMerService {
merchantCashPlace.setRootAccountId(merchantBaseInfo.getUserid()); merchantCashPlace.setRootAccountId(merchantBaseInfo.getUserid());
merchantCashPlace.setCode(getCode()); merchantCashPlace.setCode(getCode());
merchantCashPlaceMapper.insert(merchantCashPlace); merchantCashPlaceMapper.insert(merchantCashPlace);
TbPlussUserInfo userInfo = tbPlussUserInfoMapper.selectByPrimaryKey(Long.valueOf(merchantBaseInfo.getUserid())); // TbPlussUserInfo userInfo = tbPlussUserInfoMapper.selectByPrimaryKey(Long.valueOf(merchantBaseInfo.getUserid()));
TbPlussUserCashPlace childUserCashPlace = new TbPlussUserCashPlace(); TbPlussUserCashPlace childUserCashPlace = new TbPlussUserCashPlace();
childUserCashPlace.setChasplaceId(merchantCashPlace.getId()); childUserCashPlace.setChasplaceId(merchantCashPlace.getId());
childUserCashPlace.setCreatetime(new Date()); childUserCashPlace.setCreatetime(new Date());
@@ -2566,14 +2568,18 @@ public class HfMerService {
childUserCashPlace.setUserId(userInfo.getId().intValue()); childUserCashPlace.setUserId(userInfo.getId().intValue());
userCashPlaceMapper.insert(childUserCashPlace); userCashPlaceMapper.insert(childUserCashPlace);
} }
} }
} }
}
public String getCode() { public String getCode() {
String randomDigits = generateRandomDigits(2); String randomDigits = generateRandomDigits(2);
String randomLetters = generateRandomLetters(6); String randomLetters = generateRandomLetters(6);
String randomString = randomDigits + randomLetters; String randomString = randomDigits + randomLetters;
return randomString; return randomString;
} }
// 生成n位随机数字 // 生成n位随机数字
private static String generateRandomDigits(int n) { private static String generateRandomDigits(int n) {
Random random = new Random(); Random random = new Random();
@@ -2598,6 +2604,7 @@ public class HfMerService {
return sb.toString(); return sb.toString();
} }
public void authInfo(String requestId) { public void authInfo(String requestId) {
TbPlussMerchantAuditRecord record = tbPlussMerchantAuditRecordMapper.selectByApplicationid(requestId); TbPlussMerchantAuditRecord record = tbPlussMerchantAuditRecordMapper.selectByApplicationid(requestId);
if (ObjectUtil.isNotEmpty(record)) { if (ObjectUtil.isNotEmpty(record)) {
@@ -2618,9 +2625,6 @@ public class HfMerService {
tbPlussMerchantChannelStatusMapper.updateByPrimaryKeySelective(channelStatus); tbPlussMerchantChannelStatusMapper.updateByPrimaryKeySelective(channelStatus);
Map map = null; Map map = null;
//上传证照 //上传证照
TbPlussMerchantBaseInfo baseInfo = tbPlussMerchantBaseInfoMapper.selectByMerchantcode(record.getMerchantcode()); TbPlussMerchantBaseInfo baseInfo = tbPlussMerchantBaseInfoMapper.selectByMerchantcode(record.getMerchantcode());
@@ -2672,7 +2676,6 @@ public class HfMerService {
} }
// cz = HfMerService.fileUpload(bankCard.getImgurl(), "05", record.getMerchantid()); // cz = HfMerService.fileUpload(bankCard.getImgurl(), "05", record.getMerchantid());
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
TbPlussMerchantImage image = tbPlussMerchantImageMapper.selectByMerchantCodeType(baseInfo.getMerchantcode(), "06"); TbPlussMerchantImage image = tbPlussMerchantImageMapper.selectByMerchantCodeType(baseInfo.getMerchantcode(), "06");
@@ -2885,7 +2888,6 @@ public class HfMerService {
tbPlussMerchantAuditRecordMapper.insert(merchantAuditRecord); tbPlussMerchantAuditRecordMapper.insert(merchantAuditRecord);
tbPlussMerchantHfInfo.setStatus("2"); //商户入驻待审核 tbPlussMerchantHfInfo.setStatus("2"); //商户入驻待审核
tbPlussMerchantHfInfo.setUpdateTime(new Date()); tbPlussMerchantHfInfo.setUpdateTime(new Date());
tbPlussMerchantHfInfoMapper.updateByPrimaryKey(tbPlussMerchantHfInfo); tbPlussMerchantHfInfoMapper.updateByPrimaryKey(tbPlussMerchantHfInfo);
@@ -2899,11 +2901,6 @@ public class HfMerService {
} }
public void modifySettle(String userId) { public void modifySettle(String userId) {
@@ -2919,7 +2916,6 @@ public class HfMerService {
MsgException.checkNull(account, "结算信息未提交"); MsgException.checkNull(account, "结算信息未提交");
TbPlussBankCard bankCard = tbPlussBankCardMapper.selectByPrimaryKey(Integer.valueOf(account.getBankcardid())); TbPlussBankCard bankCard = tbPlussBankCardMapper.selectByPrimaryKey(Integer.valueOf(account.getBankcardid()));
MsgException.checkNull(bankCard, "结算卡信息未提交"); MsgException.checkNull(bankCard, "结算卡信息未提交");
@@ -2964,9 +2960,6 @@ public class HfMerService {
} }
@Scheduled(initialDelay = 1000, fixedDelay = 10000) @Scheduled(initialDelay = 1000, fixedDelay = 10000)
public void queryMerchantResident() { public void queryMerchantResident() {
List<TbPlussMerchantAuditRecord> records = tbPlussMerchantAuditRecordMapper.selectByStatus(); List<TbPlussMerchantAuditRecord> records = tbPlussMerchantAuditRecordMapper.selectByStatus();