diff --git a/DB/version4.2.5toMASTER.sql b/DB/version4.2.5toMASTER.sql index 1a211ecd0..2225ac59f 100644 --- a/DB/version4.2.5toMASTER.sql +++ b/DB/version4.2.5toMASTER.sql @@ -79,4 +79,12 @@ ALTER TABLE li_store ADD `self_pick_flag` bit(1) DEFAULT NULL; /** 历史足迹增加店铺Id */ -ALTER TABLE li_foot_print ADD `store_id` varchar(255) DEFAULT NULL COMMENT '店铺ID'; \ No newline at end of file +ALTER TABLE li_foot_print ADD `store_id` varchar(255) DEFAULT NULL COMMENT '店铺ID'; + + + +/** + 订单增加自提信息 + */ +ALTER TABLE li_member_withdraw_apply ADD `real_name` varchar(255) DEFAULT NULL; +ALTER TABLE li_member_withdraw_apply ADD `connect_number` varchar(255) DEFAULT NULL; diff --git a/buyer-api/src/main/java/cn/lili/controller/order/RechargeTradeBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/order/RechargeTradeBuyerController.java index e85cddbf9..7ea391718 100644 --- a/buyer-api/src/main/java/cn/lili/controller/order/RechargeTradeBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/order/RechargeTradeBuyerController.java @@ -10,6 +10,7 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -26,6 +27,7 @@ import javax.validation.constraints.Min; @RestController @Api(tags = "买家端,预存款充值记录接口") @RequestMapping("/buyer/trade/recharge") +@Validated public class RechargeTradeBuyerController { @Autowired @@ -37,7 +39,10 @@ public class RechargeTradeBuyerController { @ApiImplicitParams({ @ApiImplicitParam(name = "price", value = "充值金额", required = true, dataType = "double", paramType = "query") }) - public ResultMessage create(@Max(value = 10000, message = "充值金额单次最多允许充值10000元") @Min(value = 1, message = "充值金额单次最少充值金额为1元") Double price) { + public ResultMessage create( + @Max(value = 10000, message = "充值金额单次最多允许充值10000元") + @Min(value = 1, message = "充值金额单次最少充值金额为1元") + Double price) { Recharge recharge = this.rechargeService.recharge(price); return ResultUtil.data(recharge); } diff --git a/buyer-api/src/main/java/cn/lili/controller/wallet/MemberWalletBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/wallet/MemberWalletBuyerController.java index 4e330d5d8..bfd38145c 100644 --- a/buyer-api/src/main/java/cn/lili/controller/wallet/MemberWalletBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/wallet/MemberWalletBuyerController.java @@ -27,6 +27,7 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.validation.constraints.Max; @@ -41,6 +42,7 @@ import javax.validation.constraints.Pattern; @RestController @Api(tags = "买家端,会员余额接口") @RequestMapping("/buyer/wallet/wallet") +@Validated public class MemberWalletBuyerController { /** diff --git a/docs/diagram/OrderComplaintBuyerController.uml b/docs/diagram/OrderComplaintBuyerController.uml new file mode 100644 index 000000000..03d082189 --- /dev/null +++ b/docs/diagram/OrderComplaintBuyerController.uml @@ -0,0 +1,50 @@ + + + JAVA + cn.lili.controller.order.OrderComplaintBuyerController + + cn.lili.modules.order.order.service.OrderComplaintCommunicationService + cn.lili.controller.order.OrderComplaintStoreController + cn.lili.modules.order.order.service.OrderComplaintService + cn.lili.controller.order.OrderComplaintBuyerController + cn.lili.controller.order.OrderComplaintManagerController + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Inner Classes + Methods + Properties + + All + private + + diff --git a/docs/uml/AfterSaleRefundGodos.puml b/docs/uml/AfterSaleRefundGodos.puml new file mode 100644 index 000000000..17092a7e3 --- /dev/null +++ b/docs/uml/AfterSaleRefundGodos.puml @@ -0,0 +1,20 @@ +@startuml +'https://plantuml.com/sequence-diagram + +actor user +actor seller +actor manager + +user --> 平台: 申请售后 +seller -> 平台: 审核售后申请 +activate 平台 +平台 -> 平台: 更新售后状态 +return 售后审核响应 + +user -> 平台: 填写物流信息 +seller->平台: 确认收货 +activate 平台 +平台 -> 平台: 自动退款 +return 售后审核响应 +平台 -> user: 售后结束 +@enduml \ No newline at end of file diff --git a/docs/uml/AfterSaleRefundMoney.puml b/docs/uml/AfterSaleRefundMoney.puml new file mode 100644 index 000000000..2b75c6638 --- /dev/null +++ b/docs/uml/AfterSaleRefundMoney.puml @@ -0,0 +1,16 @@ +@startuml +'https://plantuml.com/sequence-diagram + +actor user +actor seller +actor manager + +user --> 平台: 申请售后 +seller -> 平台: 审核售后申请 +activate 平台 +平台 -> 平台: 通过审核，自动退款 +manager --> 平台: 审核阶段可介入操作 +return 售后审核响应 + +user -> 平台: 查询售后结果 +@enduml \ No newline at end of file diff --git a/docs/uml/Complaint.puml b/docs/uml/Complaint.puml new file mode 100644 index 000000000..eb768b2eb --- /dev/null +++ b/docs/uml/Complaint.puml @@ -0,0 +1,21 @@ +@startuml +'https://plantuml.com/sequence-diagram + +actor user +actor seller +actor manager + +activate 平台 +user -> 平台: 输入原因，发起投诉 +user --> 平台: 多次输出对话 +seller --> 平台: 多次输出对话 +manager --> 平台: 多次输出对话 +manager -> 平台: 根据各方意见，仲裁投诉结果 +activate 平台 +平台->平台: 仲裁结果，更新状态 + +平台 -> seller: 根据平台仲裁结果进行处理 +平台 -> user: 根据平台仲裁结果进行处理 +deactivate 平台 + +@enduml \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/common/enums/ResultCode.java b/framework/src/main/java/cn/lili/common/enums/ResultCode.java index e31369e52..40b2df221 100644 --- a/framework/src/main/java/cn/lili/common/enums/ResultCode.java +++ b/framework/src/main/java/cn/lili/common/enums/ResultCode.java @@ -221,7 +221,7 @@ public enum ResultCode { PAY_POINT_ENOUGH(32010, "积分不足，不能兑换"), PAY_NOT_EXIST_ORDER(32011, "支付订单不存在"), CAN_NOT_RECHARGE_WALLET(32012, "不能使用余额进行充值"), - + RECHARGE_PRICE_ERROR(32013, "充值金额错误"), /** * 售后 @@ -260,7 +260,7 @@ public enum ResultCode { WALLET_EXIT_ERROR(34005, "钱包已存在，无法重复创建"), WALLET_APPLY_ERROR(34006, "提现申请异常！"), WALLET_APPLY_MIN_PRICE_ERROR(34007, "提现最低提现金额错误!"), - + WALLET_WITHDRAWAL_AMOUNT_ERROR(34008, "申请提现金额异常！"), /** * 评价 */ @@ -503,6 +503,7 @@ public enum ResultCode { PURCHASE_ORDER_DEADLINE_ERROR(90004, "供求单，已超过报名截止时间"), INDEX_BUILDING(90005, "索引正在生成"); + private final Integer code; private final String message; diff --git a/framework/src/main/java/cn/lili/modules/wallet/serviceimpl/MemberWalletServiceImpl.java b/framework/src/main/java/cn/lili/modules/wallet/serviceimpl/MemberWalletServiceImpl.java index 266619fb3..f2943876f 100644 --- a/framework/src/main/java/cn/lili/modules/wallet/serviceimpl/MemberWalletServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/wallet/serviceimpl/MemberWalletServiceImpl.java @@ -257,6 +257,9 @@ public class MemberWalletServiceImpl extends ServiceImpl 1000000) { + throw new ServiceException(ResultCode.WALLET_WITHDRAWAL_AMOUNT_ERROR); + } AuthUser authUser = UserContext.getCurrentUser(); //校验金额是否满足提现，因为是从余额扣减，所以校验的是余额 @@ -312,7 +315,6 @@ public class MemberWalletServiceImpl extends ServiceImpl i @Override public Recharge recharge(Double price) { + + if (price == null || price <= 0 || price > 1000000) { + throw new ServiceException(ResultCode.RECHARGE_PRICE_ERROR); + } + //获取当前登录的会员 AuthUser authUser = UserContext.getCurrentUser(); //构建sn diff --git a/manager-api/src/main/java/cn/lili/controller/other/ElasticsearchController.java b/manager-api/src/main/java/cn/lili/controller/other/ElasticsearchController.java index 2fff6aa76..89d878b33 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/ElasticsearchController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/ElasticsearchController.java @@ -6,7 +6,6 @@ import cn.lili.modules.search.service.EsGoodsIndexService; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -24,11 +23,6 @@ import java.util.Map; @RequestMapping("/manager/other/elasticsearch") public class ElasticsearchController { - - @PostMapping - public ResultMessage corporateBankInit(int i) { - return ResultUtil.success(); - } @Autowired private EsGoodsIndexService esGoodsIndexService;