From dd70d27c394b4426198f63c99acfd004da719915 Mon Sep 17 00:00:00 2001 From: Jack <46790855@qq.com> Date: Sun, 23 Feb 2025 12:35:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=AE=B6=E5=85=A5=E9=A9=BB=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.MD | 6 +- .../account/controller/LoginController.java | 6 +- .../common/modules/global/GlobalBanks.java | 71 +++++++++++++++++++ .../controller/mobile/BanksController.java | 41 +++++++++++ .../mall/shop/global/mapper/BanksMapper.java | 17 +++++ .../shop/global/service/BanksService.java | 24 +++++++ .../global/service/impl/BanksServiceImpl.java | 41 +++++++++++ .../mobile/ShopMerchEntryController.java | 1 + .../impl/ShopMerchEntryServiceImpl.java | 7 +- .../mapper/global/ShopMerchEntryMapper.xml | 8 +++ 10 files changed, 219 insertions(+), 3 deletions(-) create mode 100644 mall-common/src/main/java/com/suisung/mall/common/modules/global/GlobalBanks.java create mode 100644 mall-shop/src/main/java/com/suisung/mall/shop/global/controller/mobile/BanksController.java create mode 100644 mall-shop/src/main/java/com/suisung/mall/shop/global/mapper/BanksMapper.java create mode 100644 mall-shop/src/main/java/com/suisung/mall/shop/global/service/BanksService.java create mode 100644 mall-shop/src/main/java/com/suisung/mall/shop/global/service/impl/BanksServiceImpl.java create mode 100644 mall-shop/src/main/resources/mapper/global/ShopMerchEntryMapper.xml diff --git a/README.MD b/README.MD index 4f71b230..8c66b576 100644 --- a/README.MD +++ b/README.MD @@ -30,4 +30,8 @@ mall-im docker ps -aq | xargs docker inspect --format='{{.LogPath}}' | xargs truncate -s 0 查看哪个文件夹占空间 -du -sh * | sort -h \ No newline at end of file +du -sh * | sort -h + +找到日志文件，清空： +#find . -name "*.log" -type f -exec rm -rf {} \; +cat /dev/null > 日志文件名 \ No newline at end of file diff --git a/mall-account/src/main/java/com/suisung/mall/account/controller/LoginController.java b/mall-account/src/main/java/com/suisung/mall/account/controller/LoginController.java index 6b5b1b55..b825abad 100644 --- a/mall-account/src/main/java/com/suisung/mall/account/controller/LoginController.java +++ b/mall-account/src/main/java/com/suisung/mall/account/controller/LoginController.java @@ -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)) { //尝试手机号绑定登录 diff --git a/mall-common/src/main/java/com/suisung/mall/common/modules/global/GlobalBanks.java b/mall-common/src/main/java/com/suisung/mall/common/modules/global/GlobalBanks.java new file mode 100644 index 00000000..fcc7d995 --- /dev/null +++ b/mall-common/src/main/java/com/suisung/mall/common/modules/global/GlobalBanks.java @@ -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; +} diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/global/controller/mobile/BanksController.java b/mall-shop/src/main/java/com/suisung/mall/shop/global/controller/mobile/BanksController.java new file mode 100644 index 00000000..2be35b4a --- /dev/null +++ b/mall-shop/src/main/java/com/suisung/mall/shop/global/controller/mobile/BanksController.java @@ -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 list = banksService.selectList("CN"); + return CommonResult.success(list); + } + + +} diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/global/mapper/BanksMapper.java b/mall-shop/src/main/java/com/suisung/mall/shop/global/mapper/BanksMapper.java new file mode 100644 index 00000000..d83ff1bf --- /dev/null +++ b/mall-shop/src/main/java/com/suisung/mall/shop/global/mapper/BanksMapper.java @@ -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 { +} diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/global/service/BanksService.java b/mall-shop/src/main/java/com/suisung/mall/shop/global/service/BanksService.java new file mode 100644 index 00000000..521f2a2a --- /dev/null +++ b/mall-shop/src/main/java/com/suisung/mall/shop/global/service/BanksService.java @@ -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 selectList(String regionCode); +} diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/global/service/impl/BanksServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/global/service/impl/BanksServiceImpl.java new file mode 100644 index 00000000..ead70b57 --- /dev/null +++ b/mall-shop/src/main/java/com/suisung/mall/shop/global/service/impl/BanksServiceImpl.java @@ -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 implements BanksService { + /** + * 根据区域编号查询有效记录列表 + * + * @param regionCode + * @return + */ + @Override + public List selectList(String regionCode) { + QueryWrapper 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); + } +} diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/merch/controller/mobile/ShopMerchEntryController.java b/mall-shop/src/main/java/com/suisung/mall/shop/merch/controller/mobile/ShopMerchEntryController.java index 18cb6797..9c0c712d 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/merch/controller/mobile/ShopMerchEntryController.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/merch/controller/mobile/ShopMerchEntryController.java @@ -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) { diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/merch/service/impl/ShopMerchEntryServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/merch/service/impl/ShopMerchEntryServiceImpl.java index 218c3157..fc52f4ba 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/merch/service/impl/ShopMerchEntryServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/merch/service/impl/ShopMerchEntryServiceImpl.java @@ -116,7 +116,6 @@ public class ShopMerchEntryServiceImpl extends BaseServiceImpl + + + + + * + +