商家入驻接口开发
This commit is contained in:
parent
4110a3b6bc
commit
dd70d27c39
@ -30,4 +30,8 @@ mall-im
|
||||
docker ps -aq | xargs docker inspect --format='{{.LogPath}}' | xargs truncate -s 0
|
||||
|
||||
查看哪个文件夹占空间
|
||||
du -sh * | sort -h
|
||||
du -sh * | sort -h
|
||||
|
||||
找到日志文件,清空:
|
||||
#find . -name "*.log" -type f -exec rm -rf {} \;
|
||||
cat /dev/null > 日志文件名
|
||||
@ -53,6 +53,10 @@ public class LoginController extends BaseControllerImpl {
|
||||
@ApiImplicitParam(name = "user_account", value = "账号", paramType = "query", required = false, dataType = "String"),
|
||||
@ApiImplicitParam(name = "user_password", value = "密码", paramType = "query", required = false, dataType = "String"),
|
||||
})
|
||||
|
||||
/**
|
||||
* 移动端登录
|
||||
*/
|
||||
@RequestMapping(value = "/doLogin", method = RequestMethod.GET)
|
||||
public CommonResult doLogin(@RequestParam(name = "user_account", required = false) String user_account,
|
||||
@RequestParam(name = "user_password", required = false) String user_password) {
|
||||
@ -70,7 +74,7 @@ public class LoginController extends BaseControllerImpl {
|
||||
CommonResult result = accountUserBaseService.login(params);
|
||||
|
||||
//user_account判断是否手机号
|
||||
if (result.getStatus() != 200 && Validator.isNumber(user_account)) {
|
||||
if (result != null && result.getStatus() != 200L && Validator.isNumber(user_account)) {
|
||||
user_account = CommonConstant.IDD_ZH_CN + user_account;
|
||||
if (PhoneNumberUtils.isValidNumber(user_account)) {
|
||||
//尝试手机号绑定登录
|
||||
|
||||
@ -0,0 +1,71 @@
|
||||
/*
|
||||
* Copyright (c) 2025. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
|
||||
* Morbi non lorem porttitor neque feugiat blandit. Ut vitae ipsum eget quam lacinia accumsan.
|
||||
* Etiam sed turpis ac ipsum condimentum fringilla. Maecenas magna.
|
||||
* Proin dapibus sapien vel ante. Aliquam erat volutpat. Pellentesque sagittis ligula eget metus.
|
||||
* Vestibulum commodo. Ut rhoncus gravida arcu.
|
||||
*/
|
||||
|
||||
package com.suisung.mall.common.modules.global;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Accessors(chain = true)
|
||||
@TableName("global_banks")
|
||||
@ApiModel(value = "GlobalBanks 公共中国银行实体", description = "公共中国银行实体表")
|
||||
public class GlobalBanks implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty(value = "自增ID")
|
||||
@TableId(value = "id", type = IdType.INPUT)
|
||||
private Long id;
|
||||
|
||||
@ApiModelProperty(value = "区域编号")
|
||||
private String region_code;
|
||||
|
||||
@ApiModelProperty(value = "区域名")
|
||||
private String region_name;
|
||||
|
||||
@ApiModelProperty(value = "编号")
|
||||
private String bank_code;
|
||||
|
||||
@ApiModelProperty(value = "名称")
|
||||
private String bank_name;
|
||||
|
||||
@ApiModelProperty(value = "名字简称")
|
||||
private String bank_abbr_name;
|
||||
|
||||
@ApiModelProperty(value = "公司")
|
||||
private String company;
|
||||
|
||||
@ApiModelProperty(value = "排序")
|
||||
private Integer seq;
|
||||
|
||||
@ApiModelProperty(value = "创立时间")
|
||||
private String est_date;
|
||||
|
||||
@ApiModelProperty(value = "简介")
|
||||
private String intro;
|
||||
|
||||
@ApiModelProperty(value = "状态,0:无效,1:有效")
|
||||
private Integer status;
|
||||
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
private Date created_at;
|
||||
|
||||
@ApiModelProperty(value = "更新时间")
|
||||
private Date updated_at;
|
||||
}
|
||||
@ -0,0 +1,41 @@
|
||||
/*
|
||||
* Copyright (c) 2025. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
|
||||
* Morbi non lorem porttitor neque feugiat blandit. Ut vitae ipsum eget quam lacinia accumsan.
|
||||
* Etiam sed turpis ac ipsum condimentum fringilla. Maecenas magna.
|
||||
* Proin dapibus sapien vel ante. Aliquam erat volutpat. Pellentesque sagittis ligula eget metus.
|
||||
* Vestibulum commodo. Ut rhoncus gravida arcu.
|
||||
*/
|
||||
|
||||
package com.suisung.mall.shop.global.controller.mobile;
|
||||
|
||||
import com.suisung.mall.common.api.CommonResult;
|
||||
import com.suisung.mall.common.modules.global.GlobalBanks;
|
||||
import com.suisung.mall.common.service.impl.BaseControllerImpl;
|
||||
import com.suisung.mall.shop.global.service.BanksService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMethod;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
@Api(tags = "店铺基础信息表")
|
||||
@RestController
|
||||
@RequestMapping("/mobile/shop/global")
|
||||
public class BanksController extends BaseControllerImpl {
|
||||
|
||||
@Resource
|
||||
private BanksService banksService;
|
||||
|
||||
|
||||
@ApiOperation(value = "国内大陆的银行列表", notes = "国内大陆的银行列表")
|
||||
@RequestMapping(value = "/banks/list", method = RequestMethod.POST)
|
||||
public CommonResult shopStoreBusinessCategoryList() {
|
||||
List<GlobalBanks> list = banksService.selectList("CN");
|
||||
return CommonResult.success(list);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
/*
|
||||
* Copyright (c) 2025. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
|
||||
* Morbi non lorem porttitor neque feugiat blandit. Ut vitae ipsum eget quam lacinia accumsan.
|
||||
* Etiam sed turpis ac ipsum condimentum fringilla. Maecenas magna.
|
||||
* Proin dapibus sapien vel ante. Aliquam erat volutpat. Pellentesque sagittis ligula eget metus.
|
||||
* Vestibulum commodo. Ut rhoncus gravida arcu.
|
||||
*/
|
||||
|
||||
package com.suisung.mall.shop.global.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.suisung.mall.common.modules.global.GlobalBanks;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@Component
|
||||
public interface BanksMapper extends BaseMapper<GlobalBanks> {
|
||||
}
|
||||
@ -0,0 +1,24 @@
|
||||
/*
|
||||
* Copyright (c) 2025. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
|
||||
* Morbi non lorem porttitor neque feugiat blandit. Ut vitae ipsum eget quam lacinia accumsan.
|
||||
* Etiam sed turpis ac ipsum condimentum fringilla. Maecenas magna.
|
||||
* Proin dapibus sapien vel ante. Aliquam erat volutpat. Pellentesque sagittis ligula eget metus.
|
||||
* Vestibulum commodo. Ut rhoncus gravida arcu.
|
||||
*/
|
||||
|
||||
package com.suisung.mall.shop.global.service;
|
||||
|
||||
import com.suisung.mall.common.modules.global.GlobalBanks;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface BanksService {
|
||||
|
||||
/**
|
||||
* 根据区域编号查询有效的记录列表
|
||||
*
|
||||
* @param regionCode
|
||||
* @return
|
||||
*/
|
||||
List<GlobalBanks> selectList(String regionCode);
|
||||
}
|
||||
@ -0,0 +1,41 @@
|
||||
/*
|
||||
* Copyright (c) 2025. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
|
||||
* Morbi non lorem porttitor neque feugiat blandit. Ut vitae ipsum eget quam lacinia accumsan.
|
||||
* Etiam sed turpis ac ipsum condimentum fringilla. Maecenas magna.
|
||||
* Proin dapibus sapien vel ante. Aliquam erat volutpat. Pellentesque sagittis ligula eget metus.
|
||||
* Vestibulum commodo. Ut rhoncus gravida arcu.
|
||||
*/
|
||||
|
||||
package com.suisung.mall.shop.global.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.suisung.mall.common.constant.CommonConstant;
|
||||
import com.suisung.mall.common.modules.global.GlobalBanks;
|
||||
import com.suisung.mall.core.web.service.impl.BaseServiceImpl;
|
||||
import com.suisung.mall.shop.global.mapper.BanksMapper;
|
||||
import com.suisung.mall.shop.global.service.BanksService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class BanksServiceImpl extends BaseServiceImpl<BanksMapper, GlobalBanks> implements BanksService {
|
||||
/**
|
||||
* 根据区域编号查询有效记录列表
|
||||
*
|
||||
* @param regionCode
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<GlobalBanks> selectList(String regionCode) {
|
||||
QueryWrapper<GlobalBanks> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("status", CommonConstant.Enable);
|
||||
if (regionCode != null) {
|
||||
queryWrapper.eq("region_code", regionCode);
|
||||
}
|
||||
queryWrapper.orderByAsc("seq");
|
||||
queryWrapper.select("id", "region_code", "region_name", "bank_code", "bank_name", "bank_abbr_name", "company", "est_date");
|
||||
|
||||
return list(queryWrapper);
|
||||
}
|
||||
}
|
||||
@ -38,6 +38,7 @@ public class ShopMerchEntryController extends BaseControllerImpl {
|
||||
return shopMerchEntryService.storeBusinessCategoryList();
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation(value = "商家申请入驻商城平台", notes = "商家申请入驻商城平台")
|
||||
@RequestMapping(value = "/apply", method = RequestMethod.POST)
|
||||
public CommonResult shopMerchEntryApply(@RequestBody JSONObject shopMerchEntryJSON) {
|
||||
|
||||
@ -116,7 +116,6 @@ public class ShopMerchEntryServiceImpl extends BaseServiceImpl<ShopMerchEntryMap
|
||||
}
|
||||
|
||||
if (StrUtil.isNotBlank(record.getLogin_mobile())) {
|
||||
// String mobile = StrUtil.startWith(record.getLogin_mobile(), "+") ? record.getLogin_mobile() : CommonConstant.IDD_ZH_CN + record.getLogin_mobile();
|
||||
if (!PhoneNumberUtils.checkPhoneNumber(record.getLogin_mobile())) {
|
||||
return CommonResult.failed("申请人手机号码有误!");
|
||||
}
|
||||
@ -163,6 +162,8 @@ public class ShopMerchEntryServiceImpl extends BaseServiceImpl<ShopMerchEntryMap
|
||||
return CommonResult.failed("入驻信息提交失败!");
|
||||
}
|
||||
|
||||
// TODO 发送短信给管理员和商家
|
||||
|
||||
return CommonResult.success();
|
||||
}
|
||||
|
||||
@ -268,6 +269,8 @@ public class ShopMerchEntryServiceImpl extends BaseServiceImpl<ShopMerchEntryMap
|
||||
return CommonResult.failed("审批状态有误!");
|
||||
}
|
||||
|
||||
// TODO 已经审核通过的,不能再审核了。
|
||||
|
||||
if (approvalStatus.equals(1) && StrUtil.isBlank(approvalRemark)) {
|
||||
approvalRemark = "审核通过,后续将到签署电子合同流程。";
|
||||
} else if (approvalStatus.equals(2) && StrUtil.isBlank(approvalRemark)) {
|
||||
@ -283,6 +286,8 @@ public class ShopMerchEntryServiceImpl extends BaseServiceImpl<ShopMerchEntryMap
|
||||
return CommonResult.failed("审批出错,请联系管理员!");
|
||||
}
|
||||
|
||||
// TODO 审核通过后,去拉卡拉进件,即时发送短信给商家,通知去签电子合同
|
||||
|
||||
return CommonResult.success();
|
||||
}
|
||||
|
||||
|
||||
@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.suisung.mall.shop.global.mapper.BanksMapper">
|
||||
<!-- 通用查询结果列 -->
|
||||
<sql id="Base_Column_List">
|
||||
*
|
||||
</sql>
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue
Block a user