caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

同步master，解决冲突

Browse Source
This commit is contained in:
lifenlong 2021-07-27 10:00:34 +08:00
commit 5a7440c5bf
1183 changed files with 2438 additions and 2673 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buyer-api/src/main/java/cn/lili/BuyerApiApplication.java
View File

@ -14,7 +14,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
* 买家API
*
* @author Chopper
* @date 2020/11/16 10:03 下午
* @since 2020/11/16 10:03 下午
*/
@SpringBootApplication
@EnableJpaAuditing

2
buyer-api/src/main/java/cn/lili/controller/goods/CategoryBuyerController.java
View File

@ -21,7 +21,7 @@ import java.util.List;
* 买家端,商品分类接口
*
* @author Chopper
* @date: 2020/11/16 10:05 下午
* @since: 2020/11/16 10:05 下午
*/
@RestController
@Api(tags = "买家端,商品分类接口")

9
buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java
View File

@ -5,7 +5,6 @@ import cn.lili.common.enums.ResultUtil;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.distribution.service.DistributionService;
import cn.lili.modules.goods.entity.dos.Goods;
import cn.lili.modules.goods.entity.dto.GoodsSearchParams;
import cn.lili.modules.goods.entity.vos.GoodsVO;
@ -38,7 +37,7 @@ import java.util.Map;
* 买家端,商品接口
*
* @author Chopper
* @date 2020/11/16 10:06 下午
* @since 2020/11/16 10:06 下午
*/
@Slf4j
@Api(tags = "买家端,商品接口")
@ -61,12 +60,6 @@ public class GoodsBuyerController {
*/
@Autowired
private EsGoodsSearchService goodsSearchService;
/**
* 分销员
*/
@Autowired
private DistributionService distributionService;
@ApiOperation(value = "通过id获取商品信息")
@ApiImplicitParam(name = "goodsId", value = "商品ID", required = true, paramType = "path", dataType = "Long")

2
buyer-api/src/main/java/cn/lili/controller/member/CouponBuyerController.java
View File

@ -27,7 +27,7 @@ import javax.validation.constraints.NotNull;
* 买家端,买家优惠券接口
*
* @author paulG
* @date 2020/11/17 3:35 下午
* @since 2020/11/17 3:35 下午
*/
@RestController
@Api(tags = "买家端,买家优惠券接口")

2
buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java
View File

@ -19,7 +19,7 @@ import java.util.List;
* 买家端,浏览历史接口
*
* @author Chopper
* @date: 2020/11/16 10:06 下午
* @since: 2020/11/16 10:06 下午
*/
@RestController
@Api(tags = "买家端,浏览历史接口")

2
buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java
View File

@ -20,7 +20,7 @@ import javax.validation.Valid;
* 买家端,会员地址接口
*
* @author Bulbasaur
* @date: 2020/11/16 10:07 下午
* @since: 2020/11/16 10:07 下午
*/
@RestController
@Api(tags = "买家端,会员地址接口")

2
buyer-api/src/main/java/cn/lili/controller/member/MemberCollectionController.java
View File

@ -18,7 +18,7 @@ import javax.validation.constraints.NotNull;
* 买家端,会员收藏接口
*
* @author Chopper
* @date: 2020/11/17 2:32 下午
* @since: 2020/11/17 2:32 下午
*/
@RestController
@Api(tags = "买家端,会员收藏接口")

2
buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java
View File

@ -24,7 +24,7 @@ import javax.validation.constraints.NotNull;
* 买家端,会员商品评价接口
*
* @author Bulbasaur
* @date: 2020/11/16 10:08 下午
* @since: 2020/11/16 10:08 下午
*/
@RestController
@Api(tags = "买家端,会员商品评价接口")

2
buyer-api/src/main/java/cn/lili/controller/member/MemberMessageBuyerController.java
View File

@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
* 买家端,会员站内消息接口
*
* @author Bulbasaur
* @date: 2020/11/16 10:07 下午
* @since: 2020/11/16 10:07 下午
*/
@RestController
@Api(tags = "买家端,会员站内消息接口")

2
buyer-api/src/main/java/cn/lili/controller/member/MemberReceiptController.java
View File

@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
* 买家端,会员发票接口
*
* @author paulG
* @date: 2021-03-29 14:10:16
* @since: 2021-03-29 14:10:16
*/
@RestController
@Api(tags = "买家端,会员发票接口")

2
buyer-api/src/main/java/cn/lili/controller/member/MemberSignBuyerController.java
View File

@ -18,7 +18,7 @@ import java.util.List;
* 会员签到控制器
*
* @author pikachu
* @date: 2020/11/16 10:07 下午
* @since: 2020/11/16 10:07 下午
*/
@RestController
@Api(tags = "买家端，会员签到API")

6
buyer-api/src/main/java/cn/lili/controller/member/MemberWalletBuyerController.java
View File

@ -5,8 +5,8 @@ import cn.lili.common.exception.ServiceException;
import cn.lili.common.security.AuthUser;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.verification.enums.VerificationEnums;
import cn.lili.common.verification.service.VerificationService;
import cn.lili.modules.verification.enums.VerificationEnums;
import cn.lili.modules.verification.service.VerificationService;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.member.entity.dos.Member;
import cn.lili.modules.member.entity.dos.MemberWallet;
@ -30,7 +30,7 @@ import javax.validation.constraints.Pattern;
* 买家端,会员余额接口
*
* @author pikachu
* @date: 2020/11/16 10:07 下午
* @since: 2020/11/16 10:07 下午
*/
@RestController
@Api(tags = "买家端,会员余额接口")

2
buyer-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyBuyerController.java
View File

@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
* 买家端,余额提现记录接口
*
* @author pikachu
* @date: 2020/11/16 10:07 下午
* @since: 2020/11/16 10:07 下午
*/
@RestController
@Api(tags = "买家端,余额提现记录接口")

4
buyer-api/src/main/java/cn/lili/controller/member/PointsHistoryBuyerController.java
View File

@ -1,7 +1,7 @@
package cn.lili.controller.member;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.utils.PageUtil;
import cn.lili.mybatis.util.PageUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
* 买家端,会员积分历史接口
*
* @author Bulbasaur
* @date 2020-02-25 14:10:16
* @since 2020-02-25 14:10:16
*/
@RestController
@Api(tags = "买家端,会员积分历史接口")

2
buyer-api/src/main/java/cn/lili/controller/member/RechargeBuyerController.java
View File

@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
* 买家端,预存款充值记录接口
*
* @author pikachu
* @date: 2020/11/16 10:07 下午
* @since: 2020/11/16 10:07 下午
*/
@RestController
@Api(tags = "买家端,预存款充值记录接口")

4
buyer-api/src/main/java/cn/lili/controller/member/ServiceNoticeBuyerController.java
View File

@ -1,6 +1,6 @@
package cn.lili.controller.member;
import cn.lili.common.utils.PageUtil;
import cn.lili.mybatis.util.PageUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
* 买家端,会员站服务消息接口
*
* @author Chopper
* @date: 2020/11/17 2:31 下午
* @since: 2020/11/17 2:31 下午
*/
@RestController
@RequestMapping("/service/notice")

4
buyer-api/src/main/java/cn/lili/controller/other/AppVersionBuyerController.java
View File

@ -1,7 +1,7 @@
package cn.lili.controller.other;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.utils.PageUtil;
import cn.lili.mybatis.util.PageUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.system.entity.dos.AppVersion;
@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
* 买家端,APP版本
*
* @author Bulbasaur
* @date: 2021/5/21 11:15 上午
* @since: 2021/5/21 11:15 上午
*/
@RestController
@Api(tags = "买家端,APP版本")

2
buyer-api/src/main/java/cn/lili/controller/other/ArticleBuyerController.java
View File

@ -25,7 +25,7 @@ import java.util.List;
* 买家端,文章接口
*
* @author Chopper
* @date: 2020/11/16 10:02 下午
* @since: 2020/11/16 10:02 下午
*/
@RestController
@Api(tags = "买家端,文章接口")

2
buyer-api/src/main/java/cn/lili/controller/other/FeedbackBuyerController.java
View File

@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
* 买家端,意见反馈接口
*
* @author Bulbasaur
* @date 2020-05-5 15:10:16
* @since 2020-05-5 15:10:16
*/
@RestController
@Api(tags = "买家端,意见反馈接口")

2
buyer-api/src/main/java/cn/lili/controller/other/LogisticsBuyerController.java
View File

@ -17,7 +17,7 @@ import java.util.List;
* 买家端,物流公司接口
*
* @author Bulbasaur
* @date 2020-05-5 15:10:16
* @since 2020-05-5 15:10:16
*/
@RestController
@Api(tags = "买家端,物流公司接口")

2
buyer-api/src/main/java/cn/lili/controller/other/PageBuyerController.java
View File

@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
* 买家端,页面接口
*
* @author Chopper
* @date 2020/11/16 10:08 下午
* @since 2020/11/16 10:08 下午
*/
@RestController
@Api(tags = "买家端,页面接口")

2
buyer-api/src/main/java/cn/lili/controller/other/broadcast/StudioController.java
View File

@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
* 买家端,直播间接口
*
* @author Bulbasaur
* @date: 2021/5/20 12:03 下午
* @since: 2021/5/20 12:03 下午
*/
@RestController
@Api(tags = "买家端,直播间接口")

2
buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionBuyerController.java
View File

@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
* 买家端,分销员接口
*
* @author pikachu
* @date: 2020/11/16 10:03 下午
* @since: 2020/11/16 10:03 下午
*/
@RestController
@Api(tags = "买家端,分销员接口")

2
buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashBuyerController.java
View File

@ -26,7 +26,7 @@ import javax.validation.constraints.NotNull;
* 买家端,分销商品佣金提现接口
*
* @author pikachu
* @date: 2020/11/16 10:03 下午
* @since: 2020/11/16 10:03 下午
*/
@RestController
@Api(tags = "买家端,分销商品佣金提现接口")

2
buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsBuyerController.java
View File

@ -25,7 +25,7 @@ import javax.validation.constraints.NotNull;
* 买家端,分销商品接口
*
* @author Bulbasaur
* @date: 2020/11/16 10:06 下午
* @since: 2020/11/16 10:06 下午
*/
@RestController
@Api(tags = "买家端,分销商品接口")

2
buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderBuyerController.java
View File

@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
* 买家端,分销商品佣金提现接口
*
* @author pikachu
* @date: 2020/11/16 10:03 下午
* @since: 2020/11/16 10:03 下午
*/
@RestController
@Api(tags = "买家端,分销订单接口")

8
buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java
View File

@ -2,10 +2,10 @@ package cn.lili.controller.passport;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.sms.SmsUtil;
import cn.lili.modules.system.sms.SmsUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.verification.enums.VerificationEnums;
import cn.lili.common.verification.service.VerificationService;
import cn.lili.modules.verification.enums.VerificationEnums;
import cn.lili.modules.verification.service.VerificationService;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.member.entity.dos.Member;
import cn.lili.modules.member.entity.dto.MemberEditDTO;
@ -23,7 +23,7 @@ import javax.validation.constraints.NotNull;
* 买家端,会员接口
*
* @author Chopper
* @date: 2020/11/16 10:07 下午
* @since: 2020/11/16 10:07 下午
*/
@RestController
@Api(tags = "买家端,会员接口")

2
buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerBindController.java
View File

@ -17,7 +17,7 @@ import java.util.List;
* 买家端,app/小程序 联合登录
*
* @author Chopper
* @date 2020-11-25 19:29
* @since 2020-11-25 19:29
*/
@RestController
@Api(tags = "买家端,app/小程序 联合登录")

3
buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java
View File

@ -3,7 +3,7 @@ package cn.lili.controller.passport.connect;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.token.Token;
import cn.lili.common.security.token.Token;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.connect.entity.dto.AuthCallback;
@ -29,7 +29,6 @@ import java.io.IOException;
* 买家端,web联合登录
*
* @author Chopper
* @date 2020-11-25 19:29
*/
@Slf4j
@RestController

4
buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java
View File

@ -1,6 +1,6 @@
package cn.lili.controller.passport.connect;
import cn.lili.common.token.Token;
import cn.lili.common.security.token.Token;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.connect.entity.dto.WechatMPLoginParams;
@ -23,7 +23,7 @@ import java.util.List;
* 买家端,小程序登录接口
*
* @author Chopper
* @date 2021/2/19 09:28
* @since 2021/2/19 09:28
*/
@RestController
@RequestMapping("/buyer/mini-program")

2
buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java
View File

@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletResponse;
* 买家端,收银台接口
*
* @author Chopper
* @date 2020-12-18 16:59
* @since 2020-12-18 16:59
*/
@Slf4j
@RestController

2
buyer-api/src/main/java/cn/lili/controller/payment/CashierRefundController.java
View File

@ -17,7 +17,7 @@ import javax.servlet.http.HttpServletRequest;
* 买家端,退款回调
*
* @author Chopper
* @date 2020-12-18 16:59
* @since 2020-12-18 16:59
*/
@Api(tags = "买家端,退款回调")
@RestController

4
buyer-api/src/main/java/cn/lili/controller/promotion/PintuanBuyerController.java
View File

@ -6,7 +6,7 @@ import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.promotion.entity.dto.PromotionGoodsDTO;
import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum;
import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum;
import cn.lili.common.enums.PromotionTypeEnum;
import cn.lili.modules.promotion.entity.vos.PintuanMemberVO;
import cn.lili.modules.promotion.entity.vos.PintuanShareVO;
import cn.lili.modules.promotion.entity.vos.PromotionGoodsSearchParams;
@ -27,7 +27,7 @@ import java.util.List;
* 买家端,拼团接口
*
* @author paulG
* @date 2021/2/20
* @since 2021/2/20
**/
@Api(tags = "买家端,拼团接口")
@RestController

2
buyer-api/src/main/java/cn/lili/controller/promotion/PointsGoodsBuyerController.java
View File

@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
* 买家端,积分商品接口
*
* @author paulG
* @date 2021/1/19
* @since 2021/1/19
**/
@RestController
@Api(tags = "买家端,积分商品接口")

2
buyer-api/src/main/java/cn/lili/controller/promotion/SeckillBuyerController.java
View File

@ -20,7 +20,7 @@ import java.util.List;
* 买家端,秒杀活动接口
*
* @author paulG
* @date 2020/11/17 2:30 下午
* @since 2020/11/17 2:30 下午
*/
@Api(tags = "买家端,秒杀活动接口")
@RestController

2
buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseBuyerController.java
View File

@ -20,7 +20,7 @@ import javax.validation.constraints.NotNull;
* 买家端,采购接口
*
* @author Chopper
* @date: 2020/11/16 10:06 下午
* @since: 2020/11/16 10:06 下午
*/
@Api(tags = "买家端,采购接口")
@RestController

2
buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseQuotedController.java
View File

@ -18,7 +18,7 @@ import java.util.List;
* 买家端,采购报价接口
*
* @author Bulbasaur
* @date: 2020/11/16 10:06 下午
* @since: 2020/11/16 10:06 下午
*/
@Api(tags = "买家端,采购报价接口")
@RestController

5
buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java
View File

@ -4,8 +4,6 @@ import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.statistics.aop.PageViewPoint;
import cn.lili.modules.statistics.aop.enums.PageViewEnum;
import cn.lili.modules.store.entity.dto.StoreBankDTO;
import cn.lili.modules.store.entity.dto.StoreCompanyDTO;
import cn.lili.modules.store.entity.dto.StoreOtherInfoDTO;
@ -29,7 +27,7 @@ import java.util.List;
* 买家端,店铺接口
*
* @author Bulbasaur
* @date: 2020/11/17 2:32 下午
* @since: 2020/11/17 2:32 下午
*/
@RestController
@RequestMapping("/buyer/store")
@ -61,7 +59,6 @@ public class StoreBuyerController {
@ApiOperation(value = "通过id获取店铺信息")
@ApiImplicitParam(name = "id", value = "店铺ID", required = true, paramType = "path")
@GetMapping(value = "/get/detail/{id}")
@PageViewPoint(type = PageViewEnum.STORE, id = "#id")
public ResultMessage<StoreBasicInfoVO> detail(@NotNull @PathVariable String id) {
return ResultUtil.data(storeDetailService.getStoreBasicInfoDTO(id));
}

4
buyer-api/src/main/java/cn/lili/controller/trade/AfterSaleBuyerController.java
View File

@ -30,7 +30,7 @@ import java.util.List;
* 买家端,售后管理接口
*
* @author Chopper
* @date 2020/11/16 10:02 下午
* @since 2020/11/16 10:02 下午
*/
@RestController
@Api(tags = "买家端,售后管理接口")
@ -95,7 +95,7 @@ public class AfterSaleBuyerController {
public ResultMessage<AfterSale> delivery(@NotNull(message = "售后编号不能为空") @PathVariable("afterSaleSn") String afterSaleSn,
@NotNull(message = "发货单号不能为空") @RequestParam String logisticsNo,
@NotNull(message = "请选择物流公司") @RequestParam String logisticsId,
@NotNull(message = "请选择发货时间") @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date mDeliverTime) {
@NotNull(message = "请选择发货时间") @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date mDeliverTime) {
return ResultUtil.data(afterSaleService.buyerDelivery(afterSaleSn, logisticsNo, logisticsId, mDeliverTime));
}

2
buyer-api/src/main/java/cn/lili/controller/trade/CartController.java
View File

@ -25,7 +25,7 @@ import javax.validation.constraints.NotNull;
* 买家端，购物车接口
*
* @author Chopper
* @date 2020/11/16 10:04 下午
* @since 2020/11/16 10:04 下午
*/
@Slf4j
@RestController

2
buyer-api/src/main/java/cn/lili/controller/trade/OrderBuyerController.java
View File

@ -28,7 +28,7 @@ import javax.validation.constraints.NotNull;
* 买家端,订单接口
*
* @author Chopper
* @date 2020/11/16 10:08 下午
* @since 2020/11/16 10:08 下午
*/
@RestController
@Api(tags = "买家端,订单接口")

2
buyer-api/src/main/java/cn/lili/controller/trade/RechargeTradeBuyerController.java
View File

@ -21,7 +21,7 @@ import javax.validation.constraints.Min;
* 买家端,预存款充值记录接口
*
* @author paulG
* @date: 2020/11/16 10:07 下午
* @since: 2020/11/16 10:07 下午
*/
@RestController
@Api(tags = "买家端,预存款充值记录接口")

4
buyer-api/src/main/java/cn/lili/controller/trade/WalletLogBuyerController.java
View File

@ -2,7 +2,7 @@ package cn.lili.controller.trade;
import cn.lili.common.security.AuthUser;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.utils.PageUtil;
import cn.lili.mybatis.util.PageUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
* 买家端,预存款变动日志记录接口
*
* @author pikachu
* @date: 2020/11/16 10:07 下午
* @since: 2020/11/16 10:07 下午
*/
@RestController
@Api(tags = "买家端,预存款变动日志记录接口")

9
buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java
View File

@ -1,12 +1,12 @@
package cn.lili.security;
import cn.hutool.core.util.StrUtil;
import cn.lili.common.cache.Cache;
import cn.lili.common.cache.CachePrefix;
import cn.lili.cache.Cache;
import cn.lili.cache.CachePrefix;
import cn.lili.common.security.AuthUser;
import cn.lili.common.security.enums.SecurityEnum;
import cn.lili.common.security.enums.UserEnums;
import cn.lili.common.token.SecretKeyUtil;
import cn.lili.common.security.token.SecretKeyUtil;
import cn.lili.common.utils.ResponseUtil;
import com.google.gson.Gson;
import io.jsonwebtoken.Claims;
@ -35,8 +35,7 @@ import java.util.List;
*
* @author Chopper
* @version v4.1
* @date 2020/11/17 3:37 下午
* @Description:
* @since 2020/11/17 3:37 下午
* @since
*/
@Slf4j

5
buyer-api/src/main/java/cn/lili/security/BuyerSecurityConfig.java
View File

@ -1,9 +1,9 @@
package cn.lili.security;
import cn.lili.common.cache.Cache;
import cn.lili.cache.Cache;
import cn.lili.common.security.CustomAccessDeniedHandler;
import cn.lili.common.utils.SpringContextUtil;
import cn.lili.config.properties.IgnoredUrlsProperties;
import cn.lili.common.properties.IgnoredUrlsProperties;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
@ -19,7 +19,6 @@ import org.springframework.web.cors.CorsConfigurationSource;
*
* @author Chopper
* @version v4.0
* @Description:
* @since 2020/11/14 16:20
*/

4
buyer-api/src/main/resources/application.yml
View File

@ -118,9 +118,9 @@ spring:
# standard:
# sharding-column: create_time
# #分表策略
# precise-algorithm-class-name: cn.lili.config.sharding.CreateTimeShardingTableAlgorithm
# precise-algorithm-class-name: cn.lili.mybatis.sharding.CreateTimeShardingTableAlgorithm
# #范围查询实现
# range-algorithm-class-name: cn.lili.config.sharding.CreateTimeShardingTableAlgorithm
# range-algorithm-class-name: cn.lili.mybatis.sharding.CreateTimeShardingTableAlgorithm
props:
#是否打印逻辑SQL语句和实际SQL语句，建议调试时打印，在生产环境关闭
sql:

4
buyer-api/src/test/resources/application.yml
View File

@ -115,9 +115,9 @@ spring:
# standard:
# sharding-column: create_time
# #分表策略
# precise-algorithm-class-name: cn.lili.config.sharding.CreateTimeShardingTableAlgorithm
# precise-algorithm-class-name: cn.lili.mybatis.sharding.CreateTimeShardingTableAlgorithm
# #范围查询实现
# range-algorithm-class-name: cn.lili.config.sharding.CreateTimeShardingTableAlgorithm
# range-algorithm-class-name: cn.lili.mybatis.sharding.CreateTimeShardingTableAlgorithm
props:
#是否打印逻辑SQL语句和实际SQL语句，建议调试时打印，在生产环境关闭
sql:

2
common-api/src/main/java/cn/lili/CommonApiApplication.java
View File

@ -8,7 +8,7 @@ import org.springframework.cache.annotation.EnableCaching;
* 基础API
*
* @author Chopper
* @date 2020/11/17 3:38 下午
* @since 2020/11/17 3:38 下午
*/
@EnableCaching
@SpringBootApplication

4
common-api/src/main/java/cn/lili/controller/common/FileController.java
View File

@ -1,6 +1,6 @@
package cn.lili.controller.common;
import cn.lili.common.cache.Cache;
import cn.lili.cache.Cache;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.security.AuthUser;
@ -27,7 +27,7 @@ import java.util.List;
* 文件管理管理接口
*
* @author Chopper
* @date 2020/11/26 15:41
* @since 2020/11/26 15:41
*/
@RestController
@Api(tags = "文件管理管理接口")

2
common-api/src/main/java/cn/lili/controller/common/LogoController.java
View File

@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
* 文件管理管理接口
*
* @author Chopper
* @date 2020/11/26 15:41
* @since 2020/11/26 15:41
*/
@RestController
@Api(tags = "文件管理管理接口")

1
common-api/src/main/java/cn/lili/controller/common/RegionController.java
View File

@ -19,7 +19,6 @@ import java.util.List;
* 地址信息接口
*
* @author Chopper
* @date: 2020/11/16 10:07 下午
*/
@RestController
@Api(tags = "地址信息接口")

8
common-api/src/main/java/cn/lili/controller/common/SliderImageController.java
View File

@ -1,11 +1,11 @@
package cn.lili.controller.common;
import cn.lili.common.aop.limiter.annotation.LimitPoint;
import cn.lili.cache.limit.annotation.LimitPoint;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.verification.enums.VerificationEnums;
import cn.lili.common.verification.service.VerificationService;
import cn.lili.modules.verification.enums.VerificationEnums;
import cn.lili.modules.verification.service.VerificationService;
import cn.lili.common.vo.ResultMessage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.*;
* 滑块验证码接口
*
* @author Chopper
* @date 2020/11/26 15:41
* @since 2020/11/26 15:41
*/
@Slf4j
@RestController

10
common-api/src/main/java/cn/lili/controller/common/SmsController.java
View File

@ -1,12 +1,12 @@
package cn.lili.controller.common;
import cn.lili.common.aop.limiter.annotation.LimitPoint;
import cn.lili.cache.limit.annotation.LimitPoint;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.sms.SmsUtil;
import cn.lili.modules.system.sms.SmsUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.verification.enums.VerificationEnums;
import cn.lili.common.verification.service.VerificationService;
import cn.lili.modules.verification.enums.VerificationEnums;
import cn.lili.modules.verification.service.VerificationService;
import cn.lili.common.vo.ResultMessage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
* 短信验证码接口
*
* @author Chopper
* @date 2020/11/26 15:41
* @since 2020/11/26 15:41
*/
@RestController
@Api(tags = "短信验证码接口")

10
common-api/src/main/java/cn/lili/controller/common/UploadController.java
View File

@ -1,7 +1,7 @@
package cn.lili.controller.common;
import cn.hutool.core.util.StrUtil;
import cn.lili.common.cache.Cache;
import cn.lili.cache.Cache;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.security.AuthUser;
@ -12,7 +12,7 @@ import cn.lili.common.utils.CommonUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.utils.StringUtils;
import cn.lili.common.vo.ResultMessage;
import cn.lili.config.properties.SystemSetting;
import cn.lili.common.properties.SystemSettingProperties;
import cn.lili.modules.file.entity.File;
import cn.lili.modules.file.plugin.FileManagerPlugin;
import cn.lili.modules.file.service.FileService;
@ -35,7 +35,7 @@ import java.io.InputStream;
* 文件上传接口
*
* @author Chopper
* @date 2020/11/26 15:41
* @since 2020/11/26 15:41
*/
@Slf4j
@RestController
@ -53,7 +53,7 @@ public class UploadController {
private Cache cache;
@Autowired
private SystemSetting systemSetting;
private SystemSettingProperties systemSettingProperties;
@ApiOperation(value = "文件上传")
@PostMapping(value = "/file")
@ -109,6 +109,6 @@ public class UploadController {
@ApiOperation(value = "返回licences")
@PostMapping(value = "/licences")
public ResultMessage<Object> licences() {
return ResultUtil.data(systemSetting.getLicences());
return ResultUtil.data(systemSettingProperties.getLicences());
}
}

5
common-api/src/main/java/cn/lili/controller/security/CommonSecurityConfig.java
View File

@ -1,8 +1,8 @@
package cn.lili.controller.security;
import cn.lili.common.cache.Cache;
import cn.lili.cache.Cache;
import cn.lili.common.security.CustomAccessDeniedHandler;
import cn.lili.config.properties.IgnoredUrlsProperties;
import cn.lili.common.properties.IgnoredUrlsProperties;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
@ -17,7 +17,6 @@ import org.springframework.web.cors.CorsConfigurationSource;
*
* @author Chopper
* @version v4.0
* @Description:
* @since 2020/11/14 16:20
*/
@Slf4j

4
common-api/src/main/resources/application.yml
View File

@ -115,9 +115,9 @@ spring:
# standard:
# sharding-column: create_time
# #分表策略
# precise-algorithm-class-name: cn.lili.config.sharding.CreateTimeShardingTableAlgorithm
# precise-algorithm-class-name: cn.lili.mybatis.sharding.CreateTimeShardingTableAlgorithm
# #范围查询实现
# range-algorithm-class-name: cn.lili.config.sharding.CreateTimeShardingTableAlgorithm
# range-algorithm-class-name: cn.lili.mybatis.sharding.CreateTimeShardingTableAlgorithm
props:
#是否打印逻辑SQL语句和实际SQL语句，建议调试时打印，在生产环境关闭
sql:

4
config/application.yml
View File

@ -112,9 +112,9 @@ spring:
# standard:
# sharding-column: create_time
# #分表策略
# precise-algorithm-class-name: cn.lili.config.sharding.CreateTimeShardingTableAlgorithm
# precise-algorithm-class-name: cn.lili.mybatis.sharding.CreateTimeShardingTableAlgorithm
# #范围查询实现
# range-algorithm-class-name: cn.lili.config.sharding.CreateTimeShardingTableAlgorithm
# range-algorithm-class-name: cn.lili.mybatis.sharding.CreateTimeShardingTableAlgorithm
props:
#是否打印逻辑SQL语句和实际SQL语句，建议调试时打印，在生产环境关闭
sql:

2
consumer/src/main/java/cn/lili/ConsumerApplication.java
View File

@ -7,7 +7,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
* 消费者
*
* @author Chopper
* @date 2020/11/16 10:03 下午
* @since 2020/11/16 10:03 下午
*/
@SpringBootApplication
public class ConsumerApplication {

2
consumer/src/main/java/cn/lili/event/AfterSaleStatusChangeEvent.java
View File

@ -7,7 +7,7 @@ import cn.lili.modules.order.order.entity.dos.AfterSale;
* 售后单改变状态
*
* @author Chopper
* @date 2020/11/17 7:13 下午
* @since 2020/11/17 7:13 下午
*/
public interface AfterSaleStatusChangeEvent {

2
consumer/src/main/java/cn/lili/event/GoodsCommentCompleteEvent.java
View File

@ -6,7 +6,7 @@ import cn.lili.modules.member.entity.dos.MemberEvaluation;
* 订单状态改变事件
*
* @author Chopper
* @date 2020/11/17 7:13 下午
* @since 2020/11/17 7:13 下午
*/
public interface GoodsCommentCompleteEvent {

2
consumer/src/main/java/cn/lili/event/MemberPointChangeEvent.java
View File

@ -6,7 +6,7 @@ import cn.lili.modules.member.entity.dto.MemberPointMessage;
* 会员积分改变消息
*
* @author Chopper
* @date 2020/11/17 7:13 下午
* @since 2020/11/17 7:13 下午
*/
public interface MemberPointChangeEvent {

2
consumer/src/main/java/cn/lili/event/MemberRegisterEvent.java
View File

@ -6,7 +6,7 @@ import cn.lili.modules.member.entity.dos.Member;
* 会员注册消息
*
* @author Chopper
* @date 2020/11/17 7:13 下午
* @since 2020/11/17 7:13 下午
*/
public interface MemberRegisterEvent {

2
consumer/src/main/java/cn/lili/event/MemberWithdrawalEvent.java
View File

@ -6,7 +6,7 @@ import cn.lili.modules.member.entity.dto.MemberWithdrawalMessage;
* 会员提现消息
*
* @author Chopper
* @date 2020/11/17 7:13 下午
* @since 2020/11/17 7:13 下午
*/
public interface MemberWithdrawalEvent {

2
consumer/src/main/java/cn/lili/event/OrderStatusChangeEvent.java
View File

@ -6,7 +6,7 @@ import cn.lili.modules.order.order.entity.dto.OrderMessage;
* 订单状态改变事件
*
* @author Chopper
* @date 2020/11/17 7:13 下午
* @since 2020/11/17 7:13 下午
*/
public interface OrderStatusChangeEvent {

2
consumer/src/main/java/cn/lili/event/TradeEvent.java
View File

@ -6,7 +6,7 @@ import cn.lili.modules.order.cart.entity.dto.TradeDTO;
* 订单创建消息
*
* @author Chopper
* @date 2021/2/2 15:15
* @since 2021/2/2 15:15
*/
public interface TradeEvent {

2
consumer/src/main/java/cn/lili/event/impl/DistributionOrderExecute.java
View File

@ -22,7 +22,7 @@ import javax.annotation.Resource;
* 分销订单入库
*
* @author Chopper
* @date 2020-07-03 11:20
* @since 2020-07-03 11:20
*/
@Slf4j
@Service

2
consumer/src/main/java/cn/lili/event/impl/GoodsSkuExecute.java
View File

@ -11,7 +11,7 @@ import org.springframework.stereotype.Service;
* 商品SKU变化
*
* @author Chopper
* @date 2020-07-03 11:20
* @since 2020-07-03 11:20
*/
@Service
public class GoodsSkuExecute implements GoodsCommentCompleteEvent {

2
consumer/src/main/java/cn/lili/event/impl/MemberExperienceExecute.java
View File

@ -24,7 +24,7 @@ import org.springframework.stereotype.Service;
* 会员经验值
*
* @author Bulbasaur
* @date: 2021/5/16 11:16 下午
* @since: 2021/5/16 11:16 下午
*/
@Service
public class MemberExperienceExecute implements MemberRegisterEvent, GoodsCommentCompleteEvent, OrderStatusChangeEvent {

2
consumer/src/main/java/cn/lili/event/impl/MemberPointExecute.java
View File

@ -28,7 +28,7 @@ import org.springframework.stereotype.Service;
* 会员积分
*
* @author Bulbasaur
* @date 2020-07-03 11:20
* @since 2020-07-03 11:20
*/
@Service
public class MemberPointExecute implements MemberRegisterEvent, GoodsCommentCompleteEvent, OrderStatusChangeEvent, AfterSaleStatusChangeEvent {

2
consumer/src/main/java/cn/lili/event/impl/MemberWalletExecute.java
View File

@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
* 会员钱包创建
*
* @author Chopper
* @date 2020-07-03 11:20
* @since 2020-07-03 11:20
*/
@Service
public class MemberWalletExecute implements MemberRegisterEvent {

74
consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java
View File

@ -1,6 +1,7 @@
package cn.lili.event.impl;
import cn.lili.event.*;
import cn.lili.modules.distribution.entity.enums.DistributionCashStatusEnum;
import cn.lili.modules.member.entity.dto.MemberPointMessage;
import cn.lili.modules.member.entity.dto.MemberWithdrawalMessage;
import cn.lili.modules.member.entity.enums.MemberWithdrawalDestinationEnum;
@ -27,7 +28,7 @@ import java.util.Map;
* 通知类消息实现
*
* @author Chopper
* @date 2020-07-03 11:20
* @since 2020-07-03 11:20
**/
@Service
public class NoticeMessageExecute implements TradeEvent, OrderStatusChangeEvent, AfterSaleStatusChangeEvent, MemberPointChangeEvent, MemberWithdrawalEvent {
@ -171,27 +172,58 @@ public class NoticeMessageExecute implements TradeEvent, OrderStatusChangeEvent,
@Override
public void memberWithdrawal(MemberWithdrawalMessage memberWithdrawalMessage) {
//如果提现到余额
if (memberWithdrawalMessage.getDestination().equals(MemberWithdrawalDestinationEnum.WALLET.name())) {
//组织参数
NoticeMessageDTO noticeMessageDTO = new NoticeMessageDTO();
noticeMessageDTO.setMemberId(memberWithdrawalMessage.getMemberId());
Map<String, String> params = new HashMap<>(2);
params.put("income", memberWithdrawalMessage.getPrice().toString());
noticeMessageDTO.setParameter(params);
noticeMessageDTO.setNoticeMessageNodeEnum(NoticeMessageNodeEnum.WALLET_WITHDRAWAL_SUCCESS);
//发送提现申请成功消息
noticeMessageService.noticeMessage(noticeMessageDTO);
params.put("income", memberWithdrawalMessage.getPrice().toString());
params.put("expenditure", "0");
noticeMessageDTO.setNoticeMessageNodeEnum(NoticeMessageNodeEnum.WALLET_CHANGE);
noticeMessageDTO.setParameter(params);
//发送余额变动消息
noticeMessageService.noticeMessage(noticeMessageDTO);
//如果提现状态为申请则发送申请提现站内消息
if(memberWithdrawalMessage.getStatus().equals(DistributionCashStatusEnum.APPLY.name())){
//如果提现到余额
if (memberWithdrawalMessage.getDestination().equals(MemberWithdrawalDestinationEnum.WALLET.name())) {
NoticeMessageDTO noticeMessageDTO = new NoticeMessageDTO();
noticeMessageDTO.setMemberId(memberWithdrawalMessage.getMemberId());
noticeMessageDTO.setNoticeMessageNodeEnum(NoticeMessageNodeEnum.WALLET_WITHDRAWAL_CREATE);
Map<String, String> params = new HashMap<>(2);
params.put("price", memberWithdrawalMessage.getPrice().toString());
noticeMessageDTO.setParameter(params);
//发送提现申请成功消息
noticeMessageService.noticeMessage(noticeMessageDTO);
}
}
//如果提现状态为通过则发送审核通过站内消息
if(memberWithdrawalMessage.getStatus().equals(DistributionCashStatusEnum.PASS.name())){
//如果提现到余额
if (memberWithdrawalMessage.getDestination().equals(MemberWithdrawalDestinationEnum.WALLET.name())) {
//组织参数
NoticeMessageDTO noticeMessageDTO = new NoticeMessageDTO();
noticeMessageDTO.setMemberId(memberWithdrawalMessage.getMemberId());
Map<String, String> params = new HashMap<>(2);
params.put("income", memberWithdrawalMessage.getPrice().toString());
noticeMessageDTO.setParameter(params);
noticeMessageDTO.setNoticeMessageNodeEnum(NoticeMessageNodeEnum.WALLET_WITHDRAWAL_SUCCESS);
//发送提现成功消息
noticeMessageService.noticeMessage(noticeMessageDTO);
params.put("income", memberWithdrawalMessage.getPrice().toString());
params.put("expenditure", "0");
noticeMessageDTO.setNoticeMessageNodeEnum(NoticeMessageNodeEnum.WALLET_CHANGE);
noticeMessageDTO.setParameter(params);
//发送余额变动消息
noticeMessageService.noticeMessage(noticeMessageDTO);
}
}
//如果提现状态为拒绝则发送审核拒绝站内消息
if(memberWithdrawalMessage.getStatus().equals(DistributionCashStatusEnum.REFUSE.name())){
//如果提现到余额
if (memberWithdrawalMessage.getDestination().equals(MemberWithdrawalDestinationEnum.WALLET.name())) {
NoticeMessageDTO noticeMessageDTO = new NoticeMessageDTO();
noticeMessageDTO.setMemberId(memberWithdrawalMessage.getMemberId());
noticeMessageDTO.setNoticeMessageNodeEnum(NoticeMessageNodeEnum.WALLET_WITHDRAWAL_ERROR);
Map<String, String> params = new HashMap<>(2);
params.put("price", memberWithdrawalMessage.getPrice().toString());
noticeMessageDTO.setParameter(params);
//发送提现申请成功消息
noticeMessageService.noticeMessage(noticeMessageDTO);
}
}
}

2
consumer/src/main/java/cn/lili/event/impl/OrderCreateReceiptExecute.java
View File

@ -19,7 +19,7 @@ import java.util.List;
* 订单创建发票相关处理
*
* @author Chopper
* @date 2020-07-03 11:20
* @since 2020-07-03 11:20
**/
@Service
public class OrderCreateReceiptExecute implements TradeEvent {

2
consumer/src/main/java/cn/lili/event/impl/OrderStatusHandlerExecute.java
View File

@ -11,7 +11,7 @@ import org.springframework.stereotype.Service;
* 订单状态处理类
*
* @author Chopper
* @date 2020-07-03 11:20
* @since 2020-07-03 11:20
**/
@Service
public class OrderStatusHandlerExecute implements TradeEvent {

2
consumer/src/main/java/cn/lili/event/impl/PaymentExecute.java
View File

@ -18,7 +18,7 @@ import org.springframework.stereotype.Service;
* 支付
*
* @author Chopper
* @date 2021-03-13 16:58
* @since 2021-03-13 16:58
*/
@Slf4j
@Service

2
consumer/src/main/java/cn/lili/event/impl/RegisteredCouponActivityExecute.java
View File

@ -16,7 +16,7 @@ import java.util.List;
* 注册赠券活动
*
* @author Bulbasaur
* @date: 2021/5/24 10:48 上午
* @since: 2021/5/24 10:48 上午
*/
@Component
public class RegisteredCouponActivityExecute implements MemberRegisterEvent {

12
consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java
View File

@ -1,7 +1,7 @@
package cn.lili.event.impl;
import cn.hutool.core.convert.Convert;
import cn.lili.common.cache.Cache;
import cn.lili.cache.Cache;
import cn.lili.event.OrderStatusChangeEvent;
import cn.lili.modules.goods.entity.dos.GoodsSku;
import cn.lili.modules.goods.service.GoodsSkuService;
@ -11,7 +11,7 @@ import cn.lili.modules.order.order.entity.enums.PayStatusEnum;
import cn.lili.modules.order.order.entity.vo.OrderDetailVO;
import cn.lili.modules.order.order.service.OrderService;
import cn.lili.modules.promotion.entity.dos.PromotionGoods;
import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum;
import cn.lili.common.enums.PromotionTypeEnum;
import cn.lili.modules.promotion.service.PromotionGoodsService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@ -26,7 +26,7 @@ import java.util.List;
* 库存扣减，他表示了订单状态是否出库成功
*
* @author Chopper
* @date 2020-07-03 11:20
* @since 2020-07-03 11:20
*/
@Slf4j
@Service
@ -161,6 +161,11 @@ public class StockUpdateExecute implements OrderStatusChangeEvent {
/**
* 同步库存和促销库存
*
* 需修改：DB：商品库存、Sku商品库存、活动商品库存
* 1.获取需要修改的Sku列表、活动商品列表
* 2.写入sku商品库存，批量修改
* 3.写入促销商品的卖出数量、剩余数量,批量修改
* 4.调用方法修改商品库存
* @param order 订单
*/
private void synchroDB(OrderDetailVO order) {
@ -179,6 +184,7 @@ public class StockUpdateExecute implements OrderStatusChangeEvent {
skuKeys.add(GoodsSkuService.getStockCacheKey(orderItem.getSkuId()));
GoodsSku goodsSku = new GoodsSku();
goodsSku.setId(orderItem.getSkuId());
goodsSku.setGoodsId(orderItem.getGoodsId());
//如果有促销信息
if (null != orderItem.getPromotionType() && null != orderItem.getPromotionId()) {
//如果促销有库存信息

2
consumer/src/main/java/cn/lili/event/impl/VerificationOrderExecute.java
View File

@ -21,7 +21,7 @@ import org.springframework.stereotype.Component;
* 虚拟商品
*
* @author Bulbasaur
* @date: 2021/5/29 9:17 上午
* @since: 2021/5/29 9:17 上午
*/
@Component
public class VerificationOrderExecute implements OrderStatusChangeEvent {

2
consumer/src/main/java/cn/lili/listener/AfterSaleMessageListener.java
View File

@ -1,7 +1,7 @@
package cn.lili.listener;
import cn.hutool.json.JSONUtil;
import cn.lili.common.rocketmq.tags.AfterSaleTagsEnum;
import cn.lili.rocketmq.tags.AfterSaleTagsEnum;
import cn.lili.event.AfterSaleStatusChangeEvent;
import cn.lili.modules.order.order.entity.dos.AfterSale;
import lombok.extern.slf4j.Slf4j;

2
consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java
View File

@ -1,7 +1,7 @@
package cn.lili.listener;
import cn.hutool.json.JSONUtil;
import cn.lili.common.rocketmq.tags.GoodsTagsEnum;
import cn.lili.rocketmq.tags.GoodsTagsEnum;
import cn.lili.event.GoodsCommentCompleteEvent;
import cn.lili.modules.distribution.entity.dos.DistributionGoods;
import cn.lili.modules.distribution.entity.dos.DistributionSelectedGoods;

2
consumer/src/main/java/cn/lili/listener/MemberMessageListener.java
View File

@ -1,7 +1,7 @@
package cn.lili.listener;
import cn.hutool.json.JSONUtil;
import cn.lili.common.rocketmq.tags.MemberTagsEnum;
import cn.lili.rocketmq.tags.MemberTagsEnum;
import cn.lili.event.MemberPointChangeEvent;
import cn.lili.event.MemberRegisterEvent;
import cn.lili.event.MemberWithdrawalEvent;

4
consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java
View File

@ -2,8 +2,8 @@ package cn.lili.listener;
import cn.hutool.json.JSONUtil;
import cn.lili.common.enums.SwitchEnum;
import cn.lili.common.rocketmq.tags.OtherTagsEnum;
import cn.lili.common.sms.SmsUtil;
import cn.lili.rocketmq.tags.OtherTagsEnum;
import cn.lili.modules.system.sms.SmsUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.modules.member.entity.dos.Member;
import cn.lili.modules.member.entity.vo.MemberSearchVO;

4
consumer/src/main/java/cn/lili/listener/OrderMessageListener.java
View File

@ -1,8 +1,8 @@
package cn.lili.listener;
import cn.hutool.json.JSONUtil;
import cn.lili.common.cache.Cache;
import cn.lili.common.rocketmq.tags.MqOrderTagsEnum;
import cn.lili.cache.Cache;
import cn.lili.rocketmq.tags.MqOrderTagsEnum;
import cn.lili.event.OrderStatusChangeEvent;
import cn.lili.event.TradeEvent;
import cn.lili.modules.order.cart.entity.dto.TradeDTO;

2
consumer/src/main/java/cn/lili/timetask/handler/EveryDayExecute.java
View File

@ -5,7 +5,7 @@ package cn.lili.timetask.handler;
* 每日凌晨1点执行
*
* @author Chopper
* @date 2020/12/24 11:52
* @since 2020/12/24 11:52
*/
public interface EveryDayExecute {

2
consumer/src/main/java/cn/lili/timetask/handler/EveryHourExecute.java
View File

@ -4,7 +4,7 @@ package cn.lili.timetask.handler;
* 每小时任务
*
* @author Chopper
* @date 2020/12/24 11:52
* @since 2020/12/24 11:52
*/
public interface EveryHourExecute {

2
consumer/src/main/java/cn/lili/timetask/handler/EveryMinuteExecute.java
View File

@ -4,7 +4,7 @@ package cn.lili.timetask.handler;
* 每分钟任务
*
* @author Chopper
* @date 2020/12/24 11:52
* @since 2020/12/24 11:52
*/
public interface EveryMinuteExecute {

2
consumer/src/main/java/cn/lili/timetask/handler/impl/bill/BillExecute.java
View File

@ -16,7 +16,7 @@ import java.util.List;
* 店铺结算执行
*
* @author Bulbasaur
* @date 2021/2/18 3:45 下午
* @since 2021/2/18 3:45 下午
*/
@Component
public class BillExecute implements EveryDayExecute {

2
consumer/src/main/java/cn/lili/timetask/handler/impl/broadcast/BroadcastExecute.java
View File

@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
* 小程序直播状态获取
*
* @author Bulbasaur
* @date: 2021/5/20 2:52 下午
* @since: 2021/5/20 2:52 下午
*/
@Component
public class BroadcastExecute implements EveryHourExecute {

2
consumer/src/main/java/cn/lili/timetask/handler/impl/coupon/CouponExecute.java
View File

@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
* 优惠券状态监测
*
* @author Bulbasaur
* @date: 2021/5/24 10:08 上午
* @since: 2021/5/24 10:08 上午
*/
@Component
public class CouponExecute implements EveryDayExecute {

2
consumer/src/main/java/cn/lili/timetask/handler/impl/goods/GoodsExecute.java
View File

@ -18,7 +18,7 @@ import java.util.Map;
* 商品定时器
*
* @author Chopper
* @date 2021/3/18 3:23 下午
* @since 2021/3/18 3:23 下午
*/
@Component
public class GoodsExecute implements EveryDayExecute {

30
consumer/src/main/java/cn/lili/timetask/handler/impl/hotwords/HotWordsEveryDayTaskExecute.java Normal file
View File

@ -0,0 +1,30 @@
package cn.lili.timetask.handler.impl.hotwords;
import cn.lili.cache.Cache;
import cn.lili.cache.CachePrefix;
import cn.lili.timetask.handler.EveryDayExecute;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
/**
* @author paulG
* @since 2021/3/11
**/
@Slf4j
@Component
public class HotWordsEveryDayTaskExecute implements EveryDayExecute {
@Autowired
private Cache cache;
/**
* 执行每日任务
*/
@Override
public void execute() {
//移除昨日的热搜词
cache.remove(CachePrefix.HOT_WORD.getPrefix());
}
}

2
consumer/src/main/java/cn/lili/timetask/handler/impl/order/CancelOrderTaskExecute.java
View File

@ -23,7 +23,7 @@ import java.util.stream.Collectors;
* 订单自动取消（每分钟执行）
*
* @author paulG
* @date 2021/3/11
* @since 2021/3/11
**/
@Slf4j
@Component

2
consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java
View File

@ -33,7 +33,7 @@ import java.util.List;
* 促销活动每日定时器
*
* @author Chopper
* @date 2021/3/18 3:23 下午
* @since 2021/3/18 3:23 下午
*/
@Slf4j
@Component

2
consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/MemberStatisticsExecute.java
View File

@ -14,7 +14,7 @@ import java.util.Date;
* 会员数据统计
*
* @author Chopper
* @date 2021-03-02 14:56
* @since 2021-03-02 14:56
*/
@Slf4j
@Component

8
consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java
View File

@ -1,9 +1,9 @@
package cn.lili.timetask.handler.impl.statistics;
import cn.lili.common.cache.Cache;
import cn.lili.common.cache.CachePrefix;
import cn.lili.cache.Cache;
import cn.lili.cache.CachePrefix;
import cn.lili.common.security.enums.UserEnums;
import cn.lili.config.properties.StatisticsProperties;
import cn.lili.common.properties.StatisticsProperties;
import cn.lili.modules.statistics.model.vo.OnlineMemberVO;
import cn.lili.timetask.handler.EveryHourExecute;
import org.springframework.beans.factory.annotation.Autowired;
@ -19,7 +19,7 @@ import java.util.stream.Collectors;
* 实时在线人数统计
*
* @author Chopper
* @date 2021-02-21 09:47
* @since 2021-02-21 09:47
*/
@Component
public class OnlineMemberStatistics implements EveryHourExecute {

2
consumer/src/main/java/cn/lili/timetask/handler/impl/storeRating/StoreRatingExecute.java
View File

@ -21,7 +21,7 @@ import java.util.List;
* 店铺评分
*
* @author Chopper
* @date 2021/3/15 5:30 下午
* @since 2021/3/15 5:30 下午
*/
@Component
public class StoreRatingExecute implements EveryDayExecute {

6
consumer/src/main/java/cn/lili/timetask/handler/impl/view/PageViewStatisticsExecute.java
View File

@ -1,8 +1,8 @@
package cn.lili.timetask.handler.impl.view;
import cn.hutool.core.convert.Convert;
import cn.lili.common.cache.Cache;
import cn.lili.common.cache.CachePrefix;
import cn.lili.cache.Cache;
import cn.lili.cache.CachePrefix;
import cn.lili.common.utils.BeanUtil;
import cn.lili.modules.statistics.model.dos.PlatformViewData;
import cn.lili.modules.statistics.service.PlatformViewDataService;
@ -23,7 +23,7 @@ import java.util.List;
* 统计 入库
*
* @author Chopper
* @date 2021-01-15 18:20
* @since 2021-01-15 18:20
*/
@Slf4j
@Component

2
consumer/src/main/java/cn/lili/trigger/AbstractDelayQueueListen.java
View File

@ -1,7 +1,7 @@
package cn.lili.trigger;
import cn.hutool.json.JSONUtil;
import cn.lili.common.cache.Cache;
import cn.lili.cache.Cache;
import cn.lili.common.utils.ThreadPoolUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

8
consumer/src/main/java/cn/lili/trigger/TimeTriggerConsumer.java
View File

@ -1,9 +1,9 @@
package cn.lili.trigger;
import cn.hutool.json.JSONUtil;
import cn.lili.common.cache.Cache;
import cn.lili.common.trigger.model.TimeTriggerMsg;
import cn.lili.common.trigger.util.DelayQueueTools;
import cn.lili.cache.Cache;
import cn.lili.trigger.model.TimeTriggerMsg;
import cn.lili.trigger.util.DelayQueueTools;
import cn.lili.common.utils.SpringContextUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
@ -15,7 +15,7 @@ import org.springframework.stereotype.Component;
* 事件触发消费者
*
* @author paulG
* @date 2020/11/17 7:19 下午
* @since 2020/11/17 7:19 下午
*/
@Component
@Slf4j

6
consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java
View File

@ -1,8 +1,8 @@
package cn.lili.trigger.executor;
import cn.hutool.json.JSONUtil;
import cn.lili.common.delayqueue.BroadcastMessage;
import cn.lili.common.trigger.model.TimeExecuteConstant;
import cn.lili.trigger.message.BroadcastMessage;
import cn.lili.trigger.model.TimeExecuteConstant;
import cn.lili.modules.goods.service.StudioService;
import cn.lili.trigger.TimeTriggerExecutor;
import lombok.extern.slf4j.Slf4j;
@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
* 直播间事件触发
*
* @author Bulbasaur
* @date: 2021/6/1 5:02 下午
* @since: 2021/6/1 5:02 下午
*/
@Slf4j
@Component(TimeExecuteConstant.BROADCAST_EXECUTOR)

14
consumer/src/main/java/cn/lili/trigger/executor/PromotionTimeTriggerExecutor.java
View File

@ -1,13 +1,13 @@
package cn.lili.trigger.executor;
import cn.hutool.json.JSONUtil;
import cn.lili.common.trigger.interfaces.TimeTrigger;
import cn.lili.trigger.interfaces.TimeTrigger;
import cn.lili.trigger.TimeTriggerExecutor;
import cn.lili.common.trigger.message.PintuanOrderMessage;
import cn.lili.common.trigger.message.PromotionMessage;
import cn.lili.common.trigger.model.TimeExecuteConstant;
import cn.lili.common.trigger.model.TimeTriggerMsg;
import cn.lili.config.rocketmq.RocketmqCustomProperties;
import cn.lili.trigger.message.PintuanOrderMessage;
import cn.lili.trigger.message.PromotionMessage;
import cn.lili.trigger.model.TimeExecuteConstant;
import cn.lili.trigger.model.TimeTriggerMsg;
import cn.lili.common.properties.RocketmqCustomProperties;
import cn.lili.modules.order.order.service.OrderService;
import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum;
import cn.lili.modules.promotion.service.PromotionService;
@ -20,7 +20,7 @@ import org.springframework.stereotype.Component;
*
* @author Chopper
* @version v4.1
* @date 2020/11/17 7:20 下午
* @since 2020/11/17 7:20 下午
*/
@Slf4j
@Component(TimeExecuteConstant.PROMOTION_EXECUTOR)

Some files were not shown because too many files have changed in this diff Show More