code-image-backup-public/lilishop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge conflict origin/master

Browse Source
This commit is contained in:
paulGao
2022-02-11 15:33:28 +08:00
parent 6409d0dc2d da6a17cd61
commit 5c78711d8e
216 changed files with 1473 additions and 789 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
manager-api/src/main/java/cn/lili/ManagerApiApplication.java
View File

@@ -23,8 +23,7 @@ public class ManagerApiApplication {
@Primary
@Bean
public TaskExecutor primaryTask() {
ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
return executor;
return new ThreadPoolTaskExecutor();
}
public static void main(String[] args) {

2
manager-api/src/main/java/cn/lili/controller/distribution/DistributionCashManagerController.java
View File

@@ -1,5 +1,6 @@
package cn.lili.controller.distribution;
import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.distribution.entity.dos.DistributionCash;
@@ -43,6 +44,7 @@ public class DistributionCashManagerController {
}
@PreventDuplicateSubmissions
@ApiOperation(value = "审核")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "分销佣金ID", required = true, paramType = "path", dataType = "String"),

4
manager-api/src/main/java/cn/lili/controller/distribution/DistributionManagerController.java
View File

@@ -1,5 +1,6 @@
package cn.lili.controller.distribution;
import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.exception.ServiceException;
@@ -39,6 +40,7 @@ public class DistributionManagerController {
}
@PreventDuplicateSubmissions
@ApiOperation(value = "清退分销商")
@PutMapping(value = "/retreat/{id}")
@ApiImplicitParams({
@@ -53,6 +55,7 @@ public class DistributionManagerController {
}
@PreventDuplicateSubmissions
@ApiOperation(value = "恢复分销商")
@PutMapping(value = "/resume/{id}")
@ApiImplicitParams({
@@ -67,6 +70,7 @@ public class DistributionManagerController {
}
@PreventDuplicateSubmissions
@ApiOperation(value = "审核分销商")
@PutMapping(value = "/audit/{id}")
@ApiImplicitParams({

4
manager-api/src/main/java/cn/lili/controller/goods/GoodsManagerController.java
View File

@@ -1,5 +1,6 @@
package cn.lili.controller.goods;
import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.exception.ServiceException;
@@ -65,6 +66,7 @@ public class GoodsManagerController {
return goodsService.queryByParams(goodsSearchParams);
}
@PreventDuplicateSubmissions
@ApiOperation(value = "管理员下架商品", notes = "管理员下架商品时使用")
@ApiImplicitParams({
@ApiImplicitParam(name = "goodsId", value = "商品ID", required = true, paramType = "query", allowMultiple = true),
@@ -79,6 +81,7 @@ public class GoodsManagerController {
throw new ServiceException(ResultCode.GOODS_UNDER_ERROR);
}
@PreventDuplicateSubmissions
@ApiOperation(value = "管理员审核商品", notes = "管理员审核商品")
@ApiImplicitParams({
@ApiImplicitParam(name = "goodsIds", value = "商品ID", required = true, paramType = "path", allowMultiple = true, dataType = "int"),
@@ -94,6 +97,7 @@ public class GoodsManagerController {
}
@PreventDuplicateSubmissions
@ApiOperation(value = "管理员上架商品", notes = "管理员上架商品时使用")
@PutMapping(value = "/{goodsId}/up")
@ApiImplicitParams({

3
manager-api/src/main/java/cn/lili/controller/member/MemberAddressManagerController.java
View File

@@ -1,5 +1,6 @@
package cn.lili.controller.member;
import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
@@ -33,6 +34,7 @@ public class MemberAddressManagerController {
return ResultUtil.data(memberAddressService.getAddressByMember(page, memberId));
}
@PreventDuplicateSubmissions
@ApiOperation(value = "删除会员收件地址")
@ApiImplicitParam(name = "id", value = "会员地址ID", dataType = "String", paramType = "path")
@DeleteMapping(value = "/delById/{id}")
@@ -48,6 +50,7 @@ public class MemberAddressManagerController {
return ResultUtil.data(memberAddressService.updateMemberAddress(shippingAddress));
}
@PreventDuplicateSubmissions
@ApiOperation(value = "新增会员收件地址")
@PostMapping
public ResultMessage<MemberAddress> addShippingAddress(@Valid MemberAddress shippingAddress) {

3
manager-api/src/main/java/cn/lili/controller/member/MemberEvaluationManagerController.java
View File

@@ -1,5 +1,6 @@
package cn.lili.controller.member;
import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
@@ -30,6 +31,7 @@ public class MemberEvaluationManagerController {
@Autowired
private MemberEvaluationService memberEvaluationService;
@PreventDuplicateSubmissions
@ApiOperation(value = "通过id获取评论")
@ApiImplicitParam(name = "id", value = "评价ID", required = true, dataType = "String", paramType = "path")
@GetMapping(value = "/get/{id}")
@@ -45,6 +47,7 @@ public class MemberEvaluationManagerController {
return ResultUtil.data(memberEvaluationService.queryPage(evaluationQueryParams));
}
@PreventDuplicateSubmissions
@ApiOperation(value = "修改评价状态")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "评价ID", required = true, paramType = "path"),

4
manager-api/src/main/java/cn/lili/controller/message/MemberMessageManagerController.java
View File

@@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -23,8 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
* @since 2020/12/6 16:09
*/
@RestController
@Transactional(rollbackFor = Exception.class)
@Api(tags = "管理端,会员消息管理接口")
@Api(tags = "管理端,会员消息消息管理接口")
@RequestMapping("/manager/message/member")
public class MemberMessageManagerController {
@Autowired

2
manager-api/src/main/java/cn/lili/controller/order/AfterSaleManagerController.java
View File

@@ -1,5 +1,6 @@
package cn.lili.controller.order;
import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
@@ -74,6 +75,7 @@ public class AfterSaleManagerController {
return ResultUtil.data(afterSaleService.refund(afterSaleSn, remark));
}
@PreventDuplicateSubmissions
@ApiOperation(value = "审核售后申请")
@ApiImplicitParams({
@ApiImplicitParam(name = "afterSaleSn", value = "售后sn", required = true, paramType = "path"),

3
manager-api/src/main/java/cn/lili/controller/order/OrderComplaintManagerController.java
View File

@@ -1,5 +1,6 @@
package cn.lili.controller.order;
import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.AuthUser;
import cn.lili.common.security.context.UserContext;
@@ -79,6 +80,7 @@ public class OrderComplaintManagerController {
return ResultUtil.data(communicationVO);
}
@PreventDuplicateSubmissions
@ApiOperation(value = "修改状态")
@PutMapping(value = "/status")
public ResultMessage<Object> updateStatus(OrderComplaintOperationParams orderComplainVO) {
@@ -87,6 +89,7 @@ public class OrderComplaintManagerController {
}
@PreventDuplicateSubmissions
@ApiOperation(value = "仲裁")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "投诉单ID", required = true, paramType = "path"),

2
manager-api/src/main/java/cn/lili/controller/order/OrderLogManagerController.java
View File

@@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,7 +23,6 @@ import org.springframework.web.bind.annotation.RestController;
* @since 2020/11/17 4:34 下午
*/
@RestController
@Transactional(rollbackFor = Exception.class)
@Api(tags = "管理端,订单日志管理接口")
@RequestMapping("/manager/order/orderLog")
public class OrderLogManagerController {

5
manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java
View File

@@ -1,5 +1,6 @@
package cn.lili.controller.order;
import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.member.entity.dto.MemberAddressDTO;
@@ -68,6 +69,7 @@ public class OrderManagerController {
}
@PreventDuplicateSubmissions
@ApiOperation(value = "确认收款")
@ApiImplicitParam(name = "orderSn", value = "订单编号", required = true, dataType = "String", paramType = "path")
@PostMapping(value = "/{orderSn}/pay")
@@ -76,6 +78,7 @@ public class OrderManagerController {
return ResultUtil.success();
}
@PreventDuplicateSubmissions
@ApiOperation(value = "修改收货人信息")
@ApiImplicitParam(name = "orderSn", value = "订单sn", required = true, dataType = "String", paramType = "path")
@PostMapping(value = "/update/{orderSn}/consignee")
@@ -84,6 +87,7 @@ public class OrderManagerController {
return ResultUtil.data(orderService.updateConsignee(orderSn, memberAddressDTO));
}
@PreventDuplicateSubmissions
@ApiOperation(value = "修改订单价格")
@ApiImplicitParams({
@ApiImplicitParam(name = "orderSn", value = "订单sn", required = true, dataType = "String", paramType = "path"),
@@ -96,6 +100,7 @@ public class OrderManagerController {
}
@PreventDuplicateSubmissions
@ApiOperation(value = "取消订单")
@ApiImplicitParams({
@ApiImplicitParam(name = "orderSn", value = "订单编号", required = true, dataType = "String", paramType = "path"),

2
manager-api/src/main/java/cn/lili/controller/order/PaymentLogManagerController.java
View File

@@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -27,7 +26,6 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@Api(tags = "管理端,收款日志接口")
@RequestMapping("/manager/order/paymentLog")
@Transactional(rollbackFor = Exception.class)
public class PaymentLogManagerController {
@Autowired

2
manager-api/src/main/java/cn/lili/controller/order/RefundLogManagerController.java
View File

@@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,7 +25,6 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@Api(tags = "管理端,退款日志接口")
@RequestMapping("/manager/order/refundLog")
@Transactional(rollbackFor = Exception.class)
public class RefundLogManagerController {
@Autowired
private RefundLogService refundLogService;

2
manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java
View File

@@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -27,7 +26,6 @@ import java.util.List;
@RestController
@Api(tags = "管理端,验证码资源维护接口")
@RequestMapping("/manager/other/verificationSource")
@Transactional(rollbackFor = Exception.class)
public class VerificationSourceController {
@Autowired

2
manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java
View File

@@ -62,7 +62,7 @@ public class AdminUserManagerController {
@Autowired
private VerificationService verificationService;
@GetMapping(value = "/login")
@PostMapping(value = "/login")
@ApiOperation(value = "登录管理员")
public ResultMessage<Token> login(@NotNull(message = "用户名不能为空") @RequestParam String username,
@NotNull(message = "密码不能为空") @RequestParam String password,

7
manager-api/src/main/java/cn/lili/controller/passport/MemberManagerController.java
View File

@@ -1,6 +1,7 @@
package cn.lili.controller.passport;
import cn.lili.common.aop.annotation.DemoSite;
import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
@@ -56,20 +57,22 @@ public class MemberManagerController {
return ResultUtil.data(memberService.addMember(member));
}
@DemoSite
@PreventDuplicateSubmissions
@ApiOperation(value = "修改会员基本信息")
@PutMapping
@DemoSite
public ResultMessage<Member> update(@Valid ManagerMemberEditDTO managerMemberEditDTO) {
return ResultUtil.data(memberService.updateMember(managerMemberEditDTO));
}
@DemoSite
@PreventDuplicateSubmissions
@ApiOperation(value = "修改会员状态,开启关闭会员")
@ApiImplicitParams({
@ApiImplicitParam(name = "memberIds", value = "会员ID", required = true, dataType = "String", allowMultiple = true, paramType = "query"),
@ApiImplicitParam(name = "disabled", required = true, dataType = "boolean", paramType = "query")
})
@PutMapping("/updateMemberStatus")
@DemoSite
public ResultMessage<Object> updateMemberStatus(@RequestParam List<String> memberIds, @RequestParam Boolean disabled) {
memberService.updateMemberStatus(memberIds, disabled);
return ResultUtil.success();

4
manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java
View File

@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
/**
* 管理端,优惠券接口
@@ -91,7 +92,8 @@ public class CouponManagerController {
@ApiOperation(value = "会员优惠券作废")
@PutMapping(value = "/member/cancellation/{id}")
public ResultMessage<Object> cancellation(@PathVariable String id) {
memberCouponService.cancellation(id);
AuthUser currentUser = Objects.requireNonNull(UserContext.getCurrentUser());
memberCouponService.cancellation(currentUser.getId(), id);
return ResultUtil.success(ResultCode.COUPON_CANCELLATION_SUCCESS);
}

6
manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java
View File

@@ -9,7 +9,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -23,7 +22,6 @@ import java.util.List;
*/
@Slf4j
@RestController
@Transactional(rollbackFor = Exception.class)
@Api(tags = "日志管理接口")
@RequestMapping("/manager/setting/log")
public class LogManagerController {
@@ -33,12 +31,12 @@ public class LogManagerController {
@GetMapping(value = "/getAllByPage")
@ApiOperation(value = "分页获取全部")
public ResultMessage<Object> getAllByPage(@RequestParam(required = false) Integer type,
@RequestParam String key,
@RequestParam String searchKey,
String operatorName,
SearchVO searchVo,
PageVO pageVo) {
try {
return ResultUtil.data(systemLogService.queryLog(null, operatorName, key, searchVo, pageVo));
return ResultUtil.data(systemLogService.queryLog(null, operatorName, searchKey, searchVo, pageVo));
} catch (Exception e) {
log.error("日志获取错误",e);
}

2
manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java
View File

@@ -9,7 +9,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@@ -25,7 +24,6 @@ import java.util.List;
@RestController
@Api(tags = "管理端,行政地区管理接口")
@RequestMapping("/manager/setting/region")
@Transactional(rollbackFor = Exception.class)
public class RegionManagerController {
@Autowired
private RegionService regionService;

13
manager-api/src/main/java/cn/lili/controller/sms/SmsTemplateManagerController.java
View File

@@ -1,5 +1,6 @@
package cn.lili.controller.sms;
import cn.lili.common.aop.annotation.DemoSite;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
@@ -29,21 +30,24 @@ public class SmsTemplateManagerController {
@ApiOperation(value = "新增短信模板")
@PostMapping
@DemoSite
public ResultMessage<SmsTemplate> save(@Valid SmsTemplate smsTemplate) {
smsTemplateService.addSmsTemplate(smsTemplate);
return ResultUtil.success();
}
@ApiOperation(value = "删除短信模板")
@ApiImplicitParam(name = "id", value = "短信模板ID", required = true, paramType = "path")
@DeleteMapping("/{id}")
public ResultMessage<SmsTemplate> delete(@PathVariable("id") String id) {
smsTemplateService.deleteSmsTemplate(id);
@ApiImplicitParam(name = "templateCode", value = "短信模板CODE", required = true, paramType = "query")
@DeleteMapping
@DemoSite
public ResultMessage<SmsTemplate> delete(String templateCode) {
smsTemplateService.deleteSmsTemplate(templateCode);
return ResultUtil.success();
}
@ApiOperation(value = "查询短信模板状态")
@PutMapping("/querySmsSign")
@DemoSite
public ResultMessage<SmsTemplate> querySmsSign() {
smsTemplateService.querySmsTemplate();
return ResultUtil.success();
@@ -51,6 +55,7 @@ public class SmsTemplateManagerController {
@ApiOperation(value = "修改短信模板")
@PutMapping("/modifySmsTemplate")
@DemoSite
public ResultMessage<SmsTemplate> modifySmsTemplate(@Valid SmsTemplate smsTemplate) {
smsTemplateService.modifySmsTemplate(smsTemplate);
return ResultUtil.success();

2
manager-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsManagerController.java
View File

@@ -1,5 +1,6 @@
package cn.lili.controller.statistics;
import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.statistics.entity.dto.GoodsStatisticsQueryParam;
@@ -40,6 +41,7 @@ public class IndexStatisticsManagerController {
@ApiOperation(value = "获取首页查询数据")
@GetMapping
@PreventDuplicateSubmissions
public ResultMessage<IndexStatisticsVO> index() {
try {
return ResultUtil.data(indexStatisticsService.indexStatistics());

6
manager-api/src/main/java/cn/lili/controller/store/StoreMessageManagerController.java
View File

@@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -23,9 +22,8 @@ import org.springframework.web.bind.annotation.RestController;
* @since 2020/12/6 16:09
*/
@RestController
@Transactional(rollbackFor = Exception.class)
@Api(tags = "管理端,店铺消息管理接口")
@RequestMapping("/manager/store/storeMessage")
@Api(tags = "管理端,店铺消息消息管理接口")
@RequestMapping("/manager/message/store")
public class StoreMessageManagerController {
@Autowired

4
manager-api/src/main/java/cn/lili/controller/wallet/MemberWithdrawApplyManagerController.java
View File

@@ -1,6 +1,7 @@
package cn.lili.controller.wallet;
import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
@@ -13,7 +14,6 @@ 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.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -29,7 +29,6 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@Api(tags = "管理端,余额提现记录接口")
@RequestMapping("/manager/wallet/withdrawApply")
@Transactional(rollbackFor = Exception.class)
public class MemberWithdrawApplyManagerController {
@Autowired
private MemberWithdrawApplyService memberWithdrawApplyService;
@@ -44,6 +43,7 @@ public class MemberWithdrawApplyManagerController {
}
@PreventDuplicateSubmissions
@ApiOperation(value = "提现申请审核")
@PostMapping
@ApiImplicitParams({

2
manager-api/src/main/java/cn/lili/controller/wallet/RechargeManagerController.java
View File

@@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -25,7 +24,6 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@Api(tags = "管理端,预存款充值记录接口")
@RequestMapping("/manager/wallet/recharge")
@Transactional(rollbackFor = Exception.class)
public class RechargeManagerController {
@Autowired
private RechargeService rechargeService;

2
manager-api/src/main/java/cn/lili/controller/wallet/WalletLogManagerController.java
View File

@@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -24,7 +23,6 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@Api(tags = "管理端,预存款充值记录接口")
@RequestMapping("/manager/wallet/log")
@Transactional(rollbackFor = Exception.class)
public class WalletLogManagerController {
@Autowired
private WalletLogService walletLogService;

2
manager-api/src/main/java/cn/lili/controller/wechat/WechatMPMessageManagerController.java
View File

@@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -23,7 +22,6 @@ import java.util.List;
@RestController
@Api(tags = "微信小程序消息订阅接口")
@RequestMapping("/manager/wechat/wechatMPMessage")
@Transactional(rollbackFor = Exception.class)
public class WechatMPMessageManagerController {
@Autowired
private WechatMPMessageService wechatMPMessageService;

2
manager-api/src/main/resources/application.yml
View File

@@ -108,7 +108,7 @@ spring:
props:
#是否打印逻辑SQL语句和实际SQL语句，建议调试时打印，在生产环境关闭
sql:
show: true
show: false
# 忽略鉴权url
ignored:

38
manager-api/src/test/java/cn/lili/test/promotion/SeckillTest.java
View File

@@ -1,10 +1,16 @@
package cn.lili.test.promotion;
import cn.lili.modules.member.service.MemberService;
import cn.lili.modules.promotion.entity.dos.Seckill;
import cn.lili.modules.promotion.entity.enums.PromotionsApplyStatusEnum;
import cn.lili.modules.promotion.entity.vos.SeckillApplyVO;
import cn.lili.modules.promotion.service.SeckillApplyService;
import cn.lili.modules.promotion.service.SeckillService;
import cn.lili.modules.system.entity.dos.Setting;
import cn.lili.modules.system.entity.dto.SeckillSetting;
import cn.lili.modules.system.entity.enums.SettingEnum;
import cn.lili.modules.system.service.SettingService;
import com.google.gson.Gson;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -32,24 +38,24 @@ class SeckillTest {
@Autowired
private MemberService memberService;
/**
* 系统设置
*/
@Autowired
private SettingService settingService;
@Test
void add() {
// SeckillVO seckillVO = new SeckillVO();
// seckillVO.setId("10000");
// seckillVO.setStoreIds("132");
// seckillVO.setSeckillApplyStatus(SeckillApplyStatusEnum.NOT_APPLY.name());
// seckillVO.setPromotionStatus(PromotionStatusEnum.NEW.name());
// seckillVO.setApplyEndTime(DateUtil.parse("2021-09-06 14:20:00"));
// seckillVO.setStartTime(DateUtil.parse("2021-09-06 14:22:00"));
// seckillVO.setEndTime(DateUtil.parse("2021-09-06 23:59:00"));
// seckillVO.setHours("15,17,19");
// seckillVO.setPromotionName("Seckill" + seckillVO.getId());
// seckillVO.setSeckillRule("rule" + seckillVO.getId());
// seckillVO.setStoreId("1376433565247471616");
// seckillVO.setStoreName("platform");
//
// Assertions.assertTrue(seckillService.saveSeckill(seckillVO));
// memberService.getUserInfo()
Setting setting = settingService.get(SettingEnum.SECKILL_SETTING.name());
System.out.println(setting);
SeckillSetting seckillSetting = new Gson().fromJson(setting.getSettingValue(), SeckillSetting.class);
System.out.println(seckillSetting);
boolean result = true;
for (int i = 1; i <= SeckillService.PRE_CREATION; i++) {
Seckill seckill = new Seckill(i, seckillSetting.getHours(), seckillSetting.getSeckillRule());
seckillService.savePromotions(seckill);
}
Assertions.assertTrue(result);
}
@Test