合并master,解决冲突

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';
+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;

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<Recharge> create(@Max(value = 10000, message = "充值金额单次最多允许充值10000元") @Min(value = 1, message = "充值金额单次最少充值金额为1元") Double price) {
+    public ResultMessage<Recharge> create(
+            @Max(value = 10000, message = "充值金额单次最多允许充值10000元")
+            @Min(value = 1, message = "充值金额单次最少充值金额为1元")
+            Double price) {
         Recharge recharge = this.rechargeService.recharge(price);
         return ResultUtil.data(recharge);
     }

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 {
 
     /**

docs/diagram/OrderComplaintBuyerController.uml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Diagram>
+  <ID>JAVA</ID>
+  <OriginalElement>cn.lili.controller.order.OrderComplaintBuyerController</OriginalElement>
+  <nodes>
+    <node x="-377.0" y="-206.0">cn.lili.modules.order.order.service.OrderComplaintCommunicationService</node>
+    <node x="-927.5" y="123.5">cn.lili.controller.order.OrderComplaintStoreController</node>
+    <node x="-378.0" y="607.0">cn.lili.modules.order.order.service.OrderComplaintService</node>
+    <node x="311.5" y="111.0">cn.lili.controller.order.OrderComplaintBuyerController</node>
+    <node x="-308.0" y="123.5">cn.lili.controller.order.OrderComplaintManagerController</node>
+  </nodes>
+  <notes />
+  <edges>
+    <edge source="cn.lili.controller.order.OrderComplaintStoreController" target="cn.lili.modules.order.order.service.OrderComplaintCommunicationService" relationship="TO_ONE">
+      <point x="278.0" y="-84.5" />
+      <point x="-330.0" y="38.5" />
+    </edge>
+    <edge source="cn.lili.controller.order.OrderComplaintStoreController" target="cn.lili.modules.order.order.service.OrderComplaintService" relationship="TO_ONE">
+      <point x="262.0" y="84.5" />
+      <point x="-300.0" y="-119.0" />
+    </edge>
+    <edge source="cn.lili.controller.order.OrderComplaintBuyerController" target="cn.lili.modules.order.order.service.OrderComplaintCommunicationService" relationship="TO_ONE">
+      <point x="-286.0" y="-73.0" />
+      <point x="345.0" y="38.5" />
+    </edge>
+    <edge source="cn.lili.controller.order.OrderComplaintBuyerController" target="cn.lili.modules.order.order.service.OrderComplaintService" relationship="TO_ONE">
+      <point x="0.0" y="73.0" />
+      <point x="606.5" y="726.0" />
+      <point x="307.5" y="0.0" />
+    </edge>
+    <edge source="cn.lili.controller.order.OrderComplaintManagerController" target="cn.lili.modules.order.order.service.OrderComplaintCommunicationService" relationship="TO_ONE">
+      <point x="-11.5" y="-84.5" />
+      <point x="0.0" y="38.5" />
+    </edge>
+    <edge source="cn.lili.controller.order.OrderComplaintManagerController" target="cn.lili.modules.order.order.service.OrderComplaintService" relationship="TO_ONE">
+      <point x="-57.5" y="84.5" />
+      <point x="0.0" y="-119.0" />
+    </edge>
+  </edges>
+  <settings layout="Hierarchic" zoom="1.0" showDependencies="true" x="-13.0" y="319.65625" />
+  <SelectedNodes />
+  <Categories>
+    <Category>Inner Classes</Category>
+    <Category>Methods</Category>
+    <Category>Properties</Category>
+  </Categories>
+  <SCOPE>All</SCOPE>
+  <VISIBILITY>private</VISIBILITY>
+</Diagram>
+

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

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

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

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;
 

framework/src/main/java/cn/lili/modules/wallet/serviceimpl/MemberWalletServiceImpl.java

@@ -257,6 +257,9 @@ public class MemberWalletServiceImpl extends ServiceImpl<MemberWalletMapper, Mem
     @Transactional(rollbackFor = Exception.class)
     public Boolean applyWithdrawal(Double price, String realName, String connectNumber) {
 
+        if (price == null || price <= 0 || price > 1000000) {
+            throw new ServiceException(ResultCode.WALLET_WITHDRAWAL_AMOUNT_ERROR);
+        }
         AuthUser authUser = UserContext.getCurrentUser();
 
         //校验金额是否满足提现，因为是从余额扣减，所以校验的是余额
@@ -312,7 +315,6 @@ public class MemberWalletServiceImpl extends ServiceImpl<MemberWalletMapper, Mem
     public Boolean withdrawal(String withdrawApplyId) {
         MemberWithdrawApply memberWithdrawApply = memberWithdrawApplyService.getById(withdrawApplyId);
         memberWithdrawApply.setInspectTime(new Date());
-
         //获取提现设置
         Setting setting = settingService.get(SettingEnum.WITHDRAWAL_SETTING.name());
         WithdrawalSetting withdrawalSetting = new Gson().fromJson(setting.getSettingValue(), WithdrawalSetting.class);

framework/src/main/java/cn/lili/modules/wallet/serviceimpl/RechargeServiceImpl.java

@@ -42,6 +42,11 @@ public class RechargeServiceImpl extends ServiceImpl<RechargeMapper, Recharge> 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

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<String> corporateBankInit(int i) {
-        return ResultUtil.success();
-    }
     @Autowired
     private EsGoodsIndexService esGoodsIndexService;