Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop

DB/version4.2.4toMASTER.sql

@@ -1,51 +0,0 @@
-/** 增加签到日期 **/
-ALTER TABLE li_member_sign
-    ADD day int DEFAULT NULL COMMENT '签到日 ';
-ALTER TABLE li_member_sign
-    DROP INDEX uk_member_day;
-ALTER TABLE li_member_sign
-    add unique uk_member_day (member_id, day) COMMENT 'uk_member_day';
-
-
-
--- ----------------------------
--- Table structure for li_hot_words_history
--- ----------------------------
-DROP TABLE IF EXISTS `li_hot_words_history`;
-CREATE TABLE `li_hot_words_history`
-(
-    `id`          bigint NOT NULL COMMENT 'ID',
-    `create_time` datetime(6)                   DEFAULT NULL COMMENT '创建时间',
-    `keywords`    varchar(255) COLLATE utf8_bin DEFAULT NULL COMMENT '热词',
-    `score`       int                           DEFAULT NULL COMMENT '热词分数',
-    PRIMARY KEY (`id`)
-) ENGINE = InnoDB DEFAULT CHARSET = utf8mb3 COLLATE = utf8_bin COMMENT '热词历史表';
-
--- ----------------------------
--- Records of li_hot_words_history
--- ----------------------------
-
--- ----------------------------
--- Table structure for li_wholesale
--- ----------------------------
-DROP TABLE IF EXISTS `li_wholesale`;
-CREATE TABLE `li_wholesale`
-(
-    `id`          bigint NOT NULL,
-    `create_by`   varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
-    `create_time` datetime(6)                                            DEFAULT NULL,
-    `delete_flag` bit(1)                                                 DEFAULT NULL,
-    `update_by`   varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
-    `update_time` datetime(6)                                            DEFAULT NULL,
-    `price`       decimal(10, 2)                                         DEFAULT NULL COMMENT '价格',
-    `goods_id`    bigint                                                 DEFAULT NULL COMMENT '商品id',
-    `sku_id`      bigint                                                 DEFAULT NULL COMMENT '商品skuId',
-    `num`         int                                                    DEFAULT NULL COMMENT '起购量',
-    PRIMARY KEY (`id`)
-) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_bin COMMENT '批发规则表';
-
-ALTER TABLE li_wholesale
-    ADD template_id bigint DEFAULT NULL COMMENT '商品模版id';
-
-/** 店铺--默认页面是否开启**/
-ALTER TABLE li_store ADD page_show bit(1) DEFAULT NULL COMMENT '默认页面是否开启';

DB/version4.2.5toMASTER.sql

@@ -0,0 +1,82 @@
+
+/** 优惠券活动增加领取周期字段 **/
+ALTER TABLE li_coupon_activity ADD coupon_frequency_enum varchar(255) COMMENT '领取周期';
+-- 会员优惠券标识
+CREATE TABLE `li_member_coupon_sign`  (
+                                     `id` bigint NOT NULL,
+                                     `coupon_activity_Id` bigint NULL DEFAULT NULL COMMENT '优惠券活动id',
+                                     `member_id` bigint NULL DEFAULT NULL COMMENT '会员id',
+                                     `invalid_time` datetime NULL DEFAULT NULL COMMENT '过期时间',
+                                     `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+                                     PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin ROW_FORMAT = DYNAMIC;
+
+/**
+  IM聊天
+ */
+CREATE TABLE `li_im_talk` (
+                              `id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+                              `create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '创建者',
+                              `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+                              `delete_flag` bit(1) DEFAULT NULL COMMENT '删除标志',
+                              `update_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '修改者',
+                              `update_time` datetime(6) DEFAULT NULL COMMENT '修改时间',
+                              `user_id1` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '用户1Id',
+                              `user_id2` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '用户2Id',
+                              `name1` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '用户1名称',
+                              `name2` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '用户2名称',
+                              `face1` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '用户1头像',
+                              `face2` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '用户2头像',
+                              `top1` bit(1) DEFAULT NULL COMMENT '用户1置顶标识',
+                              `top2` bit(1) DEFAULT NULL COMMENT '用户2置顶标识',
+                              `disable1` bit(1) DEFAULT NULL COMMENT '用户1禁用标识',
+                              `disable2` bit(1) DEFAULT NULL COMMENT '用户2禁用标识',
+                              `store_flag1` bit(1) DEFAULT NULL COMMENT '用户1店铺标识',
+                              `store_flag2` bit(1) DEFAULT NULL COMMENT '用户2店铺标识',
+                              `last_talk_time` datetime DEFAULT NULL COMMENT '最后聊天时间',
+                              `last_talk_message` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '最后的消息',
+                              `last_message_type` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '最后消息类型',
+                              `talk_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '聊天Id',
+                              `tenant_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '坐席Id',
+                              `tenant_name` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '坐席名称',
+                              PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+
+/**
+  IM消息
+ */
+CREATE TABLE `li_im_message` (
+                                 `id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+                                 `create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '创建者',
+                                 `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+                                 `delete_flag` bit(1) DEFAULT NULL COMMENT '删除标识',
+                                 `update_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '修改者',
+                                 `update_time` datetime(6) DEFAULT NULL COMMENT '修改标识',
+                                 `from_user` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发送用户Id',
+                                 `to_user` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '接收用户Id',
+                                 `is_read` bit(1) DEFAULT NULL COMMENT '已读标识',
+                                 `message_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '聊天类型',
+                                 `text` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '聊天内容',
+                                 `talk_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '聊天Id',
+                                 PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+
+
+
+/**
+  订单增加自提信息
+ */
+ALTER TABLE li_order ADD `store_address_path` varchar(255) DEFAULT NULL;
+ALTER TABLE li_order ADD  `store_address_center` varchar(255) DEFAULT NULL;
+ALTER TABLE li_order ADD  `store_address_mobile` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL;
+
+/**
+  店铺是否开启自提
+ */
+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';

buyer-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsBuyerController.java

@@ -54,22 +54,22 @@ public class DistributionGoodsBuyerController {
     @PreventDuplicateSubmissions
     @ApiOperation(value = "选择分销商品")
     @ApiImplicitParams({
-        @ApiImplicitParam(name = "distributionGoodsId", value = "分销ID", required = true, dataType = "String", paramType = "path"),
+            @ApiImplicitParam(name = "distributionGoodsId", value = "分销ID", required = true, dataType = "String", paramType = "path"),
             @ApiImplicitParam(name = "checked", value = "是否选择", required = true, dataType = "boolean", paramType = "query")
     })
     @GetMapping(value = "/checked/{distributionGoodsId}")
     public ResultMessage<Object> distributionCheckGoods(
-            @NotNull(message = "分销商品不能为空") @PathVariable("distributionGoodsId") String distributionGoodsId,Boolean checked) {
+            @NotNull(message = "分销商品不能为空") @PathVariable("distributionGoodsId") String distributionGoodsId, Boolean checked) {
-        Boolean result=false;
+        Boolean result = false;
-        if(checked){
+        if (checked) {
-            result=distributionSelectedGoodsService.add(distributionGoodsId);
+            result = distributionSelectedGoodsService.add(distributionGoodsId);
-        }else {
+        } else {
-            result=distributionSelectedGoodsService.delete(distributionGoodsId);
+            result = distributionSelectedGoodsService.delete(distributionGoodsId);
         }
         //判断操作结果
-        if(result){
+        if (result) {
             return ResultUtil.success(ResultCode.SUCCESS);
-        }else{
+        } else {
             throw new ServiceException(ResultCode.ERROR);
         }
 

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

@@ -1,14 +1,17 @@
 package cn.lili.controller.member;
 
 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.member.entity.dto.FootPrintQueryParams;
 import cn.lili.modules.member.service.FootprintService;
 import cn.lili.modules.search.entity.dos.EsGoodsIndex;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
+import org.apache.catalina.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -35,8 +38,9 @@ public class FootprintController {
 
     @ApiOperation(value = "分页获取")
     @GetMapping
-    public ResultMessage<IPage<EsGoodsIndex>> getByPage(PageVO page) {
+    public ResultMessage<IPage<EsGoodsIndex>> getByPage(FootPrintQueryParams params) {
-        return ResultUtil.data(footprintService.footPrintPage(page));
+        params.setMemberId(UserContext.getCurrentUser().getId());
+        return ResultUtil.data(footprintService.footPrintPage(params));
     }
 
     @ApiOperation(value = "根据id删除")
@@ -61,4 +65,10 @@ public class FootprintController {
         return ResultUtil.data(footprintService.getFootprintNum());
     }
 
+
+    @GetMapping("/history")
+    @ApiOperation(value = "获取会员的历史足迹")
+    public ResultMessage<IPage<EsGoodsIndex>> getMemberHistory(FootPrintQueryParams params) {
+        return ResultUtil.data(footprintService.footPrintPage(params));
+    }
 }

buyer-api/src/main/java/cn/lili/controller/order/CartController.java

@@ -189,20 +189,38 @@ public class CartController {
         }
     }
 
+    @ApiOperation(value = "选择自提地址")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "storeAddressId", value = "自提地址id ", required = true, paramType = "query"),
+            @ApiImplicitParam(name = "way", value = "购物车类型 ", paramType = "query")
+    })
+    @GetMapping("/storeAddress")
+    public ResultMessage<Object> shippingSelfPickAddress(@NotNull(message = "自提地址ID不能为空") String storeAddressId,
+                                                 String way) {
+        try {
+            cartService.shippingSelfAddress(storeAddressId, way);
+            return ResultUtil.success();
+        } catch (ServiceException se) {
+            log.error(ResultCode.SHIPPING_NOT_APPLY.message(), se);
+            throw new ServiceException(ResultCode.SHIPPING_NOT_APPLY);
+        } catch (Exception e) {
+            log.error(ResultCode.CART_ERROR.message(), e);
+            throw new ServiceException(ResultCode.CART_ERROR);
+        }
+    }
+
     @ApiOperation(value = "选择配送方式")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "shippingMethod", value = "配送方式：SELF_PICK_UP(自提)," +
                     "LOCAL_TOWN_DELIVERY(同城配送)," +
                     "LOGISTICS(物流) ", required = true, paramType = "query"),
-            @ApiImplicitParam(name = "selleId", value = "店铺id", paramType = "query"),
             @ApiImplicitParam(name = "way", value = "购物车类型 ", paramType = "query")
     })
-    @GetMapping("/shippingMethod")
+    @PutMapping("/shippingMethod")
     public ResultMessage<Object> shippingMethod(@NotNull(message = "配送方式不能为空") String shippingMethod,
-                                                String selleId,
                                                 String way) {
         try {
-            cartService.shippingMethod(selleId, shippingMethod, way);
+            cartService.shippingMethod( shippingMethod, way);
             return ResultUtil.success();
         } catch (ServiceException se) {
             log.error(se.getMsg(), se);
@@ -213,6 +231,21 @@ public class CartController {
         }
     }
 
+    @ApiOperation(value = "获取用户可选择的物流方式")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "way", value = "购物车类型 ", paramType = "query")
+    })
+    @GetMapping("/shippingMethodList")
+    public ResultMessage<Object> shippingMethodList(String way) {
+        try {
+            return ResultUtil.data(cartService.shippingMethodList(way));
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+            return ResultUtil.error(ResultCode.ERROR);
+        }
+    }
+
     @ApiOperation(value = "选择发票")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "way", value = "购物车购买：CART/立即购买：BUY_NOW/拼团购买：PINTUAN / 积分购买：POINT ", required = true, paramType = "query"),

buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java

@@ -128,5 +128,4 @@ public class OrderBuyerController {
         return ResultUtil.data(orderService.invoice(orderSn));
     }
 
-
 }

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

@@ -3,6 +3,8 @@ package cn.lili.controller.passport;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.exception.ServiceException;
+import cn.lili.common.security.AuthUser;
+import cn.lili.common.security.context.UserContext;
 import cn.lili.common.security.enums.UserEnums;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.member.entity.dos.Member;
@@ -264,4 +266,18 @@ public class MemberBuyerController {
         return ResultUtil.data(this.memberService.refreshToken(refreshToken));
     }
 
+    @GetMapping("/getImUser")
+    @ApiOperation(value = "获取用户信息")
+    public ResultMessage<Member> getImUser() {
+        AuthUser authUser = UserContext.getCurrentUser();
+        return ResultUtil.data(memberService.getById(authUser.getId()));
+    }
+
+    @GetMapping("/getImUserDetail/{memberId}")
+    @ApiImplicitParam(name = "memberId", value = "店铺Id", required = true, dataType = "String", paramType = "path")
+    @ApiOperation(value = "获取用户信息")
+    public ResultMessage<Member> getImUserDetail(@PathVariable String memberId) {
+        return ResultUtil.data(memberService.getById(memberId));
+    }
+
 }

buyer-api/src/main/java/cn/lili/controller/promotion/CouponBuyerController.java

@@ -7,11 +7,14 @@ import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.promotion.entity.dos.MemberCoupon;
+import cn.lili.modules.promotion.entity.dto.CouponActivityTrigger;
 import cn.lili.modules.promotion.entity.dto.search.CouponSearchParams;
 import cn.lili.modules.promotion.entity.dto.search.MemberCouponSearchParams;
+import cn.lili.modules.promotion.entity.enums.CouponActivityTypeEnum;
 import cn.lili.modules.promotion.entity.enums.CouponGetEnum;
 import cn.lili.modules.promotion.entity.enums.PromotionsStatusEnum;
 import cn.lili.modules.promotion.entity.vos.CouponVO;
+import cn.lili.modules.promotion.service.CouponActivityService;
 import cn.lili.modules.promotion.service.CouponService;
 import cn.lili.modules.promotion.service.MemberCouponService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -26,6 +29,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.constraints.NotNull;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -45,12 +49,30 @@ public class CouponBuyerController {
     @Autowired
     private CouponService couponService;
 
+    /**
+     * 优惠券活动
+     */
+    @Autowired
+    private CouponActivityService couponActivityService;
+
     /**
      * 会员优惠券
      */
     @Autowired
     private MemberCouponService memberCouponService;
 
+    @GetMapping("/activity")
+    @ApiOperation(value = "自动领取优惠券")
+    public ResultMessage<List<MemberCoupon>> activity() {
+        return ResultUtil.data(couponActivityService.trigger(
+                CouponActivityTrigger.builder()
+                        .couponActivityTypeEnum(CouponActivityTypeEnum.AUTO_COUPON)
+                        .nickName(UserContext.getCurrentUser().getNickName())
+                        .userId(UserContext.getCurrentUser().getId())
+                        .build())
+        );
+    }
+
     @GetMapping
     @ApiOperation(value = "获取可领取优惠券列表")
     public ResultMessage<IPage<CouponVO>> getCouponList(CouponSearchParams queryParam, PageVO page) {

buyer-api/src/main/java/cn/lili/controller/store/StoreAddressBuyerController.java

@@ -0,0 +1,53 @@
+package cn.lili.controller.store;
+
+import cn.lili.common.enums.ResultUtil;
+import cn.lili.common.security.OperationalJudgment;
+import cn.lili.common.security.context.UserContext;
+import cn.lili.common.vo.PageVO;
+import cn.lili.common.vo.ResultMessage;
+import cn.lili.modules.store.entity.dos.StoreAddress;
+import cn.lili.modules.store.service.StoreAddressService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Objects;
+
+/**
+ * 买家端,商家地址（自提点）接口
+ *
+ * @author chc
+ * @since 2022/6/2114:46
+ */
+@RestController
+@Api(tags = "买家端,商家地址（自提点）接口")
+@RequestMapping("/buyer/store/address")
+public class StoreAddressBuyerController {
+
+    /**
+     * 店铺自提点
+     */
+    @Autowired
+    private StoreAddressService storeAddressService;
+
+    @ApiOperation(value = "获取商家自提点分页")
+    @ApiImplicitParam(name = "storeId", value = "店铺Id", required = true, dataType = "String", paramType = "path")
+    @GetMapping("/page/{storeId}")
+    public ResultMessage<IPage<StoreAddress>> get(PageVO pageVo,@PathVariable String storeId) {
+        return ResultUtil.data(storeAddressService.getStoreAddress(storeId, pageVo));
+    }
+
+    @ApiOperation(value = "获取商家自提点信息")
+    @ApiImplicitParam(name = "id", value = "自提点ID", required = true, paramType = "path")
+    @GetMapping("/{id}")
+    public ResultMessage<StoreAddress> get(@PathVariable String id) {
+        StoreAddress address = OperationalJudgment.judgment(storeAddressService.getById(id));
+        return ResultUtil.data(address);
+    }
+}

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

@@ -1,11 +1,13 @@
 package cn.lili.controller.store;
 
 import cn.lili.common.enums.ResultUtil;
+import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.goods.entity.vos.StoreGoodsLabelVO;
 import cn.lili.modules.goods.service.StoreGoodsLabelService;
+import cn.lili.modules.store.entity.dos.Store;
 import cn.lili.modules.store.entity.dto.StoreBankDTO;
 import cn.lili.modules.store.entity.dto.StoreCompanyDTO;
 import cn.lili.modules.store.entity.dto.StoreOtherInfoDTO;
@@ -57,6 +59,20 @@ public class StoreBuyerController {
         return ResultUtil.data(storeService.findByConditionPage(entity, page));
     }
 
+    @GetMapping("/store")
+    @ApiOperation(value = "im-获取店铺信息")
+    public ResultMessage<Store> getStoreUser() {
+        AuthUser authUser = UserContext.getCurrentUser();
+        return ResultUtil.data(storeService.getById(authUser.getStoreId()));
+    }
+
+    @GetMapping("/store/{storeId}")
+    @ApiImplicitParam(name = "storeId", value = "店铺Id", required = true, dataType = "String", paramType = "path")
+    @ApiOperation(value = "im-店铺ID获取店铺信息")
+    public ResultMessage<Store> getStoreUserDetail(@PathVariable String storeId) {
+        return ResultUtil.data(storeService.getById(storeId));
+    }
+
     @ApiOperation(value = "通过id获取店铺信息")
     @ApiImplicitParam(name = "id", value = "店铺ID", required = true, paramType = "path")
     @GetMapping(value = "/get/detail/{id}")

buyer-api/src/main/resources/application.yml

@@ -265,6 +265,8 @@ lili:
       order-group: lili_order_group
       member-topic: lili_member_topic
       member-group: lili_member_group
+      store-topic: lili_store_topic
+      store-group: lili_store_group
       other-topic: lili_other_topic
       other-group: lili_other_group
       notice-topic: lili_notice_topic

consumer/src/main/java/cn/lili/event/MemberInfoChangeEvent.java

@@ -0,0 +1,17 @@
+package cn.lili.event;
+
+import cn.lili.modules.member.entity.dos.Member;
+
+/**
+ * @author chc
+ * @since 2022/6/2114:46
+ */
+public interface MemberInfoChangeEvent {
+
+    /**
+     * 会员信息更改消息
+     *
+     * @param member 会员信息
+     */
+    void memberInfoChange(Member member);
+}

consumer/src/main/java/cn/lili/event/StoreSettingChangeEvent.java

@@ -0,0 +1,18 @@
+package cn.lili.event;
+
+
+import cn.lili.modules.store.entity.dos.Store;
+
+/**
+ * @author chc
+ * @since 2022/6/2114:46
+ */
+public interface StoreSettingChangeEvent {
+
+    /**
+     * 店铺信息更改消息
+     *
+     * @param store 店铺信息
+     */
+    void storeSettingChange(Store store);
+}

consumer/src/main/java/cn/lili/event/impl/DistributionOrderExecute.java

@@ -44,8 +44,9 @@ public class DistributionOrderExecute implements OrderStatusChangeEvent, EveryDa
     public void orderChange(OrderMessage orderMessage) {
 
         switch (orderMessage.getNewStatus()) {
-            //订单带校验/订单代发货，则记录分销信息
+            //订单带校验/订单代发货/待自提，则记录分销信息
             case TAKE:
+            case STAY_PICKED_UP:
             case UNDELIVERED: {
                 //记录分销订单
                 distributionOrderService.calculationDistribution(orderMessage.getOrderSn());

consumer/src/main/java/cn/lili/event/impl/ImTalkExecute.java

@@ -0,0 +1,60 @@
+package cn.lili.event.impl;
+
+import cn.lili.event.MemberInfoChangeEvent;
+import cn.lili.event.StoreSettingChangeEvent;
+import cn.lili.modules.im.entity.dos.ImTalk;
+import cn.lili.modules.im.service.ImTalkService;
+import cn.lili.modules.member.entity.dos.Member;
+import cn.lili.modules.store.entity.dos.Store;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Im对话消息
+ *
+ * @author chc
+ * @since 2022/6/2114:46
+ */
+@Service
+public class ImTalkExecute implements MemberInfoChangeEvent, StoreSettingChangeEvent {
+
+    @Autowired
+    private ImTalkService imTalkService;
+
+    @Override
+    public void memberInfoChange(Member member) {
+        //当与UserId1相等时
+        List<ImTalk> imTalkList1 = imTalkService.list(new LambdaQueryWrapper<ImTalk>().eq(ImTalk::getUserId1, member.getId()));
+        for (ImTalk imTalk : imTalkList1) {
+            imTalk.setName1(member.getNickName());
+            imTalk.setFace1(member.getFace());
+        }
+        imTalkService.updateBatchById(imTalkList1);
+        List<ImTalk> imTalkList2 = imTalkService.list(new LambdaQueryWrapper<ImTalk>().eq(ImTalk::getUserId2, member.getId()));
+        for (ImTalk imTalk : imTalkList2) {
+            imTalk.setName2(member.getNickName());
+            imTalk.setFace2(member.getFace());
+        }
+        imTalkService.updateBatchById(imTalkList2);
+    }
+
+    @Override
+    public void storeSettingChange(Store store) {
+        //当与UserId1相等时
+        List<ImTalk> imTalkList1 = imTalkService.list(new LambdaQueryWrapper<ImTalk>().eq(ImTalk::getUserId1, store.getId()));
+        for (ImTalk imTalk : imTalkList1) {
+            imTalk.setName1(store.getStoreName());
+            imTalk.setFace1(store.getStoreLogo());
+        }
+        imTalkService.updateBatchById(imTalkList1);
+        List<ImTalk> imTalkList2 = imTalkService.list(new LambdaQueryWrapper<ImTalk>().eq(ImTalk::getUserId2, store.getId()));
+        for (ImTalk imTalk : imTalkList2) {
+            imTalk.setName2(store.getStoreName());
+            imTalk.setFace2(store.getStoreLogo());
+        }
+        imTalkService.updateBatchById(imTalkList2);
+    }
+}

consumer/src/main/java/cn/lili/event/impl/RegisteredCouponActivityExecute.java

@@ -1,18 +1,17 @@
 package cn.lili.event.impl;
 
+import cn.hutool.core.text.CharSequenceUtil;
+import cn.lili.cache.Cache;
+import cn.lili.cache.CachePrefix;
 import cn.lili.event.MemberRegisterEvent;
 import cn.lili.modules.member.entity.dos.Member;
-import cn.lili.modules.promotion.entity.dos.CouponActivity;
+import cn.lili.modules.member.service.MemberService;
+import cn.lili.modules.promotion.entity.dto.CouponActivityTrigger;
 import cn.lili.modules.promotion.entity.enums.CouponActivityTypeEnum;
-import cn.lili.modules.promotion.entity.enums.PromotionsStatusEnum;
 import cn.lili.modules.promotion.service.CouponActivityService;
-import cn.lili.modules.promotion.tools.PromotionTools;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * 注册赠券活动
  *
@@ -25,6 +24,12 @@ public class RegisteredCouponActivityExecute implements MemberRegisterEvent {
     @Autowired
     private CouponActivityService couponActivityService;
 
+
+    @Autowired
+    private MemberService memberService;
+    @Autowired
+    private Cache cache;
+
     /**
      * 获取进行中的注册赠券的优惠券活动
      * 发送注册赠券
@@ -33,9 +38,22 @@ public class RegisteredCouponActivityExecute implements MemberRegisterEvent {
      */
     @Override
     public void memberRegister(Member member) {
-        List<CouponActivity> couponActivities = couponActivityService.list(new QueryWrapper<CouponActivity>()
+        //用户注册赠券
-                .eq("coupon_activity_type", CouponActivityTypeEnum.REGISTERED.name())
+        couponActivityService.trigger(CouponActivityTrigger.builder()
-                .and(PromotionTools.queryPromotionStatus(PromotionsStatusEnum.START)));
+                .nickName(member.getNickName())
-        couponActivityService.registered(couponActivities, member);
+                .userId(member.getId())
+                .couponActivityTypeEnum(CouponActivityTypeEnum.REGISTERED)
+                .build());
+        //邀请人赠券
+        String memberId = (String) cache.get(CachePrefix.INVITER.getPrefix() + member.getId());
+        if (CharSequenceUtil.isNotEmpty(memberId)) {
+            //邀请人
+            Member inviter = memberService.getById(memberId);
+            couponActivityService.trigger(CouponActivityTrigger.builder()
+                    .nickName(inviter.getNickName())
+                    .userId(inviter.getId())
+                    .couponActivityTypeEnum(CouponActivityTypeEnum.INVITE_NEW)
+                    .build());
+        }
     }
 }

consumer/src/main/java/cn/lili/event/impl/VerificationOrderExecute.java

@@ -31,7 +31,7 @@ public class VerificationOrderExecute implements OrderStatusChangeEvent {
     @Override
     public void orderChange(OrderMessage orderMessage) {
         //订单状态为待核验，添加订单添加核验码
-        if (orderMessage.getNewStatus().equals(OrderStatusEnum.TAKE)) {
+        if (orderMessage.getNewStatus().equals(OrderStatusEnum.TAKE) || orderMessage.getNewStatus().equals(OrderStatusEnum.STAY_PICKED_UP)) {
             //获取订单信息
             Order order = orderService.getBySn(orderMessage.getOrderSn());
             //获取随机数，判定是否存在

consumer/src/main/java/cn/lili/event/impl/WechatMessageExecute.java

@@ -42,6 +42,7 @@ public class WechatMessageExecute implements OrderStatusChangeEvent, TradeEvent
             case PAID:
             case UNDELIVERED:
             case DELIVERED:
+            case STAY_PICKED_UP:
             case COMPLETED:
                 try {
                     wechatMessageUtil.sendWechatMessage(orderMessage.getOrderSn());

consumer/src/main/java/cn/lili/listener/MemberMessageListener.java

@@ -1,10 +1,8 @@
 package cn.lili.listener;
 
 import cn.hutool.json.JSONUtil;
-import cn.lili.event.MemberLoginEvent;
+import cn.lili.event.*;
-import cn.lili.event.MemberPointChangeEvent;
+import cn.lili.event.impl.ImTalkExecute;
-import cn.lili.event.MemberRegisterEvent;
-import cn.lili.event.MemberWithdrawalEvent;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.entity.dos.MemberSign;
 import cn.lili.modules.member.entity.dto.MemberPointMessage;
@@ -58,6 +56,9 @@ public class MemberMessageListener implements RocketMQListener<MessageExt> {
     @Autowired
     private List<MemberLoginEvent> memberLoginEvents;
 
+    @Autowired
+    private List<MemberInfoChangeEvent> memberInfoChangeEvents;
+
 
     @Override
     public void onMessage(MessageExt messageExt) {
@@ -110,6 +111,20 @@ public class MemberMessageListener implements RocketMQListener<MessageExt> {
                     }
                 }
                 break;
+            //会员信息更改
+            case MEMBER_INFO_EDIT:
+                for (MemberInfoChangeEvent memberInfoChangeEvent : memberInfoChangeEvents) {
+                    try {
+                        Member member = JSONUtil.toBean(new String(messageExt.getBody()), Member.class);
+                        memberInfoChangeEvent.memberInfoChange(member);
+                    } catch (Exception e) {
+                        log.error("会员{},在{}业务中，提现事件执行异常",
+                                new String(messageExt.getBody()),
+                                memberInfoChangeEvent.getClass().getName(),
+                                e);
+                    }
+                }
+                break;
             //会员提现
             case MEMBER_WITHDRAWAL:
                 for (MemberWithdrawalEvent memberWithdrawalEvent : memberWithdrawalEvents) {

consumer/src/main/java/cn/lili/listener/StoreMessageListener.java

@@ -0,0 +1,51 @@
+package cn.lili.listener;
+
+import cn.hutool.json.JSONUtil;
+import cn.lili.event.MemberRegisterEvent;
+import cn.lili.event.StoreSettingChangeEvent;
+import cn.lili.modules.member.entity.dos.Member;
+import cn.lili.modules.store.entity.dos.Store;
+import cn.lili.rocketmq.tags.StoreTagsEnum;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.rocketmq.common.message.MessageExt;
+import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
+import org.apache.rocketmq.spring.core.RocketMQListener;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 店铺消息
+ * @author chc
+ * @since 2022/6/2114:46
+ */
+@Component
+@Slf4j
+@RocketMQMessageListener(topic = "${lili.data.rocketmq.store-topic}", consumerGroup = "${lili.data.rocketmq.store-group}")
+public class StoreMessageListener implements RocketMQListener<MessageExt> {
+    @Autowired
+    private List<StoreSettingChangeEvent> storeSettingChangeEventList;
+
+    @Override
+    public void onMessage(MessageExt messageExt) {
+        switch (StoreTagsEnum.valueOf(messageExt.getTags())){
+            //修改店铺
+            case EDIT_STORE_SETTING:
+                for (StoreSettingChangeEvent storeSettingChangeEvent : storeSettingChangeEventList) {
+                    try {
+                        Store store = JSONUtil.toBean(new String(messageExt.getBody()), Store.class);
+                        storeSettingChangeEvent.storeSettingChange(store);
+                    } catch (Exception e) {
+                        log.error("会员{},在{}业务中，状态修改事件执行异常",
+                                new String(messageExt.getBody()),
+                                storeSettingChangeEvent.getClass().getName(),
+                                e);
+                    }
+                }
+                break;
+            default:
+                break;
+        }
+    }
+}

consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/MemberCouponSignEverydayExecute.java

@@ -0,0 +1,45 @@
+package cn.lili.timetask.handler.impl.promotion;
+
+import cn.lili.common.enums.PromotionTypeEnum;
+import cn.lili.modules.promotion.entity.dos.Seckill;
+import cn.lili.modules.promotion.service.MemberCouponSignService;
+import cn.lili.modules.promotion.service.SeckillService;
+import cn.lili.modules.promotion.tools.PromotionTools;
+import cn.lili.modules.search.service.EsGoodsIndexService;
+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 cn.lili.timetask.handler.EveryDayExecute;
+import com.google.gson.Gson;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 促销活动每日定时器
+ *
+ * @author Chopper
+ * @since 2021/3/18 3:23 下午
+ */
+@Slf4j
+@Component
+public class MemberCouponSignEverydayExecute implements EveryDayExecute {
+
+    @Autowired
+    private MemberCouponSignService memberCouponSignService;
+
+    /**
+     * 将已过期的促销活动置为结束
+     */
+    @Override
+    public void execute() {
+        try {
+            memberCouponSignService.clean();
+        } catch (Exception e) {
+            log.error("清除领取优惠券标记异常", e);
+        }
+
+    }
+
+}

consumer/src/main/resources/application.yml

@@ -260,6 +260,8 @@ lili:
       order-group: lili_order_group
       member-topic: lili_member_topic
       member-group: lili_member_group
+      store-topic: lili_store_topic
+      store-group: lili_store_group
       other-topic: lili_other_topic
       other-group: lili_other_group
       notice-topic: lili_notice_topic

framework/pom.xml

@@ -51,7 +51,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>

framework/src/main/java/cn/lili/cache/CachePrefix.java

@@ -208,6 +208,10 @@ public enum CachePrefix {
      * 促销活动
      */
     PROMOTION,
+    /**
+     * 当前优惠券活动
+     */
+    CURRENT_COUPON_ACTIVITY,
     /**
      * 促销活动
      */
@@ -236,6 +240,10 @@ public enum CachePrefix {
      * 积分商品缓存key前缀
      */
     STORE_ID_EXCHANGE,
+    /**
+     * 会员领取标记
+     */
+    MEMBER_COUPON_SIGN,
 
 
     //================交易=================
@@ -441,6 +449,10 @@ public enum CachePrefix {
      * 分销员
      */
     DISTRIBUTION,
+    /**
+     * 邀请人
+     */
+    INVITER,
 
     /**
      * 找回手机
@@ -503,12 +515,11 @@ public enum CachePrefix {
 
     /**
      * 扫码登录
+     *
      * @param str
      * @return
      */
-    QR_CODE_LOGIN_SESSION
+    QR_CODE_LOGIN_SESSION;
-
-    ;
 
 
     public static String removePrefix(String str) {

framework/src/main/java/cn/lili/cache/impl/RedisCache.java

@@ -185,7 +185,7 @@ public class RedisCache implements Cache {
     public Long counter(Object key) {
         HyperLogLogOperations<Object, Object> operations = redisTemplate.opsForHyperLogLog();
 
-        //add 方法对应 PFADD 命令
+        //add 方法对应 PFCOUNT  命令
         return operations.size(key);
     }
 

framework/src/main/java/cn/lili/common/enums/ResultCode.java

@@ -193,6 +193,7 @@ public enum ResultCode {
     ORDER_NOT_USER(31007, "非当前会员的订单"),
     ORDER_TAKE_ERROR(31008, "当前订单无法核销"),
     MEMBER_ADDRESS_NOT_EXIST(31009, "订单无收货地址，请先配置收货地址"),
+    STORE_ADDRESS_NOT_EXIST(31009,"订单没有自提地址,请先选择自提地址"),
     ORDER_DELIVER_NUM_ERROR(31010, "没有待发货的订单"),
     ORDER_NOT_SUPPORT_DISTRIBUTION(31011, "购物车中包含不支持配送的商品，请重新选择收货地址，或者重新选择商品"),
     ORDER_NOT_EXIST_VALID(31041, "购物车中无有效商品，请检查购物车内商品，或者重新选择商品"),
@@ -280,6 +281,7 @@ public enum ResultCode {
     PROMOTION_ACTIVITY_GOODS_ERROR(40009, "当前活动已经开始无法添加商品"),
     PROMOTION_ACTIVITY_ERROR(400010, "当前促销活动不存在"),
     PROMOTION_LOG_EXIST(40011, "活动已参加，已发重复参加"),
+    APPLY_END_TIME_ERROR(40012, "参与截至时间不能小于当前时间，不能大于活动开始时间"),
 
     /**
      * 优惠券
@@ -301,6 +303,7 @@ public enum ResultCode {
     COUPON_SCOPE_ERROR(41014, "指定商品范围关联id无效！"),
     COUPON_MEMBER_NOT_EXIST(41015, "没有当前会员优惠券"),
     COUPON_MEMBER_STATUS_ERROR(41016, "当前会员优惠券已过期/作废无法变更状态！"),
+    COUPON_RANGE_ERROR(41017, "优惠券使用时间范围错误"),
 
     SPECIAL_CANT_USE(41019, "特殊商品不能使用优惠券，不能使用"),
 
@@ -308,7 +311,7 @@ public enum ResultCode {
     COUPON_DELETE_ERROR(41021, "删除优惠券失败"),
     COUPON_ACTIVITY_NOT_EXIST(41022, "当前优惠券活动不存在"),
     COUPON_ACTIVITY_SAVE_ERROR(41023, "保存优惠券活动失败"),
-    COUPON_ACTIVITY_MAX_NUM(41024, "优惠券活动赠券数量最多为3"),
+    COUPON_ACTIVITY_MAX_NUM(41024, "优惠券活动赠券数量最多为5"),
 
     COUPON_DO_NOT_RECEIVER(41030, "当前优惠券不允许主动领取"),
 
@@ -373,6 +376,7 @@ public enum ResultCode {
     COUPON_ACTIVITY_ITEM_ERROR(46003, "优惠券活动必须指定优惠券，不能为空"),
     COUPON_ACTIVITY_ITEM_MUST_NUM_ERROR(46004, "优惠券活动最多指定10个优惠券"),
     COUPON_ACTIVITY_ITEM_NUM_ERROR(46005, "赠券数量必须大于0"),
+    COUPON_ACTIVITY_ITEM_NUM_MAX_VALUE_2(46006, "赠券数量最大为2"),
 
     /**
      * 其他促销
@@ -444,6 +448,7 @@ public enum ResultCode {
     ALIPAY_EXCEPTION(70003, "支付宝支付错误，请稍后重试"),
     ALIPAY_PARAMS_EXCEPTION(70004, "支付宝参数异常"),
     LOGISTICS_NOT_SETTING(70005, "您还未配置快递查询"),
+    LOGISTICS_CHECK_SETTING(70005, "操作失败,请检查您的快递鸟配置"),
     ORDER_SETTING_ERROR(70006, "系统订单配置异常"),
     ALI_SMS_SETTING_ERROR(70007, "您还未配置阿里云短信"),
     SMS_SIGN_EXIST_ERROR(70008, "短信签名已存在"),

framework/src/main/java/cn/lili/common/security/AuthUser.java

@@ -3,6 +3,7 @@ package cn.lili.common.security;
 import cn.lili.common.security.enums.UserEnums;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
@@ -10,6 +11,7 @@ import java.io.Serializable;
  * @author Chopper
  */
 @Data
+@NoArgsConstructor
 @AllArgsConstructor
 public class AuthUser implements Serializable {
 
@@ -68,6 +70,12 @@ public class AuthUser implements Serializable {
      */
     private Boolean isSuper = false;
 
+    /**
+     * 租户id
+     */
+    private String tenantId;
+
+
     public AuthUser(String username, String id, String nickName, String face, UserEnums role) {
         this.username = username;
         this.face = face;
@@ -85,7 +93,7 @@ public class AuthUser implements Serializable {
         this.nickName = nickName;
     }
 
-    public AuthUser(String username, String id, UserEnums manager, String nickName, Boolean isSuper, String clerkId,String face) {
+    public AuthUser(String username, String id, UserEnums manager, String nickName, Boolean isSuper, String clerkId, String face) {
         this.username = username;
         this.id = id;
         this.role = manager;

framework/src/main/java/cn/lili/common/security/context/UserContext.java

@@ -7,6 +7,7 @@ import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.enums.SecurityEnum;
 import cn.lili.common.security.token.SecretKeyUtil;
+import cn.lili.common.utils.StringUtils;
 import com.google.gson.Gson;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
@@ -101,4 +102,21 @@ public class UserContext {
             return null;
         }
     }
+
+
+    /**
+     * 写入邀请人信息
+     */
+    public static void settingInviter(String memberId, Cache cache) {
+        if (RequestContextHolder.getRequestAttributes() != null) {
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+            //邀请人id
+            String inviterId = request.getHeader(SecurityEnum.INVITER.getValue());
+            if (StringUtils.isNotEmpty(inviterId)) {
+                cache.put(CachePrefix.INVITER.getPrefix() + memberId, inviterId);
+            }
+        }
+    }
+
+
 }

framework/src/main/java/cn/lili/common/security/enums/SecurityEnum.java

@@ -10,7 +10,7 @@ public enum SecurityEnum {
     /**
      * 存在与header中的token参数头 名
      */
-    HEADER_TOKEN("accessToken"), USER_CONTEXT("userContext"), JWT_SECRET("secret"), UUID("uuid");
+    HEADER_TOKEN("accessToken"), USER_CONTEXT("userContext"), JWT_SECRET("secret"), UUID("uuid"), INVITER("inviter");
 
     String value;
 

framework/src/main/java/cn/lili/common/security/enums/UserEnums.java

@@ -14,7 +14,8 @@ public enum UserEnums {
     MEMBER("会员"),
     STORE("商家"),
     MANAGER("管理员"),
-    SYSTEM("系统");
+    SYSTEM("系统"),
+    SEAT("坐席");
     private final String role;
 
     UserEnums(String role) {

framework/src/main/java/cn/lili/common/swagger/Swagger2Config.java

@@ -81,6 +81,32 @@ public class Swagger2Config {
                 .securitySchemes(securitySchemes())
                 .securityContexts(securityContexts());
     }
+    @Bean
+    public Docket orderRestApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .groupName("订单")
+                .apiInfo(apiInfo()).select()
+                //扫描所有有注解的api，用这种方式更灵活
+//               .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+                .apis(RequestHandlerSelectors.basePackage("cn.lili.controller.order"))
+                .paths(PathSelectors.any())
+                .build()
+                .securitySchemes(securitySchemes())
+                .securityContexts(securityContexts());
+    }
+
+    @Bean
+    public Docket imRestApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .groupName("im")
+                .apiInfo(apiInfo()).select()
+                //扫描所有有注解的api，用这种方式更灵活
+                .apis(RequestHandlerSelectors.basePackage("cn.lili.controller.im"))
+                .paths(PathSelectors.any())
+                .build()
+                .securitySchemes(securitySchemes())
+                .securityContexts(securityContexts());
+    }
 
     @Bean
     public Docket memberRestApi() {

framework/src/main/java/cn/lili/common/utils/DateUtil.java

@@ -26,15 +26,16 @@ public class DateUtil {
      * @return 今天开始时间
      */
     public static Long getDayOfStart() {
-        return DateUtil.getDateline()/(60*24*60);
+        return DateUtil.getDateline() / (60 * 24 * 60);
     }
+
     /**
      * 指定日的开始时间
      *
      * @return 指定日时间
      */
     public static Long getDayOfStart(Date date) {
-        return date.getTime()/(60*24*60);
+        return date.getTime() / (60 * 24 * 60);
     }
 
     /**
@@ -349,6 +350,22 @@ public class DateUtil {
         return getDateline(mon, STANDARD_FORMAT);
     }
 
+    /**
+     * 获取当前天的结束时间
+     *
+     * @return 当前天的开始时间
+     */
+    public static Date getCurrentDayStartTime() {
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.HOUR_OF_DAY, 0);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.SECOND, 0);
+        cal.set(Calendar.SECOND, 0);
+        cal.set(Calendar.MILLISECOND, 0);
+        cal.set(Calendar.SECOND, cal.get(Calendar.SECOND) - 1);
+        return cal.getTime();
+    }
+
     /**
      * 获取当前天的结束时间
      *
@@ -366,6 +383,21 @@ public class DateUtil {
         return cal.getTime();
     }
 
+    /**
+     * 获取干净的时间
+     *
+     * @return 时间对象
+     */
+    public static Calendar getCleanCalendar() {
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.HOUR_OF_DAY, 0);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.SECOND, 0);
+        cal.set(Calendar.SECOND, 0);
+        cal.set(Calendar.MILLISECOND, 0);
+        return cal;
+    }
+
     /**
      * 获取延时时间（秒）
      *

framework/src/main/java/cn/lili/elasticsearch/BaseElasticsearchService.java

@@ -325,7 +325,7 @@ public abstract class BaseElasticsearchService {
                         "        }\n" +
                         "      },\n" +
                         "      \"promotionMapJson\": {\n" +
-                        "        \"type\": \"text\"\n" +
+                        "        \"type\": \"keyword\"\n" +
                         "      },\n" +
                         "      \"thumbnail\": {\n" +
                         "        \"type\": \"text\",\n" +

framework/src/main/java/cn/lili/modules/connect/config/AuthConfig.java

@@ -77,11 +77,7 @@ public class AuthConfig {
     /**
      * 针对国外服务可以单独设置代理
      * HttpConfig config = new HttpConfig();
-<<<<<<< HEAD
-     * config.setProxy(new Proxy(Proxy.Type.HTTP, new InetSocketAddress("106.124.130.167", 10080)));
-=======
      * config.setProxy(new Proxy(Proxy.Type.HTTP, new InetSocketAddress("127.0.0.1", 10080)));
->>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
      * config.setTimeout(15000);
      *
      * @since 1.15.5

framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java

@@ -246,7 +246,17 @@ public class ConnectServiceImpl extends ServiceImpl<ConnectMapper, Connect> impl
         Member newMember = new Member("m" + phone, "111111", phone, params.getNickName(), params.getImage());
         memberService.save(newMember);
         newMember = memberService.findByUsername(newMember.getUsername());
+
+        //判定有没有邀请人并且写入
+        UserContext.settingInviter(newMember.getId(), cache);
+
         bindMpMember(openId, unionId, newMember);
+
+
+        //判定有没有邀请人并且写入
+        UserContext.settingInviter(newMember.getId(), cache);
+
+
         // 发送会员注册信息
         applicationEventPublisher.publishEvent(new TransactionCommitSendMQEvent("new member register", rocketmqCustomProperties.getMemberTopic(), MemberTagsEnum.MEMBER_REGISTER.name(), newMember));
         return memberTokenGenerate.createToken(newMember, true);

framework/src/main/java/cn/lili/modules/goods/entity/vos/DraftGoodsVO.java

@@ -5,6 +5,7 @@ import cn.lili.modules.goods.entity.dos.Wholesale;
 import cn.lili.modules.goods.entity.dto.GoodsParamsDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
@@ -14,6 +15,7 @@ import java.util.List;
  * @author pikachu
  * @since 2020-02-26 23:24:13
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class DraftGoodsVO extends DraftGoods {
 

framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java

@@ -241,12 +241,7 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
             }
         }
         UpdateWrapper<Category> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("id", category.getId())
+        updateWrapper.eq("id", category.getId());
-                .set("name", category.getName())
-                .set("image", category.getImage())
-                .set("sort_order", category.getSortOrder())
-                .set(DELETE_FLAG_COLUMN, category.getDeleteFlag())
-                .set("commission_rate", category.getCommissionRate());
         this.baseMapper.update(category, updateWrapper);
         removeCache();
     }

framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java

@@ -327,7 +327,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
 
         //记录用户足迹
         if (UserContext.getCurrentUser() != null) {
-            FootPrint footPrint = new FootPrint(UserContext.getCurrentUser().getId(), goodsId, skuId);
+            FootPrint footPrint = new FootPrint(UserContext.getCurrentUser().getId(), goodsIndex.getStoreId(), goodsId, skuId);
             String destination = rocketmqCustomProperties.getGoodsTopic() + ":" + GoodsTagsEnum.VIEW_GOODS.name();
             rocketMQTemplate.asyncSend(destination, footPrint, RocketmqSendCallbackBuilder.commonCallback());
         }
@@ -508,6 +508,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
             List<GoodsSku> goodsSkus = new ArrayList<>();
             goodsSkus.add(goodsSku);
             this.updateGoodsStuck(goodsSkus);
+            this.promotionGoodsService.updatePromotionGoodsStock(goodsSku.getId(), quantity);
         }
     }
 

framework/src/main/java/cn/lili/modules/im/config/CustomSpringConfigurator.java

@@ -0,0 +1,34 @@
+package cn.lili.modules.im.config;
+
+
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+
+import javax.websocket.server.ServerEndpointConfig;
+
+/**
+ * CustomSpringConfigurator
+ *
+ * @author Chopper
+ * @version v1.0
+ * 2021-12-31 11:53
+ */
+public class CustomSpringConfigurator extends ServerEndpointConfig.Configurator implements ApplicationContextAware {
+
+    /**
+     * Spring application context.
+     */
+    private static volatile BeanFactory context;
+
+    @Override
+    public <T> T getEndpointInstance(Class<T> clazz) throws InstantiationException {
+        return context.getBean(clazz);
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        CustomSpringConfigurator.context = applicationContext;
+    }
+}

framework/src/main/java/cn/lili/modules/im/config/WebSocketConfigurator.java

@@ -0,0 +1,24 @@
+package cn.lili.modules.im.config;
+
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * WebSocketConfigurator
+ *
+ * @author Chopper
+ * @version v1.0
+ * 2021-12-31 11:53
+ */
+@ConditionalOnWebApplication
+@Configuration
+public class WebSocketConfigurator {
+
+    @Bean
+    public CustomSpringConfigurator customSpringConfigurator() {
+        // This is just to get context
+        return new CustomSpringConfigurator();
+    }
+}

framework/src/main/java/cn/lili/modules/im/entity/dos/ImMessage.java

@@ -0,0 +1,69 @@
+package cn.lili.modules.im.entity.dos;
+
+import cn.lili.common.utils.SnowFlake;
+import cn.lili.modules.im.entity.enums.MessageTypeEnum;
+import cn.lili.modules.im.entity.vo.MessageOperation;
+import cn.lili.mybatis.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @author Chopper
+ */
+@Data
+@TableName("li_im_message")
+@ApiModel(value = "Im消息")
+@NoArgsConstructor
+@AllArgsConstructor
+public class ImMessage extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 发送者
+     */
+    private String fromUser;
+
+    /**
+     * 接收者
+     */
+    private String toUser;
+
+    /**
+     * 已阅
+     */
+    private Boolean isRead;
+
+    /**
+     * 消息类型
+     */
+    private MessageTypeEnum messageType;
+
+    /**
+     * 聊天id
+     */
+    private String talkId;
+
+    /**
+     * 消息实体
+     */
+    private String text;
+
+
+    public ImMessage(MessageOperation messageOperation){
+        this.setFromUser(messageOperation.getFrom());
+        this.setMessageType(messageOperation.getMessageType());
+        this.setIsRead(false);
+        this.setText(messageOperation.getContext());
+        this.setTalkId(messageOperation.getTalkId());
+        this.setCreateTime(new Date());
+        this.setToUser(messageOperation.getTo());
+        this.setId(SnowFlake.getIdStr());
+    }
+
+}

framework/src/main/java/cn/lili/modules/im/entity/dos/ImTalk.java

@@ -0,0 +1,102 @@
+package cn.lili.modules.im.entity.dos;
+
+
+import cn.lili.common.utils.SnowFlake;
+import cn.lili.mybatis.BaseTenantEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @author Chopper
+ */
+@Data
+@TableName("li_im_talk")
+@ApiModel(value = "聊天")
+@NoArgsConstructor
+@AllArgsConstructor
+public class ImTalk extends BaseTenantEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("用户1 id")
+    private String userId1;
+
+    @ApiModelProperty("用户2 id")
+    private String userId2;
+
+    @ApiModelProperty("用户1置顶")
+    private Boolean top1;
+
+    @ApiModelProperty("用户2置顶")
+    private Boolean top2;
+
+    @ApiModelProperty("用户1 不可见")
+    private Boolean disable1;
+
+    @ApiModelProperty("用户2 不可见")
+    private Boolean disable2;
+
+    @ApiModelProperty("用户1名字")
+    private String name1;
+
+    @ApiModelProperty("用户2名字")
+    private String name2;
+
+    @ApiModelProperty("用户1头像")
+    private String face1;
+
+    @ApiModelProperty("用户2头像")
+    private String face2;
+
+    @ApiModelProperty("用户1的店铺标识")
+    private Boolean storeFlag1;
+
+    @ApiModelProperty("用户2的店铺标识")
+    private Boolean storeFlag2;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "最后聊天时间", hidden = true)
+    private Date lastTalkTime;
+
+    @ApiModelProperty(value = "最后聊天内容")
+    private String lastTalkMessage;
+
+    @ApiModelProperty(value = "最后发送消息类型")
+    private String lastMessageType;
+
+    @ApiModelProperty(value = "坐席Id")
+    private String tenantId;
+
+    @ApiModelProperty(value = "坐席名称")
+    private String tenantName;
+
+
+    public ImTalk(String userId1, String userId2,
+                  String face1, String face2,
+                  String name1, String name2
+    ) {
+        this.userId1 = userId1;
+        this.userId2 = userId2;
+        this.top1 = false;
+        this.top2 = false;
+        this.disable1 = false;
+        this.disable2 = false;
+        this.storeFlag1 = false;
+        this.storeFlag2 = false;
+        this.setId(SnowFlake.getIdStr());
+        this.lastTalkTime = new Date();
+        this.face1 = face1;
+        this.face2 = face2;
+        this.name1 = name1;
+        this.name2 = name2;
+    }
+}

framework/src/main/java/cn/lili/modules/im/entity/dos/QA.java

@@ -0,0 +1,31 @@
+package cn.lili.modules.im.entity.dos;
+
+import cn.lili.mybatis.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 问题答案
+ *
+ * @author Chopper
+ * @version v1.0
+ * 2022-02-09 17:59
+ */
+@Data
+@TableName("li_qa")
+@ApiModel(value = "租户问答")
+@NoArgsConstructor
+public class QA extends BaseEntity {
+
+    @ApiModelProperty(value = "租户id")
+    private Integer tenantId;
+
+    @ApiModelProperty(value = "问题")
+    private String question;
+
+    @ApiModelProperty(value = "答案")
+    private String answer;
+}

framework/src/main/java/cn/lili/modules/im/entity/dos/Seat.java

@@ -0,0 +1,47 @@
+package cn.lili.modules.im.entity.dos;
+
+import cn.lili.mybatis.BaseTenantEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotEmpty;
+
+/**
+ * 坐席
+ *
+ * @author Chopper
+ * @version v1.0
+ * 2022-02-09 17:08
+ */
+@Data
+@TableName("li_seat")
+@ApiModel(value = "坐席")
+@NoArgsConstructor
+public class Seat extends BaseTenantEntity {
+
+    @ApiModelProperty(value = "租户id")
+    private String tenantId;
+
+    @ApiModelProperty(value = "坐席用户名")
+    private String username;
+
+    @ApiModelProperty(value = "会员头像")
+    private String face;
+
+    @ApiModelProperty(value = "坐席密码")
+    private String password;
+
+    @ApiModelProperty(value = "昵称")
+    private String nickName;
+
+    @ApiModelProperty(value = "坐席状态")
+    private Boolean disabled;
+
+    @NotEmpty(message = "手机号码不能为空")
+    @ApiModelProperty(value = "手机号码", required = true)
+    private String mobile;
+
+}

framework/src/main/java/cn/lili/modules/im/entity/dos/SeatSetting.java

@@ -0,0 +1,36 @@
+package cn.lili.modules.im.entity.dos;
+
+import cn.lili.mybatis.BaseTenantEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 坐席设置
+ *
+ * @author Chopper
+ * @version v1.0
+ * 2022-02-09 17:55
+ */
+@Data
+@TableName("li_seat_setting")
+@ApiModel(value = "坐席设置")
+@NoArgsConstructor
+public class SeatSetting extends BaseTenantEntity {
+
+    @ApiModelProperty(value = "租户idid")
+    private String tenantId;
+
+    @ApiModelProperty(value = "欢迎语")
+    private String welcome;
+
+    @ApiModelProperty(value = "离线自动回复")
+    private String outLineAutoReply;
+
+    @ApiModelProperty(value = "长时间自动回复")
+    private String longTermAutoReply;
+
+
+}

framework/src/main/java/cn/lili/modules/im/entity/dto/ImQueryParams.java

@@ -0,0 +1,36 @@
+package cn.lili.modules.im.entity.dto;
+
+import cn.hutool.core.text.CharSequenceUtil;
+import cn.lili.common.vo.PageVO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author chc
+ * @since 2022/6/2114:46
+ */
+@Data
+@ApiModel
+public class ImQueryParams extends PageVO {
+
+    @ApiModelProperty("用户Id")
+    private String memberId;
+
+    @ApiModelProperty("店铺Id")
+    private String storeId;
+
+    public <T> QueryWrapper<T> queryWrapper() {
+        QueryWrapper<T> queryWrapper = new QueryWrapper<>();
+        if (CharSequenceUtil.isNotEmpty(memberId)) {
+            queryWrapper.eq("member_id", memberId);
+        }
+        if (CharSequenceUtil.isNotEmpty(storeId)) {
+            queryWrapper.eq("store_id", storeId);
+        }
+        queryWrapper.eq("delete_flag",false);
+        queryWrapper.orderByDesc("create_time");
+        return queryWrapper;
+    }
+}

framework/src/main/java/cn/lili/modules/im/entity/dto/MessageQueryParams.java

@@ -0,0 +1,50 @@
+package cn.lili.modules.im.entity.dto;
+
+import cn.lili.common.enums.ResultCode;
+import cn.lili.common.exception.ServiceException;
+import cn.lili.common.utils.StringUtils;
+import cn.lili.common.vo.PageVO;
+import cn.lili.modules.im.entity.dos.ImMessage;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.Data;
+
+/**
+ * MessageQueryParams
+ *
+ * @author Chopper
+ * @version v1.0
+ * 2022-01-20 17:16
+ */
+@Data
+public class MessageQueryParams extends PageVO {
+    /**
+     * 聊天窗口
+     */
+    private String talkId;
+    /**
+     * 最后一个消息
+     */
+    private String lastMessageId;
+    /**
+     * 获取消息数量
+     */
+    private Integer num;
+
+    public LambdaQueryWrapper<ImMessage> initQueryWrapper() {
+        if (StringUtils.isEmpty(talkId)) {
+            throw new ServiceException(ResultCode.ERROR);
+        }
+        if (num == null || num > 50) {
+            num = 50;
+        }
+
+        LambdaQueryWrapper<ImMessage> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(ImMessage::getTalkId, talkId);
+        if (StringUtils.isNotEmpty(lastMessageId)) {
+            lambdaQueryWrapper.lt(ImMessage::getId, lastMessageId);
+        }
+        lambdaQueryWrapper.orderByDesc(ImMessage::getCreateTime);
+//        lambdaQueryWrapper.last("limit " + num);
+        return lambdaQueryWrapper;
+    }
+}

framework/src/main/java/cn/lili/modules/im/entity/enums/MessageResultType.java

@@ -0,0 +1,30 @@
+package cn.lili.modules.im.entity.enums;
+
+/**
+ * 返回消息类型枚举
+ *
+ * @author liushuai
+ */
+public enum MessageResultType {
+    /**
+     * 返回消息类型枚举
+     * <p>
+     * 好友列表
+     * 增加好友
+     * 消息
+     * 阅读消息
+     * 未读消息
+     * 历史消息
+     * 系统提示
+     * 下线提醒
+     */
+    FRIENDS,
+    ADD_FRIENDS,
+    MESSAGE,
+    READ_MESSAGE,
+    UN_READ,
+    HISTORY,
+    SYSTEM_TIPS,
+    OFFLINE
+
+}

framework/src/main/java/cn/lili/modules/im/entity/enums/MessageStatusEnum.java

@@ -0,0 +1,31 @@
+package cn.lili.modules.im.entity.enums;
+
+/**
+ * 消息的类型
+ *
+ * @author liushuai(liushuai711 @ gmail.com)
+ * @version v4.0
+ * @Description:
+ * @since 2022/2/10 16:36
+ */
+public enum MessageStatusEnum {
+    //socket刚打开时发送的消息，这个一般是是刚打开socket链接，进行登录，传入token用
+    CONNECT,
+    //心跳类型的消息，此种类型的消息只有 type 、 text 两种属性
+    HEARTBEAT,
+    //用户打开一个对话框，准备跟某人聊天时
+    OPEN,
+    //客服进行自动回复。客户端发起这种类型请求，则是在拉取对方是否有自动回复，如果有，服务端就会给客户端发送过自动回复的信息
+    AUTO_REPLY,
+    //正常收发消息沟通，文字、表情等沟通
+    MSG,
+    //扩展。比如发送商品、发送订单
+    EXTEND,
+    //系统提示，如提示 对方已离线
+    SYSTEM,
+    //服务端发送到客户端，用于设置客户端的用户信息。会吧 com.xnx3.yunkefu.core.vo.bean.User 传过去
+    SET_USER,
+    //结束服务
+    CLOSE_SERVICE;
+
+}

framework/src/main/java/cn/lili/modules/im/entity/enums/MessageTypeEnum.java

@@ -0,0 +1,23 @@
+package cn.lili.modules.im.entity.enums;
+
+/**
+ * 消息类型
+ *
+ * @author liushuai
+ */
+public enum MessageTypeEnum {
+    /**
+     * 消息类型枚举
+     * <p>
+     * 普通消息
+     * 图片
+     * 语音
+     * 视频
+     */
+    MESSAGE,
+    PICTURE,
+    VOICE,
+    GOODS,
+    ORDER,
+    VIDEO
+}

framework/src/main/java/cn/lili/modules/im/entity/enums/OnlineStatusEnum.java

@@ -0,0 +1,14 @@
+package cn.lili.modules.im.entity.enums;
+
+/**
+ * 坐席在线状态
+ *
+ * @author Chopper
+ * @version v1.0
+ * 2022-02-10 16:37
+ */
+public enum OnlineStatusEnum {
+    // 在线/下线
+    ONLINE,
+    OUTLINE;
+}

framework/src/main/java/cn/lili/modules/im/entity/enums/OperationType.java

@@ -0,0 +1,26 @@
+package cn.lili.modules.im.entity.enums;
+
+/**
+ * 操作类型枚举
+ *
+ * @author liushuai
+ */
+public enum OperationType {
+    /**
+     * 消息类型枚举
+     * <p>
+     * 心跳检测
+     * 发起聊天
+     * 发起消息
+     * 查询历史消息
+     * 阅读消息
+     * 查询未读消息
+     */
+    PING,
+    CREATE,
+    MESSAGE,
+    HISTORY,
+    READ,
+    UNREAD,
+
+}

framework/src/main/java/cn/lili/modules/im/entity/vo/ImTalkVO.java

@@ -0,0 +1,82 @@
+package cn.lili.modules.im.entity.vo;
+
+import cn.lili.modules.im.entity.dos.ImTalk;
+import cn.lili.mybatis.BaseTenantEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @author Chopper
+ */
+@Data
+@ApiModel(value = "聊天")
+public class ImTalkVO extends BaseTenantEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("id")
+    private String id;
+
+    @ApiModelProperty("用户 id")
+    private String userId;
+
+    @ApiModelProperty("置顶")
+    private Boolean top;
+
+    @ApiModelProperty("用户 不可见")
+    private Boolean disable;
+
+    @ApiModelProperty("用户名字")
+    private String name;
+
+    @ApiModelProperty("用户头像")
+    private String face;
+
+    @ApiModelProperty("店铺标识")
+    private Boolean storeFlag;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "最后聊天时间", hidden = true)
+    private Date lastTalkTime;
+
+    @ApiModelProperty(value = "最后聊天内容")
+    private String lastTalkMessage;
+
+    @ApiModelProperty(value = "最后发送消息类型")
+    private String lastMessageType;
+
+    @ApiModelProperty(value = "未读数量")
+    private Long unread;
+
+    public ImTalkVO() {
+
+    }
+
+    public ImTalkVO(ImTalk imTalk, String currentUser) {
+        if (imTalk.getUserId2().equals(currentUser)) {
+            userId = imTalk.getUserId1();
+            top = imTalk.getTop1();
+            disable = imTalk.getDisable1();
+            name = imTalk.getName1();
+            face = imTalk.getFace1();
+            storeFlag = imTalk.getStoreFlag1();
+        } else {
+            userId = imTalk.getUserId2();
+            top = imTalk.getTop2();
+            disable = imTalk.getDisable2();
+            name = imTalk.getName2();
+            face = imTalk.getFace2();
+            storeFlag = imTalk.getStoreFlag2();
+        }
+        lastTalkMessage = imTalk.getLastTalkMessage();
+        lastTalkTime = imTalk.getLastTalkTime();
+        lastMessageType = imTalk.getLastMessageType();
+        id = imTalk.getId();
+    }
+}

framework/src/main/java/cn/lili/modules/im/entity/vo/MessageOperation.java

@@ -0,0 +1,53 @@
+package cn.lili.modules.im.entity.vo;
+
+import cn.lili.common.utils.StringUtils;
+import cn.lili.modules.im.entity.enums.MessageTypeEnum;
+import cn.lili.modules.im.entity.enums.OperationType;
+import lombok.Data;
+
+/**
+ * @author liushuai
+ */
+@Data
+public class MessageOperation {
+
+    /**
+     * 消息类型
+     */
+    private OperationType operationType;
+    /**
+     * 与某人聊天记录
+     */
+    private String to;
+
+    /**
+     * 发送者
+     */
+    private String from;
+
+    /**
+     * 聊天id
+     */
+    private String talkId;
+
+    /**
+     * 消息类型
+     */
+    private MessageTypeEnum messageType;
+    /**
+     * 消息内容
+     */
+    private String context;
+
+    public void setOperationType(String operationType) {
+        if (!StringUtils.isEmpty(operationType)) {
+            this.operationType = OperationType.valueOf(operationType);
+        }
+    }
+
+    public void setMessageType(String messageType) {
+        if (!StringUtils.isEmpty(messageType)) {
+            this.messageType = MessageTypeEnum.valueOf(messageType);
+        }
+    }
+}

framework/src/main/java/cn/lili/modules/im/entity/vo/MessageVO.java

@@ -0,0 +1,28 @@
+package cn.lili.modules.im.entity.vo;
+
+import cn.lili.modules.im.entity.enums.MessageResultType;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+
+/**
+ * MessageVO
+ *
+ * @author Chopper
+ * @version v1.0
+ * 2021-12-30 15:51
+ */
+@Data
+@Builder
+@AllArgsConstructor
+public class MessageVO {
+
+    /**
+     * 消息类型
+     */
+    private MessageResultType messageResultType;
+    /**
+     * 消息内容
+     */
+    private Object result;
+}

framework/src/main/java/cn/lili/modules/im/entity/vo/ReadMessage.java

@@ -0,0 +1,17 @@
+package cn.lili.modules.im.entity.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * ReadMessage
+ *
+ * @author Chopper
+ * @version v1.0
+ * 2021-12-31 11:13
+ */
+@Data
+public class ReadMessage {
+    private List<String> readMessageList;
+}

framework/src/main/java/cn/lili/modules/im/entity/vo/SeatVO.java

@@ -0,0 +1,22 @@
+package cn.lili.modules.im.entity.vo;
+
+import cn.lili.modules.im.entity.dos.Seat;
+import lombok.Data;
+
+/**
+ * 客服VO
+ *
+ * @author Chopper
+ * @version v1.0
+ * 2022-02-10 15:02
+ */
+@Data
+public class SeatVO extends Seat {
+
+    /**
+     * 在线状态
+     */
+    private String onlineStatus;
+
+
+}

framework/src/main/java/cn/lili/modules/im/mapper/ImMessageMapper.java

@@ -0,0 +1,12 @@
+package cn.lili.modules.im.mapper;
+
+import cn.lili.modules.im.entity.dos.ImMessage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * Im消息 Dao层
+ * @author Chopper
+ */
+public interface ImMessageMapper extends BaseMapper<ImMessage> {
+
+}

framework/src/main/java/cn/lili/modules/im/mapper/ImTalkMapper.java

@@ -0,0 +1,12 @@
+package cn.lili.modules.im.mapper;
+
+import cn.lili.modules.im.entity.dos.ImTalk;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 聊天 Dao层
+ * @author Chopper
+ */
+public interface ImTalkMapper extends BaseMapper<ImTalk> {
+
+}

framework/src/main/java/cn/lili/modules/im/mapper/QAMapper.java

@@ -0,0 +1,16 @@
+package cn.lili.modules.im.mapper;
+
+
+import cn.lili.modules.im.entity.dos.QA;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 问答处理层
+ *
+ * @author pikachu
+ * @since 2020-02-18 15:18:56
+ */
+public interface QAMapper extends BaseMapper<QA> {
+
+
+}

framework/src/main/java/cn/lili/modules/im/mapper/SeatMapper.java

@@ -0,0 +1,16 @@
+package cn.lili.modules.im.mapper;
+
+
+import cn.lili.modules.im.entity.dos.Seat;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 坐席处理层
+ *
+ * @author pikachu
+ * @since 2020-02-18 15:18:56
+ */
+public interface SeatMapper extends BaseMapper<Seat> {
+
+
+}

framework/src/main/java/cn/lili/modules/im/mapper/SeatSettingMapper.java

@@ -0,0 +1,16 @@
+package cn.lili.modules.im.mapper;
+
+
+import cn.lili.modules.im.entity.dos.SeatSetting;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 坐席设置处理层
+ *
+ * @author pikachu
+ * @since 2020-02-18 15:18:56
+ */
+public interface SeatSettingMapper extends BaseMapper<SeatSetting> {
+
+
+}

framework/src/main/java/cn/lili/modules/im/service/ImMessageService.java

@@ -0,0 +1,63 @@
+package cn.lili.modules.im.service;
+
+import cn.lili.modules.im.entity.dos.ImMessage;
+import cn.lili.modules.im.entity.dto.MessageQueryParams;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * Im消息 业务层
+ *
+ * @author Chopper
+ */
+public interface ImMessageService extends IService<ImMessage> {
+
+    /**
+     * 阅读消息
+     *
+     * @param talkId
+     * @param accessToken
+     */
+    void read(String talkId, String accessToken);
+
+    /**
+     * 未读消息列表
+     *
+     * @param accessToken
+     */
+    List<ImMessage> unReadMessages(String accessToken);
+
+    /**
+     * 历史消息
+     *
+     * @param accessToken
+     * @param to
+     */
+    List<ImMessage> historyMessage(String accessToken, String to);
+
+    /**
+     * 是否有新消息
+     * @param accessToken
+     * @return
+     */
+    Boolean hasNewMessage(String accessToken);
+
+    /**
+     * 分页获取消息列表
+     * @param messageQueryParams 查询条件
+     * @return 消息列表
+     */
+    List<ImMessage> getList(MessageQueryParams messageQueryParams);
+
+    /**
+     * 获取所有未读消息
+     * @return
+     */
+    Long unreadMessageCount();
+
+    /**
+     * 清空所有未读消息
+     */
+    void cleanUnreadMessage();
+}

framework/src/main/java/cn/lili/modules/im/service/ImTalkService.java

@@ -0,0 +1,51 @@
+package cn.lili.modules.im.service;
+
+import cn.lili.modules.im.entity.dos.ImTalk;
+import cn.lili.modules.im.entity.vo.ImTalkVO;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * 聊天 业务层
+ *
+ * @author Chopper
+ */
+public interface ImTalkService extends IService<ImTalk> {
+
+    /**
+     * 获取与某人的聊天框
+     *
+     * @param userId1
+     * @param userId2
+     * @return
+     */
+    ImTalk getTalkByUser(String userId1, String userId2);
+
+    /**
+     * 置顶消息
+     *
+     * @param id
+     * @param top
+     */
+    void top(String id, Boolean top);
+
+    /**
+     * 禁用（前端不做展示）聊天
+     *
+     * @param id
+     */
+    void disable(String id);
+
+    /**
+     * 获取用户聊天列表
+     * @return
+     */
+    List<ImTalkVO> getUserTalkList(String userName);
+
+    /**
+     * 获取商家聊天列表
+     * @return
+     */
+    List<ImTalkVO> getStoreTalkList();
+}

framework/src/main/java/cn/lili/modules/im/service/QAService.java

@@ -0,0 +1,25 @@
+package cn.lili.modules.im.service;
+
+
+import cn.lili.common.vo.PageVO;
+import cn.lili.modules.im.entity.dos.QA;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 问答
+ *
+ * @author pikachu
+ * @since 2020-02-18 16:18:56
+ */
+public interface QAService extends IService<QA> {
+
+    /**
+     * 查询店铺问题
+     * @param word
+     * @param pageVO
+     * @return
+     */
+    IPage<QA> getStoreQA(String word, PageVO pageVO);
+
+}

framework/src/main/java/cn/lili/modules/im/service/SeatService.java

@@ -0,0 +1,60 @@
+package cn.lili.modules.im.service;
+
+
+import cn.lili.common.security.token.Token;
+import cn.lili.modules.im.entity.dos.Seat;
+import cn.lili.modules.im.entity.vo.SeatVO;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * 坐席业务
+ *
+ * @author pikachu
+ * @since 2020-02-18 16:18:56
+ */
+public interface SeatService extends IService<Seat> {
+
+
+    /**
+     * 获取坐席列表
+     *
+     * @param storeId 店铺id
+     * @return
+     */
+    List<SeatVO> seatVoList(String storeId);
+
+    /**
+     * 坐席登录
+     *
+     * @param username
+     * @param password
+     * @return
+     */
+    Token usernameLogin(String username, String password);
+
+    /**
+     * 快捷登录code 生成
+     *
+     * @param username 用户名
+     * @return
+     */
+    String createQuickLoginCode(String username);
+
+    /**
+     * 快捷登录
+     *
+     * @param code
+     * @return
+     */
+    Token quickLogin(String code);
+
+    /**
+     * 查询坐席
+     *
+     * @param username
+     * @return
+     */
+    Seat findByUsername(String username);
+}

framework/src/main/java/cn/lili/modules/im/service/SeatSettingService.java

@@ -0,0 +1,30 @@
+package cn.lili.modules.im.service;
+
+import cn.lili.modules.im.entity.dos.SeatSetting;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 坐席设置业务
+ *
+ * @author pikachu
+ * @since 2020-02-18 16:18:56
+ */
+public interface SeatSettingService extends IService<SeatSetting> {
+
+
+    /**
+     * 根据店铺id获取坐席配置
+     *
+     * @param storeId
+     * @return
+     */
+    SeatSetting getSetting(String storeId);
+
+    /**
+     * 根据店铺修改坐席设置
+     *
+     * @param seatSetting 坐席设置
+     * @return
+     */
+    SeatSetting updateByStore(SeatSetting seatSetting);
+}

framework/src/main/java/cn/lili/modules/im/serviceimpl/ImMessageServiceImpl.java

@@ -0,0 +1,143 @@
+package cn.lili.modules.im.serviceimpl;
+
+import cn.lili.common.enums.ResultCode;
+import cn.lili.common.exception.ServiceException;
+import cn.lili.common.security.AuthUser;
+import cn.lili.common.security.context.UserContext;
+import cn.lili.modules.im.entity.dos.ImMessage;
+import cn.lili.modules.im.entity.dto.MessageQueryParams;
+import cn.lili.modules.im.mapper.ImMessageMapper;
+import cn.lili.modules.im.service.ImMessageService;
+import cn.lili.modules.im.service.ImTalkService;
+import cn.lili.mybatis.util.PageUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * Im消息 业务实现
+ *
+ * @author Chopper
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class ImMessageServiceImpl extends ServiceImpl<ImMessageMapper, ImMessage> implements ImMessageService {
+
+    @Autowired
+    private ImTalkService imTalkService;
+
+    @Override
+    public void read(String talkId, String accessToken) {
+        LambdaUpdateWrapper<ImMessage> updateWrapper = new LambdaUpdateWrapper<>();
+        String userId = UserContext.getAuthUser(accessToken).getId();
+        updateWrapper.eq(ImMessage::getTalkId, talkId);
+        updateWrapper.eq(ImMessage::getToUser, userId);
+        updateWrapper.set(ImMessage::getIsRead, true);
+        this.update(updateWrapper);
+    }
+
+    @Override
+    public List<ImMessage> unReadMessages(String accessToken) {
+        String userId = UserContext.getAuthUser(accessToken).getId();
+        LambdaQueryWrapper<ImMessage> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ImMessage::getToUser, userId);
+        queryWrapper.eq(ImMessage::getIsRead, false);
+        return this.list(queryWrapper);
+    }
+
+    @Override
+    public List<ImMessage> historyMessage(String accessToken, String to) {
+        String userId = UserContext.getAuthUser(accessToken).getId();
+        LambdaQueryWrapper<ImMessage> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.and(i -> i.eq(ImMessage::getToUser, userId).and(j -> j.eq(ImMessage::getFromUser, to)));
+        queryWrapper.or(i -> i.eq(ImMessage::getToUser, to).and(j -> j.eq(ImMessage::getFromUser, userId)));
+        queryWrapper.orderByDesc(ImMessage::getCreateTime);
+        return this.list(queryWrapper);
+    }
+
+    @Override
+    public Boolean hasNewMessage(String accessToken) {
+        String userId = UserContext.getAuthUser(accessToken).getId();
+        LambdaQueryWrapper<ImMessage> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ImMessage::getIsRead, false);
+        queryWrapper.eq(ImMessage::getToUser, userId);
+        return this.list(queryWrapper).size() > 0;
+
+    }
+
+    @Override
+    public List<ImMessage> getList(MessageQueryParams messageQueryParams) {
+        List<ImMessage> messageList = this.page(PageUtil.initPage(messageQueryParams), messageQueryParams.initQueryWrapper()).getRecords();
+        ListSort(messageList);
+        readMessage(messageList);
+        return messageList;
+    }
+
+    @Override
+    public Long unreadMessageCount() {
+        AuthUser currentUser = UserContext.getCurrentUser();
+        if(currentUser == null){
+            throw new ServiceException(ResultCode.USER_NOT_LOGIN);
+        }
+        return this.count(new LambdaQueryWrapper<ImMessage>().eq(ImMessage::getToUser,currentUser.getId()).eq(ImMessage::getIsRead,false));
+    }
+
+    @Override
+    public void cleanUnreadMessage() {
+        AuthUser currentUser = UserContext.getCurrentUser();
+        if(currentUser == null){
+            throw new ServiceException(ResultCode.USER_NOT_LOGIN);
+        }
+        this.update(new LambdaUpdateWrapper<ImMessage>().eq(ImMessage::getToUser,currentUser.getId()).set(ImMessage::getIsRead,true));
+    }
+
+    /**
+     * 根据时间倒叙
+     *
+     * @param list
+     */
+    private static void ListSort(List<ImMessage> list) {
+        list.sort(new Comparator<ImMessage>() {
+            @Override
+            public int compare(ImMessage e1, ImMessage e2) {
+                try {
+                    if (e1.getCreateTime().before(e2.getCreateTime())) {
+                        return -1;
+                    } else {
+                        return 1;
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                return 0;
+            }
+        });
+    }
+
+
+    /**
+     * 阅读消息
+     *
+     * @param messageList 消息列表
+     */
+    private void readMessage(List<ImMessage> messageList) {
+        if (messageList.size() > 0) {
+            for (ImMessage imMessage : messageList) {
+                if(Boolean.FALSE.equals(imMessage.getIsRead())){
+                    imMessage.setIsRead(true);
+                }
+            }
+        }
+        this.updateBatchById(messageList);
+    }
+
+}

framework/src/main/java/cn/lili/modules/im/serviceimpl/ImTalkServiceImpl.java

@@ -0,0 +1,187 @@
+package cn.lili.modules.im.serviceimpl;
+
+import cn.lili.common.enums.ResultCode;
+import cn.lili.common.exception.ServiceException;
+import cn.lili.common.security.AuthUser;
+import cn.lili.common.security.context.UserContext;
+import cn.lili.common.security.enums.UserEnums;
+import cn.lili.modules.im.entity.dos.ImMessage;
+import cn.lili.modules.im.entity.dos.ImTalk;
+import cn.lili.modules.im.entity.vo.ImTalkVO;
+import cn.lili.modules.im.mapper.ImTalkMapper;
+import cn.lili.modules.im.service.ImMessageService;
+import cn.lili.modules.im.service.ImTalkService;
+import cn.lili.modules.member.entity.dos.Member;
+import cn.lili.modules.member.service.MemberService;
+import cn.lili.modules.store.entity.dos.Store;
+import cn.lili.modules.store.service.StoreService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.stringtemplate.v4.ST;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 聊天 业务实现
+ *
+ * @author Chopper
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class ImTalkServiceImpl extends ServiceImpl<ImTalkMapper, ImTalk> implements ImTalkService {
+
+    @Autowired
+    private MemberService memberService;
+
+    @Autowired
+    private StoreService storeService;
+
+    @Autowired
+    private ImMessageService imMessageService;
+
+    @Override
+    public ImTalk getTalkByUser(String userId1, String userId2) {
+        LambdaQueryWrapper<ImTalk> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ImTalk::getUserId2, userId2);
+        queryWrapper.eq(ImTalk::getUserId1, userId1);
+        ImTalk imTalk = this.getOne(queryWrapper);
+        AuthUser currentUser = UserContext.getCurrentUser();
+        //如果没有聊天，则创建聊天
+        if (imTalk == null) {
+            // 没有登录的这个账户信息
+            if (currentUser == null) {
+                return null;
+            }
+            //当自己为店铺时
+            if(UserEnums.STORE.equals(currentUser.getRole())){
+                Store selfStore = storeService.getById(userId1);
+                //没有这个用户信息
+                Member other = memberService.getById(userId2);
+                if(other == null){
+                    return null;
+                }
+                //自己为店铺其他人必定为用户
+                imTalk = new ImTalk(userId1, userId2, selfStore.getStoreLogo(), other.getFace(), selfStore.getStoreName(), other.getNickName());
+                imTalk.setStoreFlag1(true);
+            }else if(UserEnums.MEMBER.equals(currentUser.getRole())){
+                //没有这个店铺信息
+                Member self = memberService.getById(userId1);
+                Member otherMember = memberService.getById(userId2);
+                Store otherStore = storeService.getById(userId2);
+                if(otherStore != null){
+                    imTalk = new ImTalk(userId1, userId2, self.getFace(), otherStore.getStoreLogo(), self.getNickName(), otherStore.getStoreName());
+                    imTalk.setStoreFlag2(true);
+                }else if (otherMember != null){
+                    imTalk = new ImTalk(userId1, userId2, self.getFace(), otherMember.getFace(), self.getNickName(), otherMember.getNickName());
+                }else{
+                    return null;
+                }
+            }
+            this.save(imTalk);
+        } else {
+            imTalk = check(imTalk);
+        }
+        return imTalk;
+    }
+
+    /**
+     * 发起聊天后，如果聊天不可见为true，则需要修正
+     *
+     * @param imTalk
+     */
+    private ImTalk check(ImTalk imTalk) {
+        if (imTalk.getDisable1() || imTalk.getDisable2()) {
+            imTalk.setDisable1(false);
+            imTalk.setDisable2(false);
+            this.updateById(imTalk);
+
+        }
+        return imTalk;
+    }
+
+    @Override
+    public void top(String id, Boolean top) {
+        ImTalk imTalk = this.getById(id);
+        if (imTalk.getUserId1().equals(UserContext.getCurrentUser().getId())) {
+            imTalk.setTop1(top);
+        } else if (imTalk.getUserId2().equals(UserContext.getCurrentUser().getId())) {
+            imTalk.setTop2(top);
+        } else {
+            throw new ServiceException(ResultCode.ERROR);
+        }
+        this.updateById(imTalk);
+    }
+
+    @Override
+    public void disable(String id) {
+        ImTalk imTalk = this.getById(id);
+        if (imTalk.getUserId1().equals(UserContext.getCurrentUser().getId())) {
+            imTalk.setDisable1(true);
+            this.updateById(imTalk);
+        } else if (imTalk.getUserId2().equals(UserContext.getCurrentUser().getId())) {
+            imTalk.setDisable2(true);
+            this.updateById(imTalk);
+        }
+    }
+
+    @Override
+    public List<ImTalkVO> getUserTalkList(String userName) {
+        AuthUser authUser = UserContext.getCurrentUser();
+        if(authUser == null){
+            throw new ServiceException(ResultCode.USER_NOT_LOGIN);
+        }
+        LambdaQueryWrapper<ImTalk> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.and(wq->{
+            wq.like(ImTalk::getName1, userName).or().like(ImTalk::getName2,userName);
+        });
+        queryWrapper.and(wq->{
+            wq.like(ImTalk::getUserId1, authUser.getId()).or().like(ImTalk::getUserId2,authUser.getId());
+        });
+        queryWrapper.orderByDesc(ImTalk::getLastTalkTime);
+        List<ImTalk> imTalks = this.list(queryWrapper);
+        List<ImTalkVO> imTalkVOList = imTalks.stream().map(imTalk -> {
+            return new ImTalkVO(imTalk, authUser.getId());
+        }).collect(Collectors.toList());
+        getUnread(imTalkVOList);
+        return imTalkVOList;
+    }
+
+    @Override
+    public List<ImTalkVO> getStoreTalkList() {
+        AuthUser authUser = UserContext.getCurrentUser();
+        if(authUser == null){
+            throw new ServiceException(ResultCode.STORE_NOT_LOGIN_ERROR);
+        }
+        LambdaQueryWrapper<ImTalk> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.and(wq->{
+            wq.like(ImTalk::getUserId1, authUser.getStoreId()).or().like(ImTalk::getUserId2,authUser.getStoreId());
+        });
+        queryWrapper.orderByDesc(ImTalk::getLastTalkTime);
+        List<ImTalk> imTalks = this.list(queryWrapper);
+
+        List<ImTalkVO> imTalkVOList = imTalks.stream().map(imTalk -> {
+            return new ImTalkVO(imTalk, authUser.getStoreId());
+        }).collect(Collectors.toList());
+        getUnread(imTalkVOList);
+        return imTalkVOList;
+    }
+
+    /**
+     * 获取未读消息数量
+     * @param imTalkVOList
+     */
+    private void getUnread(List<ImTalkVO> imTalkVOList){
+        if(imTalkVOList.size() > 0){
+            for (ImTalkVO imTalkVO : imTalkVOList) {
+                long count = imMessageService.count(new LambdaQueryWrapper<ImMessage>().eq(ImMessage::getFromUser, imTalkVO.getUserId()).eq(ImMessage::getIsRead, false));
+                imTalkVO.setUnread(count);
+            }
+        }
+    }
+}

framework/src/main/java/cn/lili/modules/im/serviceimpl/QAServiceImpl.java

@@ -0,0 +1,32 @@
+package cn.lili.modules.im.serviceimpl;
+
+import cn.lili.common.security.context.UserContext;
+import cn.lili.common.vo.PageVO;
+import cn.lili.modules.im.entity.dos.QA;
+import cn.lili.modules.im.mapper.QAMapper;
+import cn.lili.modules.im.service.QAService;
+import cn.lili.mybatis.util.PageUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 坐席业务层实现
+ *
+ * @author pikachu
+ * @since 2020-02-18 16:18:56
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class QAServiceImpl extends ServiceImpl<QAMapper, QA> implements QAService {
+
+    @Override
+    public IPage<QA> getStoreQA(String word, PageVO pageVo) {
+        LambdaQueryWrapper<QA> qaLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        qaLambdaQueryWrapper.eq(QA::getTenantId, UserContext.getCurrentUser().getTenantId());
+        qaLambdaQueryWrapper.like(QA::getQuestion, word);
+        return this.page(PageUtil.initPage(pageVo), qaLambdaQueryWrapper);
+    }
+}

framework/src/main/java/cn/lili/modules/im/serviceimpl/SeatServiceImpl.java

@@ -0,0 +1,111 @@
+package cn.lili.modules.im.serviceimpl;
+
+import cn.lili.cache.Cache;
+import cn.lili.common.enums.ResultCode;
+import cn.lili.common.exception.ServiceException;
+import cn.lili.common.security.token.Token;
+import cn.lili.common.utils.StringUtils;
+import cn.lili.modules.im.entity.dos.Seat;
+import cn.lili.modules.im.entity.enums.OnlineStatusEnum;
+import cn.lili.modules.im.entity.vo.SeatVO;
+import cn.lili.modules.im.mapper.SeatMapper;
+import cn.lili.modules.im.service.SeatService;
+import cn.lili.modules.im.token.SeatTokenGenerate;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+/**
+ * 坐席业务层实现
+ *
+ * @author pikachu
+ * @since 2020-02-18 16:18:56
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class SeatServiceImpl extends ServiceImpl<SeatMapper, Seat> implements SeatService {
+
+
+    @Autowired
+    private SeatTokenGenerate seatTokenGenerate;
+
+    @Autowired
+    private Cache<String> cache;
+
+    /**
+     * 快捷登录缓存前缀
+     */
+    private static String prefix = "{quick_login}_";
+
+
+    @Override
+    public List<SeatVO> seatVoList(String storeId) {
+
+        LambdaQueryWrapper<Seat> seatLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        seatLambdaQueryWrapper.eq(Seat::getTenantId, storeId);
+        List<Seat> list = this.list(seatLambdaQueryWrapper);
+
+        //转换模型为VO
+        List<SeatVO> results = list.stream().map(item -> (SeatVO) item).collect(Collectors.toList());
+        //填充坐席当前状态
+        //todo
+        results.forEach(item -> {
+            item.setOnlineStatus(OnlineStatusEnum.ONLINE.name());
+        });
+        return results;
+    }
+
+    @Override
+    public Token usernameLogin(String username, String password) {
+
+        Seat seat = this.findByUsername(username);
+        //判断用户是否存在
+        if (seat == null || !seat.getDisabled()) {
+            throw new ServiceException(ResultCode.ERROR);
+        }
+        //判断密码是否输入正确
+        if (!new BCryptPasswordEncoder().matches(password, seat.getPassword())) {
+            throw new ServiceException(ResultCode.ERROR);
+        }
+        return seatTokenGenerate.createToken(seat, true);
+    }
+
+    @Override
+    public String createQuickLoginCode(String username) {
+        String code = UUID.randomUUID().toString();
+        cache.put(prefix + code, username, 20L);
+        return code;
+    }
+
+    @Override
+    public Token quickLogin(String code) {
+        String username = cache.get(prefix + code);
+        cache.remove(prefix + code);
+        if (StringUtils.isEmpty(username)) {
+            throw new ServiceException(ResultCode.ERROR);
+        }
+        return seatTokenGenerate.createToken(findByUsername(username), true);
+    }
+
+    /**
+     * 查询坐席
+     *
+     * @param username
+     * @return
+     */
+    @Override
+    public Seat findByUsername(String username) {
+        LambdaQueryWrapper<Seat> seatLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        seatLambdaQueryWrapper.eq(Seat::getUsername, username);
+        return this.getOne(seatLambdaQueryWrapper);
+    }
+
+
+}

framework/src/main/java/cn/lili/modules/im/serviceimpl/SeatSettingServiceImpl.java

@@ -0,0 +1,48 @@
+package cn.lili.modules.im.serviceimpl;
+
+import cn.lili.common.enums.ResultCode;
+import cn.lili.common.exception.ServiceException;
+import cn.lili.modules.im.entity.dos.SeatSetting;
+import cn.lili.modules.im.mapper.SeatSettingMapper;
+import cn.lili.modules.im.service.SeatSettingService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 坐席设置业务层实现
+ *
+ * @author pikachu
+ * @since 2020-02-18 16:18:56
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class SeatSettingServiceImpl extends ServiceImpl<SeatSettingMapper, SeatSetting> implements SeatSettingService {
+    @Override
+    public SeatSetting getSetting(String storeId) {
+        LambdaQueryWrapper<SeatSetting> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SeatSetting::getTenantId, storeId);
+        SeatSetting seatSetting = this.baseMapper.selectOne(queryWrapper);
+        if (seatSetting == null) {
+            seatSetting = new SeatSetting();
+            seatSetting.setOutLineAutoReply("您好，我现在不在线，请您留下关键内容和联系方式，我看到后会立马回电。");
+            seatSetting.setLongTermAutoReply("您好，我正在查阅相关资料，请您稍等。");
+            seatSetting.setWelcome("您好，请问有什么可以帮您？");
+            seatSetting.setTenantId(storeId);
+            this.save(seatSetting);
+        }
+        return seatSetting;
+    }
+
+    @Override
+    public SeatSetting updateByStore(SeatSetting seatSetting) {
+        SeatSetting oldSetting = this.baseMapper.selectById(seatSetting.getId());
+        if (oldSetting.getTenantId().equals(seatSetting.getTenantId())) {
+            this.updateById(seatSetting);
+        } else {
+            throw new ServiceException(ResultCode.ERROR);
+        }
+        return seatSetting;
+    }
+}

framework/src/main/java/cn/lili/modules/im/token/SeatTokenGenerate.java

@@ -0,0 +1,42 @@
+package cn.lili.modules.im.token;
+
+import cn.lili.common.security.AuthUser;
+import cn.lili.common.security.enums.UserEnums;
+import cn.lili.common.security.token.Token;
+import cn.lili.common.security.token.TokenUtil;
+import cn.lili.common.security.token.base.AbstractTokenGenerate;
+import cn.lili.modules.im.entity.dos.Seat;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 会员token生成
+ *
+ * @author Chopper
+ * @version v4.0
+ * @since 2020/11/16 10:50
+ */
+@Component
+public class SeatTokenGenerate extends AbstractTokenGenerate<Seat> {
+    @Autowired
+    private TokenUtil tokenUtil;
+
+    @Override
+    public Token createToken(Seat seat, Boolean longTerm) {
+        AuthUser authUser = new AuthUser(
+                seat.getUsername(),
+                seat.getId(),
+                seat.getNickName(),
+                seat.getFace(),
+                UserEnums.SEAT);
+        authUser.setTenantId(seat.getTenantId());
+        //登陆成功生成token
+        return tokenUtil.createToken(seat.getUsername(), authUser, longTerm, UserEnums.SEAT);
+    }
+
+    @Override
+    public Token refreshToken(String refreshToken) {
+        return tokenUtil.refreshToken(refreshToken, UserEnums.SEAT);
+    }
+
+}

framework/src/main/java/cn/lili/modules/kdBrid/serviceImpl/KdNiaoServiceImpl.java

@@ -26,7 +26,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.google.gson.Gson;
-import groovy.util.logging.Slf4j;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -88,7 +88,7 @@ public class KdNiaoServiceImpl implements KdNiaoService {
 
 
     @Override
-    @OrderLogPoint(description = "'订单['+#orderSn+']发货，发货单号['+#logisticsNo+'],已打印电子面单'", orderSn = "#orderSn")
+    @OrderLogPoint(description = "'订单['+#orderSn+']发货,打印电子面单'", orderSn = "#orderSn")
     @Transactional(rollbackFor = Exception.class)
     public String createElectronicsFaceSheet(String orderSn, String logisticsId) throws Exception {
         //电子面单模板
@@ -194,10 +194,12 @@ public class KdNiaoServiceImpl implements KdNiaoService {
             params.put("DataType", "2");
             // 以form表单形式提交post请求，post请求体中包含了应用级参数和系统级参数
             String result = sendPost(ReqURL, params);
-
+            if(CharSequenceUtil.isEmpty(result) || CharSequenceUtil.isBlank(result)){
+                throw new ServiceException(ResultCode.LOGISTICS_CHECK_SETTING);
+            }
             //根据公司业务处理返回的信息......
             JSONObject obj = JSONObject.parseObject(result);
-
+            log.info("电子面单响应：{}",result);
             if(!"100".equals(obj.getString("ResultCode"))){
                 return obj.getString("Reason");
             }

framework/src/main/java/cn/lili/modules/member/entity/dos/FootPrint.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 
@@ -15,6 +16,7 @@ import lombok.NoArgsConstructor;
  * @author Chopper
  * @since 2020/11/17 7:22 下午
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @TableName("li_foot_print")
 @ApiModel(value = "浏览历史")
@@ -28,6 +30,9 @@ public class FootPrint extends BaseEntity {
     @ApiModelProperty(value = "会员ID")
     private String memberId;
 
+    @ApiModelProperty(value = "店铺Id")
+    private String storeId;
+
     @ApiModelProperty(value = "商品ID")
     private String goodsId;
 

framework/src/main/java/cn/lili/modules/member/entity/dos/MemberEvaluation.java

@@ -1,9 +1,9 @@
 package cn.lili.modules.member.entity.dos;
 
+import cn.hutool.core.text.CharSequenceUtil;
 import cn.lili.common.enums.SwitchEnum;
 import cn.lili.common.security.sensitive.Sensitive;
 import cn.lili.common.security.sensitive.enums.SensitiveStrategy;
-import cn.lili.common.utils.StringUtils;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.member.entity.dto.MemberEvaluationDTO;
 import cn.lili.modules.order.order.entity.dos.Order;
@@ -131,7 +131,7 @@ public class MemberEvaluation extends BaseEntity {
         //设置订单编号
         this.orderNo = order.getSn();
         //是否包含图片
-        this.haveImage = StringUtils.isNotEmpty(memberEvaluationDTO.getImages());
+        this.haveImage = CharSequenceUtil.isNotEmpty(memberEvaluationDTO.getImages());
         //默认开启评价
         this.status = SwitchEnum.OPEN.name();
     }

framework/src/main/java/cn/lili/modules/member/entity/dto/FootPrintQueryParams.java

@@ -0,0 +1,36 @@
+package cn.lili.modules.member.entity.dto;
+
+import cn.hutool.core.text.CharSequenceUtil;
+import cn.lili.common.vo.PageVO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author chc
+ * @since 2022/6/2114:46
+ */
+@Data
+@ApiModel
+public class FootPrintQueryParams extends PageVO {
+
+    @ApiModelProperty("用户Id")
+    private String memberId;
+
+    @ApiModelProperty("店铺Id")
+    private String storeId;
+
+    public <T> QueryWrapper<T> queryWrapper() {
+        QueryWrapper<T> queryWrapper = new QueryWrapper<>();
+        if (CharSequenceUtil.isNotEmpty(memberId)) {
+            queryWrapper.eq("member_id", memberId);
+        }
+        if (CharSequenceUtil.isNotEmpty(storeId)) {
+            queryWrapper.eq("store_id", storeId);
+        }
+        queryWrapper.eq("delete_flag",false);
+        queryWrapper.orderByDesc("create_time");
+        return queryWrapper;
+    }
+}

framework/src/main/java/cn/lili/modules/member/service/FootprintService.java

@@ -2,6 +2,7 @@ package cn.lili.modules.member.service;
 
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.member.entity.dos.FootPrint;
+import cn.lili.modules.member.entity.dto.FootPrintQueryParams;
 import cn.lili.modules.search.entity.dos.EsGoodsIndex;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -42,10 +43,10 @@ public interface FootprintService extends IService<FootPrint> {
     /**
      * 获取会员浏览历史分页
      *
-     * @param pageVO 分页
+     * @param params 分页
      * @return 会员浏览历史列表
      */
-    IPage<EsGoodsIndex> footPrintPage(PageVO pageVO);
+    IPage<EsGoodsIndex> footPrintPage(FootPrintQueryParams params);
 
     /**
      * 获取当前会员的浏览记录数量
@@ -53,4 +54,5 @@ public interface FootprintService extends IService<FootPrint> {
      * @return 当前会员的浏览记录数量
      */
     long getFootprintNum();
+
 }

framework/src/main/java/cn/lili/modules/member/service/MemberService.java

@@ -252,7 +252,6 @@ public interface MemberService extends IService<Member> {
     void logout(UserEnums userEnums);
 
     /**
-     * <<<<<<< HEAD
      * 修改会员是否拥有店铺
      *
      * @param haveStore 是否拥有店铺

framework/src/main/java/cn/lili/modules/member/service/StoreLogisticsService.java

@@ -89,5 +89,4 @@ public interface StoreLogisticsService extends IService<StoreLogistics> {
      */
     List<StoreLogisticsVO> getCloseStoreLogistics(String storeId);
 
-
 }

framework/src/main/java/cn/lili/modules/member/serviceimpl/ClerkServiceImpl.java

@@ -4,7 +4,6 @@ import cn.hutool.core.text.CharSequenceUtil;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.common.security.context.UserContext;
-import cn.lili.common.utils.BeanUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.member.entity.dos.Clerk;
@@ -20,7 +19,6 @@ import cn.lili.modules.member.service.*;
 import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -60,9 +58,8 @@ public class ClerkServiceImpl extends ServiceImpl<ClerkMapper, Clerk> implements
         clerkVOQueryWrapper.eq(StringUtils.isNotEmpty(clerkQueryDTO.getDepartmentId()), "li_clerk.department_id", clerkQueryDTO.getDepartmentId());
         clerkVOQueryWrapper.like(StringUtils.isNotEmpty(clerkQueryDTO.getClerkName()), "li_clerk.clerk_name", clerkQueryDTO.getClerkName());
         clerkVOQueryWrapper.like(StringUtils.isNotEmpty(clerkQueryDTO.getMobile()), "m.mobile", clerkQueryDTO.getMobile());
-        IPage<ClerkVO> clerkPage = this.baseMapper.selectClerkPage(PageUtil.initPage(page), clerkVOQueryWrapper);
 
-        return clerkPage;
+        return this.baseMapper.selectClerkPage(PageUtil.initPage(page), clerkVOQueryWrapper);
 
 
         /*Page<Clerk> clerkPage = page(initPage, initWrapper);

framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java

@@ -3,6 +3,7 @@ package cn.lili.modules.member.serviceimpl;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.member.entity.dos.FootPrint;
+import cn.lili.modules.member.entity.dto.FootPrintQueryParams;
 import cn.lili.modules.member.mapper.FootprintMapper;
 import cn.lili.modules.member.service.FootprintService;
 import cn.lili.modules.search.entity.dos.EsGoodsIndex;
@@ -43,19 +44,17 @@ public class FootprintServiceImpl extends ServiceImpl<FootprintMapper, FootPrint
         queryWrapper.eq(FootPrint::getGoodsId, footPrint.getGoodsId());
         //如果已存在某商品记录，则更新其修改时间
         //如果不存在则添加记录
+        //为了保证足迹的排序,将原本足迹删除后重新添加
         List<FootPrint> oldPrints = list(queryWrapper);
         if (oldPrints != null && !oldPrints.isEmpty()) {
             FootPrint oldPrint = oldPrints.get(0);
-            oldPrint.setSkuId(footPrint.getSkuId());
+            this.removeById(oldPrint.getId());
-            this.updateById(oldPrint);
-            return oldPrint;
-        } else {
-            footPrint.setCreateTime(new Date());
-            this.save(footPrint);
-            //删除超过100条后的记录
-            this.baseMapper.deleteLastFootPrint(footPrint.getMemberId());
-            return footPrint;
         }
+        footPrint.setCreateTime(new Date());
+        this.save(footPrint);
+        //删除超过100条后的记录
+        this.baseMapper.deleteLastFootPrint(footPrint.getMemberId());
+        return footPrint;
     }
 
     @Override
@@ -74,15 +73,8 @@ public class FootprintServiceImpl extends ServiceImpl<FootprintMapper, FootPrint
     }
 
     @Override
-    public IPage<EsGoodsIndex> footPrintPage(PageVO pageVO) {
+    public IPage<EsGoodsIndex> footPrintPage(FootPrintQueryParams params) {
-
+        IPage<FootPrint> footPrintPages = this.page(PageUtil.initPage(params), params.queryWrapper());
-        LambdaQueryWrapper<FootPrint> lambdaQueryWrapper = Wrappers.lambdaQuery();
-        lambdaQueryWrapper.eq(FootPrint::getMemberId, UserContext.getCurrentUser().getId());
-        lambdaQueryWrapper.eq(FootPrint::getDeleteFlag, false);
-        lambdaQueryWrapper.orderByDesc(FootPrint::getCreateTime);
-        IPage<FootPrint> footPrintPages = this.page(PageUtil.initPage(pageVO), lambdaQueryWrapper);
-
-
         //定义结果
         IPage<EsGoodsIndex> esGoodsIndexIPage = new Page<>();
 
@@ -90,7 +82,7 @@ public class FootprintServiceImpl extends ServiceImpl<FootprintMapper, FootPrint
             return esGoodsIndexIPage;
         } else {
             List<EsGoodsIndex> list = esGoodsSearchService.getEsGoodsBySkuIds(
-                    footPrintPages.getRecords().stream().map(FootPrint::getSkuId).collect(Collectors.toList()), pageVO);
+                    footPrintPages.getRecords().stream().map(FootPrint::getSkuId).collect(Collectors.toList()), params);
 
             esGoodsIndexIPage.setPages(footPrintPages.getPages());
             esGoodsIndexIPage.setRecords(list);

framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java

@@ -40,6 +40,7 @@ import cn.lili.modules.store.entity.dos.Store;
 import cn.lili.modules.store.entity.enums.StoreStatusEnum;
 import cn.lili.modules.store.service.StoreService;
 import cn.lili.mybatis.util.PageUtil;
+import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
 import cn.lili.rocketmq.tags.MemberTagsEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -47,6 +48,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
@@ -94,6 +96,9 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
     @Autowired
     private RocketmqCustomProperties rocketmqCustomProperties;
 
+    @Autowired
+    private RocketMQTemplate rocketMQTemplate;
+
     @Autowired
     private ApplicationEventPublisher applicationEventPublisher;
     /**
@@ -287,6 +292,8 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
         member.setId(SnowFlake.getIdStr());
         //保存会员
         this.save(member);
+
+
         // 发送会员注册信息
         applicationEventPublisher.publishEvent(new TransactionCommitSendMQEvent("new member register", rocketmqCustomProperties.getMemberTopic(), MemberTagsEnum.MEMBER_REGISTER.name(), member));
     }
@@ -299,6 +306,9 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
         BeanUtil.copyProperties(memberEditDTO, member);
         //修改会员
         this.updateById(member);
+        String destination = rocketmqCustomProperties.getMemberTopic() + ":" + MemberTagsEnum.MEMBER_INFO_EDIT.name();
+        //发送订单变更mq消息
+        rocketMQTemplate.asyncSend(destination, member, RocketmqSendCallbackBuilder.commonCallback());
         return member;
     }
 

framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberSignServiceImpl.java

@@ -73,7 +73,7 @@ public class MemberSignServiceImpl extends ServiceImpl<MemberSignMapper, MemberS
             LambdaQueryWrapper<MemberSign> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(MemberSign::getMemberId, authUser.getId());
             List<MemberSign> signSize = this.baseMapper.getTodayMemberSign(queryWrapper);
-            if (signSize.size() > 0) {
+            if (signSize.isEmpty()) {
                 throw new ServiceException(ResultCode.MEMBER_SIGN_REPEAT);
             }
             //当前签到天数的前一天日期

framework/src/main/java/cn/lili/modules/member/serviceimpl/StoreLogisticsServiceImpl.java

@@ -45,7 +45,7 @@ public class StoreLogisticsServiceImpl extends ServiceImpl<StoreLogisticsMapper,
     }
 
     @Override
-    public StoreLogistics update(String logisticsId, String storeId,StoreLogisticsCustomerDTO storeLogisticsCustomerDTO) {
+    public StoreLogistics update(String logisticsId, String storeId, StoreLogisticsCustomerDTO storeLogisticsCustomerDTO) {
         LambdaQueryWrapper<StoreLogistics> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.eq(StoreLogistics::getLogisticsId, logisticsId);
         lambdaQueryWrapper.eq(StoreLogistics::getStoreId, storeId);
@@ -58,15 +58,15 @@ public class StoreLogisticsServiceImpl extends ServiceImpl<StoreLogisticsMapper,
     }
 
     @Override
-    public StoreLogistics getStoreLogisticsInfo( String logisticsId) {
+    public StoreLogistics getStoreLogisticsInfo(String logisticsId) {
         String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId();
-        return this.getOne(new LambdaQueryWrapper<StoreLogistics>().eq(StoreLogistics::getStoreId,storeId).eq(StoreLogistics::getLogisticsId,logisticsId));
+        return this.getOne(new LambdaQueryWrapper<StoreLogistics>().eq(StoreLogistics::getStoreId, storeId).eq(StoreLogistics::getLogisticsId, logisticsId));
     }
 
     @Override
     public List<StoreLogisticsVO> getOpenStoreLogistics(String storeId) {
         List<StoreLogisticsVO> openStoreLogistics = this.baseMapper.getOpenStoreLogistics(storeId);
-        for(StoreLogisticsVO storeLogisticsVO:openStoreLogistics){
+        for (StoreLogisticsVO storeLogisticsVO : openStoreLogistics) {
             storeLogisticsVO.setSelected("1");
         }
         return openStoreLogistics;
@@ -78,19 +78,19 @@ public class StoreLogisticsServiceImpl extends ServiceImpl<StoreLogisticsMapper,
     }
 
     @Override
-    public StoreLogistics add(String logisticsId, String storeId, StoreLogisticsCustomerDTO storeLogisticsCustomerDTO){
+    public StoreLogistics add(String logisticsId, String storeId, StoreLogisticsCustomerDTO storeLogisticsCustomerDTO) {
         //判断是否已经选择过，如果没有选择则进行添加
         LambdaQueryWrapper<StoreLogistics> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.eq(StoreLogistics::getLogisticsId, logisticsId);
         lambdaQueryWrapper.eq(StoreLogistics::getStoreId, storeId);
-        StoreLogistics storeLogistics=null;
+        StoreLogistics storeLogistics = null;
         if (this.getOne(lambdaQueryWrapper) == null) {
-        storeLogistics=new StoreLogistics(storeLogisticsCustomerDTO);
+            storeLogistics = new StoreLogistics(storeLogisticsCustomerDTO);
-        storeLogistics.setStoreId(storeId);
+            storeLogistics.setStoreId(storeId);
-        storeLogistics.setLogisticsId(logisticsId);
+            storeLogistics.setLogisticsId(logisticsId);
-        this.save(storeLogistics);
+            this.save(storeLogistics);
-        return storeLogistics;
+            return storeLogistics;
-    }
+        }
         return null;
     }
 

framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleServiceImpl.java

@@ -455,7 +455,10 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
         switch (afterSaleStatusEnum) {
             //判断当前售后的状态---申请中
             case APPLY: {
+//                买家申请售后时已经输入了订单售后数量，这里不需要(+x)处理
                 orderItem.setReturnGoodsNumber(orderItem.getReturnGoodsNumber() + afterSale.getNum());
+                //修改orderItem订单
+                this.updateOrderItem(orderItem);
                 break;
             }
 
@@ -464,13 +467,13 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
             case BUYER_CANCEL:
             case SELLER_TERMINATION: {
                 orderItem.setReturnGoodsNumber(orderItem.getReturnGoodsNumber() - afterSale.getNum());
+                //修改orderItem订单
+                this.updateOrderItem(orderItem);
                 break;
             }
             default:
                 break;
         }
-        //修改orderItem订单
-        this.updateOrderItem(orderItem);
     }
 
 

framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java

@@ -11,6 +11,7 @@ import cn.lili.modules.order.order.entity.vo.OrderVO;
 import cn.lili.modules.order.order.entity.vo.ReceiptVO;
 import cn.lili.modules.promotion.entity.dos.MemberCoupon;
 import cn.lili.modules.promotion.entity.vos.MemberCouponVO;
+import cn.lili.modules.store.entity.dos.StoreAddress;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -106,6 +107,10 @@ public class TradeDTO implements Serializable {
      */
     private MemberAddress memberAddress;
 
+    /**
+     * 自提地址
+     */
+    private StoreAddress storeAddress;
 
     /**
      * 客户端类型

framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartSkuVO.java

@@ -3,6 +3,7 @@ package cn.lili.modules.order.cart.entity.vo;
 import cn.lili.modules.distribution.entity.dos.DistributionGoods;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.order.cart.entity.enums.CartTypeEnum;
+import cn.lili.modules.order.cart.entity.enums.DeliveryMethodEnum;
 import cn.lili.modules.promotion.tools.PromotionTools;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -89,6 +90,12 @@ public class CartSkuVO extends CartBase implements Serializable {
     @ApiModelProperty(value = "购物车类型")
     private CartTypeEnum cartType;
 
+    /**
+     * @see DeliveryMethodEnum
+     */
+    @ApiModelProperty(value = "配送方式")
+    private String deliveryMethod;
+
     /**
      * 在构造器里初始化促销列表，规格列表
      */

framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartVO.java

@@ -81,6 +81,7 @@ public class CartVO extends CartBase implements Serializable {
     public CartVO(CartSkuVO cartSkuVO) {
         this.setStoreId(cartSkuVO.getStoreId());
         this.setStoreName(cartSkuVO.getStoreName());
+        this.setDeliveryMethod(cartSkuVO.getDeliveryMethod());
         this.setSkuList(new ArrayList<>());
         this.setCouponList(new ArrayList<>());
         this.setGiftList(new ArrayList<>());

framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java

@@ -36,10 +36,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -108,29 +105,36 @@ public class CheckDataRender implements CartRenderStep {
 
             //缓存中的商品信息
             GoodsSku dataSku = goodsSkuService.getGoodsSkuByIdFromCache(cartSkuVO.getGoodsSku().getId());
-            Map<String, Object> promotionMap = promotionGoodsService.getCurrentGoodsPromotion(dataSku, tradeDTO.getCartTypeEnum().name());
+
-            //商品有效性判定
+
-            if (dataSku == null || dataSku.getUpdateTime().after(cartSkuVO.getGoodsSku().getUpdateTime())) {
-                //商品失效,将商品移除并重新填充商品
-                cartSkuVOS.remove(cartSkuVO);
-                //设置新商品
-                CartSkuVO newCartSkuVO = new CartSkuVO(dataSku,promotionMap);
-                newCartSkuVO.setCartType(tradeDTO.getCartTypeEnum());
-                newCartSkuVO.setNum(cartSkuVO.getNum());
-                newCartSkuVO.setSubTotal(CurrencyUtil.mul(newCartSkuVO.getPurchasePrice(), cartSkuVO.getNum()));
-                cartSkuVOS.add(newCartSkuVO);
-                continue;
-            }
             //商品上架状态判定
-            if (!GoodsAuthEnum.PASS.name().equals(dataSku.getAuthFlag()) || !GoodsStatusEnum.UPPER.name().equals(dataSku.getMarketEnable())) {
+            boolean checkGoodsStatus = dataSku == null || !GoodsAuthEnum.PASS.name().equals(dataSku.getAuthFlag()) || !GoodsStatusEnum.UPPER.name().equals(dataSku.getMarketEnable());
-                //设置购物车未选中
+            //商品有效性判定
-                cartSkuVO.setChecked(false);
+            boolean checkGoodsValid = dataSku != null && dataSku.getUpdateTime() != null && dataSku.getUpdateTime().after(cartSkuVO.getGoodsSku().getUpdateTime());
-                //设置购物车此sku商品已失效
+
-                cartSkuVO.setInvalid(true);
+            Map<String, Object> promotionMap = dataSku != null ? promotionGoodsService.getCurrentGoodsPromotion(dataSku, tradeDTO.getCartTypeEnum().name()) : null;
-                //设置失效消息
+
-                cartSkuVO.setErrorMessage("商品已下架");
+            log.info("dataSku: {}, goodsSku: {}", dataSku, cartSkuVO.getGoodsSku());
+            if (checkGoodsStatus || checkGoodsValid) {
+                if (checkGoodsStatus) {
+                    //设置购物车未选中
+                    cartSkuVO.setChecked(false);
+                    //设置购物车此sku商品已失效
+                    cartSkuVO.setInvalid(true);
+                    //设置失效消息
+                    cartSkuVO.setErrorMessage("商品已下架");
+                }
+                if (checkGoodsValid) {
+                    CartSkuVO newCartSkuVO = new CartSkuVO(dataSku,promotionMap);
+                    newCartSkuVO.setCartType(tradeDTO.getCartTypeEnum());
+                    newCartSkuVO.setNum(cartSkuVO.getNum());
+                    newCartSkuVO.setSubTotal(CurrencyUtil.mul(newCartSkuVO.getPurchasePrice(), cartSkuVO.getNum()));
+                    cartSkuVO = newCartSkuVO;
+                    log.info("商品信息已更新，更新后的商品信息为：{}", cartSkuVO);
+                }
                 continue;
             }
+
             //商品库存判定
             if (dataSku.getQuantity() < cartSkuVO.getNum()) {
                 //设置购物车未选中
@@ -160,35 +164,37 @@ public class CheckDataRender implements CartRenderStep {
     private void groupStore(TradeDTO tradeDTO) {
         //渲染的购物车
         List<CartVO> cartList = new ArrayList<>();
-
+        if(tradeDTO.getCartList() == null || tradeDTO.getCartList().size() == 0){
-        //根据店铺分组
+            //根据店铺分组
-        Map<String, List<CartSkuVO>> storeCollect = tradeDTO.getSkuList().stream().collect(Collectors.groupingBy(CartSkuVO::getStoreId));
+            Map<String, List<CartSkuVO>> storeCollect = tradeDTO.getSkuList().stream().collect(Collectors.groupingBy(CartSkuVO::getStoreId));
-        for (Map.Entry<String, List<CartSkuVO>> storeCart : storeCollect.entrySet()) {
+            for (Map.Entry<String, List<CartSkuVO>> storeCart : storeCollect.entrySet()) {
-            if (!storeCart.getValue().isEmpty()) {
+                if (!storeCart.getValue().isEmpty()) {
-                CartVO cartVO = new CartVO(storeCart.getValue().get(0));
+                    CartVO cartVO = new CartVO(storeCart.getValue().get(0));
-                if (CharSequenceUtil.isEmpty(cartVO.getDeliveryMethod())) {
+                    if (CharSequenceUtil.isEmpty(cartVO.getDeliveryMethod())) {
-                    cartVO.setDeliveryMethod(DeliveryMethodEnum.LOGISTICS.name());
+                        cartVO.setDeliveryMethod(DeliveryMethodEnum.LOGISTICS.name());
-                }
+                    }
-                cartVO.setSkuList(storeCart.getValue());
+                    cartVO.setSkuList(storeCart.getValue());
-                try {
+                    try {
-                    //筛选属于当前店铺的优惠券
+                        //筛选属于当前店铺的优惠券
-                    storeCart.getValue().forEach(i -> i.getPromotionMap().forEach((key, value) -> {
+                        storeCart.getValue().forEach(i -> i.getPromotionMap().forEach((key, value) -> {
-                        if (key.contains(PromotionTypeEnum.COUPON.name())) {
+                            if (key.contains(PromotionTypeEnum.COUPON.name())) {
-                            JSONObject promotionsObj = JSONUtil.parseObj(value);
+                                JSONObject promotionsObj = JSONUtil.parseObj(value);
-                            Coupon coupon = JSONUtil.toBean(promotionsObj, Coupon.class);
+                                Coupon coupon = JSONUtil.toBean(promotionsObj, Coupon.class);
-                            if (key.contains(PromotionTypeEnum.COUPON.name()) && coupon.getStoreId().equals(storeCart.getKey())) {
+                                if (key.contains(PromotionTypeEnum.COUPON.name()) && coupon.getStoreId().equals(storeCart.getKey())) {
-                                cartVO.getCanReceiveCoupon().add(new CouponVO(coupon));
+                                    cartVO.getCanReceiveCoupon().add(new CouponVO(coupon));
+                                }
                             }
-                        }
+                        }));
-                    }));
+                    } catch (Exception e) {
-                } catch (Exception e) {
+                        log.error("筛选属于当前店铺的优惠券发生异常！", e);
-                    log.error("筛选属于当前店铺的优惠券发生异常！", e);
+                    }
+                    storeCart.getValue().stream().filter(i -> Boolean.TRUE.equals(i.getChecked())).findFirst().ifPresent(cartSkuVO -> cartVO.setChecked(true));
+                    cartList.add(cartVO);
                 }
-                storeCart.getValue().stream().filter(i -> Boolean.TRUE.equals(i.getChecked())).findFirst().ifPresent(cartSkuVO -> cartVO.setChecked(true));
-                cartList.add(cartVO);
             }
+            tradeDTO.setCartList(cartList);
         }
-        tradeDTO.setCartList(cartList);
+
     }
 
     /**

framework/src/main/java/cn/lili/modules/order/cart/render/impl/CouponRender.java

@@ -31,8 +31,6 @@ import java.util.stream.Collectors;
 @Service
 public class CouponRender implements CartRenderStep {
 
-    @Autowired
-    private PromotionPriceUtil promotionPriceUtil;
     @Autowired
     private MemberCouponService memberCouponService;
 
@@ -267,9 +265,9 @@ public class CouponRender implements CartRenderStep {
      */
     private void renderCouponPrice(Map<String, Double> couponMap, TradeDTO tradeDTO, MemberCoupon coupon, MemberCouponDTO memberCouponDTO) {
         //分发优惠券
-        promotionPriceUtil.recountPrice(tradeDTO, memberCouponDTO.getSkuDetail(), memberCouponDTO.getMemberCoupon().getPrice(),
+        PromotionPriceUtil.recountPrice(tradeDTO, memberCouponDTO.getSkuDetail(), memberCouponDTO.getMemberCoupon().getPrice(),
                 Boolean.TRUE.equals(coupon.getPlatformFlag()) ?
-                        PromotionTypeEnum.PLATFORM_COUPON : PromotionTypeEnum.COUPON);
+                        PromotionTypeEnum.PLATFORM_COUPON : PromotionTypeEnum.COUPON, memberCouponDTO.getMemberCoupon().getCouponId());
         //如果是平台券 则需要计算商家承担比例
         if (Boolean.TRUE.equals(coupon.getPlatformFlag()) && coupon.getStoreCommission() > 0) {
 

framework/src/main/java/cn/lili/modules/order/cart/render/impl/FullDiscountRender.java

@@ -13,6 +13,7 @@ import cn.lili.modules.order.cart.entity.vo.CartVO;
 import cn.lili.modules.order.cart.entity.vo.FullDiscountVO;
 import cn.lili.modules.order.cart.render.CartRenderStep;
 import cn.lili.modules.order.cart.render.util.PromotionPriceUtil;
+import cn.lili.modules.order.order.entity.dto.DiscountPriceItem;
 import cn.lili.modules.order.order.entity.dto.PriceDetailDTO;
 import cn.lili.modules.promotion.entity.dos.FullDiscount;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,9 +31,6 @@ import java.util.stream.Collectors;
 @Service
 public class FullDiscountRender implements CartRenderStep {
 
-    @Autowired
-    private PromotionPriceUtil promotionPriceUtil;
-
     @Autowired
     private GoodsSkuService goodsSkuService;
 
@@ -84,11 +82,11 @@ public class FullDiscountRender implements CartRenderStep {
                         if (isFull(countPrice, cart)) {
                             //如果减现金
                             if (Boolean.TRUE.equals(fullDiscount.getFullMinusFlag())) {
-                                promotionPriceUtil.recountPrice(tradeDTO, skuPriceDetail, fullDiscount.getFullMinus(), PromotionTypeEnum.FULL_DISCOUNT);
+                                PromotionPriceUtil.recountPrice(tradeDTO, skuPriceDetail, fullDiscount.getFullMinus(), PromotionTypeEnum.FULL_DISCOUNT, fullDiscountVO.getId());
                             }
                             //打折
                             else if (Boolean.TRUE.equals(fullDiscount.getFullRateFlag())) {
-                                this.renderFullRate(cart, skuPriceDetail, CurrencyUtil.div(fullDiscount.getFullRate(), 10));
+                                this.renderFullRate(cart, skuPriceDetail, CurrencyUtil.div(fullDiscount.getFullRate(), 10), fullDiscountVO.getId());
                             }
                             //渲染满优惠
                             renderFullMinus(cart);
@@ -107,7 +105,7 @@ public class FullDiscountRender implements CartRenderStep {
      * @param cart
      * @param skuPriceDetail
      */
-    private void renderFullRate(CartVO cart, Map<String, Double> skuPriceDetail, Double rate) {
+    private void renderFullRate(CartVO cart, Map<String, Double> skuPriceDetail, Double rate, String activityId) {
 
         List<CartSkuVO> cartSkuVOS = cart.getCheckedSkuList().stream().filter(cartSkuVO -> skuPriceDetail.containsKey(cartSkuVO.getGoodsSku().getId())).collect(Collectors.toList());
 
@@ -115,14 +113,25 @@ public class FullDiscountRender implements CartRenderStep {
         cartSkuVOS.forEach(cartSkuVO -> {
             PriceDetailDTO priceDetailDTO = cartSkuVO.getPriceDetailDTO();
 
+
+            Double discountPrice = CurrencyUtil.mul(priceDetailDTO.getGoodsPrice(),
+                    CurrencyUtil.sub(1, rate)
+            );
             //优惠金额=旧的优惠金额+商品金额*商品折扣比例
             priceDetailDTO.setDiscountPrice(
-                    CurrencyUtil.add(priceDetailDTO.getDiscountPrice(),
+                    CurrencyUtil.add(priceDetailDTO.getDiscountPrice(), discountPrice
-                            CurrencyUtil.mul(priceDetailDTO.getGoodsPrice(),
-                                    CurrencyUtil.sub(1, rate)
-                            )
                     )
             );
+            //优惠金额=旧的优惠金额+商品金额*商品折扣比例
+            priceDetailDTO.addDiscountPriceItem(DiscountPriceItem
+                    .builder()
+                    .discountPrice(discountPrice)
+                    .promotionTypeEnum(PromotionTypeEnum.FULL_DISCOUNT)
+                    .promotionId(activityId)
+                    .skuId(cartSkuVO.getGoodsSku().getId())
+                    .goodsId(cartSkuVO.getGoodsSku().getGoodsId())
+
+                    .build());
 
         });
 

framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java

@@ -3,10 +3,12 @@ package cn.lili.modules.order.cart.render.impl;
 import cn.lili.common.utils.CurrencyUtil;
 import cn.lili.modules.member.entity.dos.MemberAddress;
 import cn.lili.modules.order.cart.entity.dto.TradeDTO;
+import cn.lili.modules.order.cart.entity.enums.DeliveryMethodEnum;
 import cn.lili.modules.order.cart.entity.enums.RenderStepEnums;
 import cn.lili.modules.order.cart.entity.vo.CartSkuVO;
 import cn.lili.modules.order.cart.render.CartRenderStep;
 import cn.lili.modules.store.entity.dos.FreightTemplateChild;
+import cn.lili.modules.store.entity.dos.StoreAddress;
 import cn.lili.modules.store.entity.dto.FreightTemplateChildDTO;
 import cn.lili.modules.store.entity.enums.FreightTemplateEnum;
 import cn.lili.modules.store.entity.vos.FreightTemplateVO;
@@ -42,72 +44,81 @@ public class SkuFreightRender implements CartRenderStep {
         List<CartSkuVO> cartSkuVOS = tradeDTO.getCheckedSkuList();
         //会员收货地址问题处理
         MemberAddress memberAddress = tradeDTO.getMemberAddress();
+        StoreAddress storeAddress = tradeDTO.getStoreAddress();
         //如果收货地址为空，则抛出异常
-        if (memberAddress == null) {
+        if (memberAddress == null && storeAddress == null) {
             return;
         }
-        //运费分组信息
+        //选择物流的时候计算价格
-        Map<String, List<String>> freightGroups = freightTemplateGrouping(cartSkuVOS);
+        if(DeliveryMethodEnum.LOGISTICS.name().equals(tradeDTO.getCartList().get(0).getDeliveryMethod())){
+            if (memberAddress != null) {
+                //运费分组信息
+                Map<String, List<String>> freightGroups = freightTemplateGrouping(cartSkuVOS);
 
-        //循环运费模版
+                //循环运费模版
-        for (Map.Entry<String, List<String>> freightTemplateGroup : freightGroups.entrySet()) {
+                for (Map.Entry<String, List<String>> freightTemplateGroup : freightGroups.entrySet()) {
 
-            //商品id列表
+                    //商品id列表
-            List<String> skuIds = freightTemplateGroup.getValue();
+                    List<String> skuIds = freightTemplateGroup.getValue();
 
-            //当前购物车商品列表
+                    //当前购物车商品列表
-            List<CartSkuVO> currentCartSkus = cartSkuVOS.stream().filter(item -> skuIds.contains(item.getGoodsSku().getId())).collect(Collectors.toList());
+                    List<CartSkuVO> currentCartSkus = cartSkuVOS.stream().filter(item -> skuIds.contains(item.getGoodsSku().getId())).collect(Collectors.toList());
 
-            //寻找对应对商品运费计算模版
+                    //寻找对应对商品运费计算模版
-            FreightTemplateVO freightTemplate = freightTemplateService.getFreightTemplate(freightTemplateGroup.getKey());
+                    FreightTemplateVO freightTemplate = freightTemplateService.getFreightTemplate(freightTemplateGroup.getKey());
-            if (freightTemplate != null
+                    if (freightTemplate != null
-                    && freightTemplate.getFreightTemplateChildList() != null
+                            && freightTemplate.getFreightTemplateChildList() != null
-                    && !freightTemplate.getFreightTemplateChildList().isEmpty()) {
+                            && !freightTemplate.getFreightTemplateChildList().isEmpty()) {
-                //店铺模版免运费则跳过
+                        //店铺模版免运费则跳过
-                if (freightTemplate.getPricingMethod().equals(FreightTemplateEnum.FREE.name())) {
+                        if (freightTemplate.getPricingMethod().equals(FreightTemplateEnum.FREE.name())) {
-                    break;
+                            break;
-                }
+                        }
 
-                //运费模版
+                        //运费模版
-                FreightTemplateChild freightTemplateChild = null;
+                        FreightTemplateChild freightTemplateChild = null;
 
-                //获取市级别id匹配运费模版
+                        //获取市级别id匹配运费模版
-                String addressId = memberAddress.getConsigneeAddressIdPath().split(",")[1];
+                        String addressId = memberAddress.getConsigneeAddressIdPath().split(",")[1];
-                for (FreightTemplateChild templateChild : freightTemplate.getFreightTemplateChildList()) {
+                        for (FreightTemplateChild templateChild : freightTemplate.getFreightTemplateChildList()) {
-                    //模版匹配判定
+                            //模版匹配判定
-                    if (templateChild.getAreaId().contains(addressId)) {
+                            if (templateChild.getAreaId().contains(addressId)) {
-                        freightTemplateChild = templateChild;
+                                freightTemplateChild = templateChild;
-                        break;
+                                break;
+                            }
+                        }
+                        //如果没有匹配到物流规则，则说明不支持配送
+                        if (freightTemplateChild == null) {
+                            if (tradeDTO.getNotSupportFreight() == null) {
+                                tradeDTO.setNotSupportFreight(new ArrayList<>());
+                            }
+                            tradeDTO.getNotSupportFreight().addAll(currentCartSkus);
+                            continue;
+                        }
+
+                        //物流规则模型创立
+                        FreightTemplateChildDTO freightTemplateChildDTO = new FreightTemplateChildDTO(freightTemplateChild);
+                        //模型写入运费模版设置的计费方式
+                        freightTemplateChildDTO.setPricingMethod(freightTemplate.getPricingMethod());
+
+                        //计算运费总数
+                        Double count = currentCartSkus.stream().mapToDouble(item ->
+                                // 根据计费规则 累加计费基数
+                                freightTemplateChildDTO.getPricingMethod().equals(FreightTemplateEnum.NUM.name()) ?
+                                        item.getNum().doubleValue() :
+                                        CurrencyUtil.mul(item.getNum(), item.getGoodsSku().getWeight())
+                        ).sum();
+
+                        //计算运费
+                        Double countFreight = countFreight(count, freightTemplateChildDTO);
+
+                        //写入SKU运费
+                        resetFreightPrice(FreightTemplateEnum.valueOf(freightTemplateChildDTO.getPricingMethod()), count, countFreight, currentCartSkus);
                     }
                 }
-                //如果没有匹配到物流规则，则说明不支持配送
-                if (freightTemplateChild == null) {
-                    if (tradeDTO.getNotSupportFreight() == null) {
-                        tradeDTO.setNotSupportFreight(new ArrayList<>());
-                    }
-                    tradeDTO.getNotSupportFreight().addAll(currentCartSkus);
-                    continue;
-                }
-
-                //物流规则模型创立
-                FreightTemplateChildDTO freightTemplateChildDTO = new FreightTemplateChildDTO(freightTemplateChild);
-                //模型写入运费模版设置的计费方式
-                freightTemplateChildDTO.setPricingMethod(freightTemplate.getPricingMethod());
-
-                //计算运费总数
-                Double count = currentCartSkus.stream().mapToDouble(item ->
-                        // 根据计费规则 累加计费基数
-                        freightTemplateChildDTO.getPricingMethod().equals(FreightTemplateEnum.NUM.name()) ?
-                                item.getNum().doubleValue() :
-                                CurrencyUtil.mul(item.getNum(), item.getGoodsSku().getWeight())
-                ).sum();
-
-                //计算运费
-                Double countFreight = countFreight(count, freightTemplateChildDTO);
-
-                //写入SKU运费
-                resetFreightPrice(FreightTemplateEnum.valueOf(freightTemplateChildDTO.getPricingMethod()), count, countFreight, currentCartSkus);
             }
+        }else{
+            //自提清空不配送商品
+            tradeDTO.setNotSupportFreight(null);
         }
     }
 

framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuPromotionRender.java

@@ -15,6 +15,7 @@ import cn.lili.modules.order.cart.entity.enums.RenderStepEnums;
 import cn.lili.modules.order.cart.entity.vo.CartSkuVO;
 import cn.lili.modules.order.cart.entity.vo.CartVO;
 import cn.lili.modules.order.cart.render.CartRenderStep;
+import cn.lili.modules.order.order.entity.dto.DiscountPriceItem;
 import cn.lili.modules.order.order.entity.dto.PriceDetailDTO;
 import cn.lili.modules.promotion.entity.dto.search.KanjiaActivitySearchParams;
 import cn.lili.modules.promotion.entity.enums.KanJiaStatusEnum;
@@ -117,6 +118,17 @@ public class SkuPromotionRender implements CartRenderStep {
                         PromotionSkuVO promotionSkuVO = new PromotionSkuVO(PromotionTypeEnum.POINTS_GOODS.name(), cartSkuVO.getPointsId());
                         cartSkuVO.getPriceDetailDTO().getJoinPromotion().add(promotionSkuVO);
                         totalPayPoints += cartSkuVO.getPoint();
+
+                        //记录优惠由来
+                        cartSkuVO.getPriceDetailDTO().setDiscountPriceItem(
+                                DiscountPriceItem.builder()
+                                        .discountPrice(CurrencyUtil.sub(cartSkuVO.getGoodsSku().getPrice(), cartSkuVO.getPurchasePrice()))
+                                        .promotionId(promotionSkuVO.getActivityId())
+                                        .promotionTypeEnum(PromotionTypeEnum.POINTS_GOODS)
+                                        .skuId(cartSkuVO.getGoodsSku().getId())
+                                        .goodsId(cartSkuVO.getGoodsSku().getGoodsId())
+                                        .build()
+                        );
                     }
                 }
                 if (userInfo.getPoint() < totalPayPoints) {
@@ -138,9 +150,19 @@ public class SkuPromotionRender implements CartRenderStep {
                             cartSkuVO.setSubTotal(kanjiaActivityVO.getPurchasePrice());
                             cartSkuVO.getPriceDetailDTO().setGoodsPrice(kanjiaActivityVO.getPurchasePrice());
                         }
-
                         PromotionSkuVO promotionSkuVO = new PromotionSkuVO(PromotionTypeEnum.KANJIA.name(), cartSkuVO.getKanjiaId());
                         cartSkuVO.getPriceDetailDTO().getJoinPromotion().add(promotionSkuVO);
+
+                        //记录优惠由来
+                        cartSkuVO.getPriceDetailDTO().setDiscountPriceItem(
+                                DiscountPriceItem.builder()
+                                        .discountPrice(CurrencyUtil.sub(cartSkuVO.getGoodsSku().getPrice(), cartSkuVO.getPurchasePrice()))
+                                        .promotionId(promotionSkuVO.getActivityId())
+                                        .promotionTypeEnum(PromotionTypeEnum.KANJIA)
+                                        .skuId(cartSkuVO.getGoodsSku().getId())
+                                        .goodsId(cartSkuVO.getGoodsSku().getGoodsId())
+                                        .build()
+                        );
                     }
                 }
                 return;
@@ -149,6 +171,17 @@ public class SkuPromotionRender implements CartRenderStep {
                     for (CartSkuVO cartSkuVO : cartVO.getCheckedSkuList()) {
                         PromotionSkuVO promotionSkuVO = new PromotionSkuVO(PromotionTypeEnum.PINTUAN.name(), cartSkuVO.getPintuanId());
                         cartSkuVO.getPriceDetailDTO().getJoinPromotion().add(promotionSkuVO);
+
+                        //记录优惠由来
+                        cartSkuVO.getPriceDetailDTO().setDiscountPriceItem(
+                                DiscountPriceItem.builder()
+                                        .discountPrice(CurrencyUtil.sub(cartSkuVO.getGoodsSku().getPrice(), cartSkuVO.getPurchasePrice()))
+                                        .promotionId(promotionSkuVO.getActivityId())
+                                        .promotionTypeEnum(PromotionTypeEnum.PINTUAN)
+                                        .skuId(cartSkuVO.getGoodsSku().getId())
+                                        .goodsId(cartSkuVO.getGoodsSku().getGoodsId())
+                                        .build()
+                        );
                     }
                 }
                 return;
@@ -171,6 +204,21 @@ public class SkuPromotionRender implements CartRenderStep {
                             cartSkuVO.getPriceDetailDTO().setGoodsPrice(cartSkuVO.getSubTotal());
 
                             cartSkuVO.getPriceDetailDTO().getJoinPromotion().add(promotionSkuVO);
+
+                            //如果是秒杀活动
+                            if (promotionSkuVO.getPromotionType().equals(PromotionTypeEnum.SECKILL.name())) {
+                                //需记录秒杀活动详情
+                                cartSkuVO.getPriceDetailDTO().setDiscountPriceItem(
+                                        DiscountPriceItem.builder()
+                                                .discountPrice(CurrencyUtil.sub(cartSkuVO.getGoodsSku().getPrice(), cartSkuVO.getPurchasePrice()))
+                                                .promotionId(promotionSkuVO.getActivityId())
+                                                .promotionTypeEnum(PromotionTypeEnum.SECKILL)
+                                                .skuId(cartSkuVO.getGoodsSku().getId())
+                                                .goodsId(cartSkuVO.getGoodsSku().getGoodsId())
+                                                .build());
+                            }
+
+
                         }
                     }
                 }

framework/src/main/java/cn/lili/modules/order/cart/render/util/PromotionPriceUtil.java

@@ -4,8 +4,8 @@ import cn.lili.common.enums.PromotionTypeEnum;
 import cn.lili.common.utils.CurrencyUtil;
 import cn.lili.modules.order.cart.entity.dto.TradeDTO;
 import cn.lili.modules.order.cart.entity.vo.CartSkuVO;
+import cn.lili.modules.order.order.entity.dto.DiscountPriceItem;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
 
 import java.util.Date;
 import java.util.List;
@@ -17,7 +17,6 @@ import java.util.Map;
  * @author paulG
  * @since 2020/8/21
  **/
-@Service
 @Slf4j
 public class PromotionPriceUtil {
 
@@ -29,7 +28,7 @@ public class PromotionPriceUtil {
      * @param discountPrice      需要分发的优惠金额
      * @param promotionTypeEnum  促销类型
      */
-    public void recountPrice(TradeDTO tradeDTO, Map<String, Double> skuPromotionDetail, Double discountPrice, PromotionTypeEnum promotionTypeEnum) {
+    public static void recountPrice(TradeDTO tradeDTO, Map<String, Double> skuPromotionDetail, Double discountPrice, PromotionTypeEnum promotionTypeEnum, String activityId) {
 
         // sku 促销信息非空判定
         if (skuPromotionDetail == null || skuPromotionDetail.size() == 0) {
@@ -102,6 +101,17 @@ public class PromotionPriceUtil {
 
                         cartSkuVO.getPriceDetailDTO().setCouponPrice(
                                 CurrencyUtil.add(cartSkuVO.getPriceDetailDTO().getCouponPrice(), skuDiscountPrice));
+
+                        cartSkuVO.getPriceDetailDTO().addDiscountPriceItem(
+                                DiscountPriceItem.builder()
+                                        .goodsId(cartSkuVO.getGoodsSku().getGoodsId())
+                                        .skuId(cartSkuVO.getGoodsSku().getId())
+                                        .discountPrice(skuDiscountPrice)
+                                        .promotionTypeEnum(PromotionTypeEnum.COUPON)
+                                        .promotionId(activityId)
+                                        .build()
+                        );
+
                     } else if (promotionTypeEnum == PromotionTypeEnum.PLATFORM_COUPON) {
 
                         cartSkuVO.getPriceDetailDTO().setSiteCouponPrice(
@@ -109,9 +119,32 @@ public class PromotionPriceUtil {
 
                         cartSkuVO.getPriceDetailDTO().setCouponPrice(
                                 CurrencyUtil.add(cartSkuVO.getPriceDetailDTO().getCouponPrice(), cartSkuVO.getPriceDetailDTO().getSiteCouponPrice()));
+
+
+                        cartSkuVO.getPriceDetailDTO().addDiscountPriceItem(
+                                DiscountPriceItem.builder()
+                                        .goodsId(cartSkuVO.getGoodsSku().getGoodsId())
+                                        .skuId(cartSkuVO.getGoodsSku().getId())
+                                        .discountPrice(skuDiscountPrice)
+                                        .promotionTypeEnum(PromotionTypeEnum.PLATFORM_COUPON)
+                                        .promotionId(activityId)
+                                        .build()
+                        );
+
                     } else {
                         cartSkuVO.getPriceDetailDTO().setDiscountPrice(
                                 CurrencyUtil.add(cartSkuVO.getPriceDetailDTO().getDiscountPrice(), skuDiscountPrice));
+
+                        //目前剩余的只有满减金额活动。后续如果需要调整，这里建议传递活动类型进来
+                        cartSkuVO.getPriceDetailDTO().addDiscountPriceItem(
+                                DiscountPriceItem.builder()
+                                        .goodsId(cartSkuVO.getGoodsSku().getGoodsId())
+                                        .skuId(cartSkuVO.getGoodsSku().getId())
+                                        .discountPrice(skuDiscountPrice)
+                                        .promotionTypeEnum(PromotionTypeEnum.FULL_DISCOUNT)
+                                        .promotionId(activityId)
+                                        .build()
+                        );
                     }
                 }
             }
@@ -130,7 +163,7 @@ public class PromotionPriceUtil {
      * @param promotionId   活动ID
      * @return 是否有效
      */
-    private boolean checkPromotionValidTime(Date startTime, Date endTime, String promotionType, String promotionId) {
+    private static boolean checkPromotionValidTime(Date startTime, Date endTime, String promotionType, String promotionId) {
         long now = System.currentTimeMillis();
         if (startTime.getTime() > now) {
             log.error("商品ID为{}的{}活动开始时间小于当时时间，活动未开始！", promotionId, promotionType);

framework/src/main/java/cn/lili/modules/order/cart/service/CartService.java

@@ -7,6 +7,8 @@ import cn.lili.modules.order.cart.entity.vo.TradeParams;
 import cn.lili.modules.order.order.entity.dos.Trade;
 import cn.lili.modules.order.order.entity.vo.ReceiptVO;
 
+import java.util.List;
+
 /**
  * 购物车业务层
  *
@@ -111,6 +113,14 @@ public interface CartService {
      */
     void shippingAddress(String shippingAddressId, String way);
 
+    /**
+     * 选择自提地址
+     *
+     * @param shopAddressId 收货地址id
+     * @param way               购物车类型
+     */
+    void shippingSelfAddress(String shopAddressId, String way);
+
     /**
      * 选择发票
      *
@@ -123,11 +133,10 @@ public interface CartService {
     /**
      * 选择配送方式
      *
-     * @param storeId        店铺id
      * @param deliveryMethod 配送方式
      * @param way            购物车类型
      */
-    void shippingMethod(String storeId, String deliveryMethod, String way);
+    void shippingMethod(String deliveryMethod, String way);
 
     /**
      * 获取购物车商品数量
@@ -160,4 +169,11 @@ public interface CartService {
      * @return 交易信息
      */
     Trade createTrade(TradeParams tradeParams);
+
+    /***
+     * 获取可使用的配送方式
+     * @param way
+     * @return
+     */
+    List<String> shippingMethodList(String way);
 }

framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java

@@ -46,6 +46,10 @@ import cn.lili.modules.promotion.service.PointsGoodsService;
 import cn.lili.modules.promotion.service.PromotionGoodsService;
 import cn.lili.modules.search.entity.dos.EsGoodsIndex;
 import cn.lili.modules.search.service.EsGoodsSearchService;
+import cn.lili.modules.store.entity.dos.Store;
+import cn.lili.modules.store.entity.dos.StoreAddress;
+import cn.lili.modules.store.service.StoreAddressService;
+import cn.lili.modules.store.service.StoreService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -116,6 +120,12 @@ public class CartServiceImpl implements CartService {
     @Autowired
     private WholesaleService wholesaleService;
 
+    @Autowired
+    private StoreService storeService;
+
+    @Autowired
+    private StoreAddressService storeAddressService;
+
     @Override
     public void add(String skuId, Integer num, String cartType, Boolean cover) {
         AuthUser currentUser = Objects.requireNonNull(UserContext.getCurrentUser());
@@ -438,6 +448,20 @@ public class CartServiceImpl implements CartService {
         this.resetTradeDTO(tradeDTO);
     }
 
+    @Override
+    public void shippingSelfAddress(String shopAddressId, String way) {
+        //默认购物车
+        CartTypeEnum cartTypeEnum = CartTypeEnum.CART;
+        if (CharSequenceUtil.isNotEmpty(way)) {
+            cartTypeEnum = CartTypeEnum.valueOf(way);
+        }
+
+        TradeDTO tradeDTO = this.readDTO(cartTypeEnum);
+        StoreAddress storeAddress = storeAddressService.getById(shopAddressId);
+        tradeDTO.setStoreAddress(storeAddress);
+        this.resetTradeDTO(tradeDTO);
+    }
+
     /**
      * 选择发票
      *
@@ -459,21 +483,18 @@ public class CartServiceImpl implements CartService {
     /**
      * 选择配送方式
      *
-     * @param storeId        店铺id
      * @param deliveryMethod 配送方式
      * @param way            购物车类型
      */
     @Override
-    public void shippingMethod(String storeId, String deliveryMethod, String way) {
+    public void shippingMethod(String deliveryMethod, String way) {
         CartTypeEnum cartTypeEnum = CartTypeEnum.CART;
         if (CharSequenceUtil.isNotEmpty(way)) {
             cartTypeEnum = CartTypeEnum.valueOf(way);
         }
         TradeDTO tradeDTO = this.readDTO(cartTypeEnum);
-        for (CartVO cartVO : tradeDTO.getCartList()) {
+        for (CartSkuVO cartSkuVO : tradeDTO.getSkuList()) {
-            if (cartVO.getStoreId().equals(storeId)) {
+            cartSkuVO.setDeliveryMethod(DeliveryMethodEnum.valueOf(deliveryMethod).name());
-                cartVO.setDeliveryMethod(DeliveryMethodEnum.valueOf(deliveryMethod).name());
-            }
         }
         this.resetTradeDTO(tradeDTO);
     }
@@ -547,8 +568,10 @@ public class CartServiceImpl implements CartService {
         tradeDTO.setStoreRemark(tradeParams.getRemark());
         tradeDTO.setParentOrderSn(tradeParams.getParentOrderSn());
         //订单无收货地址校验
-        if (tradeDTO.getMemberAddress() == null) {
+        if(tradeDTO.getStoreAddress() == null){
-            throw new ServiceException(ResultCode.MEMBER_ADDRESS_NOT_EXIST);
+            if (tradeDTO.getMemberAddress() == null) {
+                throw new ServiceException(ResultCode.MEMBER_ADDRESS_NOT_EXIST);
+            }
         }
         //构建交易
         Trade trade = tradeBuilder.createTrade(tradeDTO);
@@ -556,6 +579,22 @@ public class CartServiceImpl implements CartService {
         return trade;
     }
 
+    @Override
+    public List<String> shippingMethodList(String way) {
+        List<String> list = new ArrayList<String>();
+        list.add(DeliveryMethodEnum.LOGISTICS.name());
+        TradeDTO tradeDTO = this.getCheckedTradeDTO(CartTypeEnum.valueOf(way));
+        if(tradeDTO.getCartList().size()==1){
+            for (CartVO cartVO : tradeDTO.getCartList()) {
+                Store store = storeService.getById(cartVO.getStoreId());
+                if(store.getSelfPickFlag() != null && store.getSelfPickFlag()){
+                    list.add(DeliveryMethodEnum.SELF_PICK_UP.name());
+                }
+            }
+        }
+        return list;
+    }
+
 
     /**
      * 获取购物车类型

framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java

@@ -210,6 +210,15 @@ public class Order extends BaseEntity {
     @ApiModelProperty(value = "qrCode  实物为提货码  虚拟货物为账号")
     private String qrCode;
 
+    @ApiModelProperty(value = "自提点地址")
+    private String storeAddressPath;
+
+    @ApiModelProperty(value = "自提点电话")
+    private String storeAddressMobile;
+
+    @ApiModelProperty(value = "自提点地址经纬度")
+    private String storeAddressCenter;
+
     /**
      * 构建订单
      *
@@ -233,11 +242,19 @@ public class Order extends BaseEntity {
         this.setRemark(cartVO.getRemark());
         this.setFreightPrice(tradeDTO.getPriceDetailDTO().getFreightPrice());
         //会员收件信息
-        this.setConsigneeAddressIdPath(tradeDTO.getMemberAddress().getConsigneeAddressIdPath());
+        if(DeliveryMethodEnum.LOGISTICS.name().equals(cartVO.getDeliveryMethod())){
-        this.setConsigneeAddressPath(tradeDTO.getMemberAddress().getConsigneeAddressPath());
+            this.setConsigneeAddressIdPath(tradeDTO.getMemberAddress().getConsigneeAddressIdPath());
-        this.setConsigneeDetail(tradeDTO.getMemberAddress().getDetail());
+            this.setConsigneeAddressPath(tradeDTO.getMemberAddress().getConsigneeAddressPath());
-        this.setConsigneeMobile(tradeDTO.getMemberAddress().getMobile());
+            this.setConsigneeDetail(tradeDTO.getMemberAddress().getDetail());
-        this.setConsigneeName(tradeDTO.getMemberAddress().getName());
+            this.setConsigneeMobile(tradeDTO.getMemberAddress().getMobile());
+            this.setConsigneeName(tradeDTO.getMemberAddress().getName());
+        }
+        //自提点信息
+        if(DeliveryMethodEnum.SELF_PICK_UP.name().equals(cartVO.getDeliveryMethod())){
+            this.setStoreAddressPath(tradeDTO.getStoreAddress().getAddress());
+            this.setStoreAddressMobile(tradeDTO.getStoreAddress().getMobile());
+            this.setStoreAddressCenter(tradeDTO.getStoreAddress().getCenter());
+        }
         //平台优惠券判定
         if (tradeDTO.getPlatformCoupon() != null) {
             this.setUsePlatformMemberCouponId(tradeDTO.getPlatformCoupon().getMemberCoupon().getId());

framework/src/main/java/cn/lili/modules/order/order/entity/dto/DiscountPriceItem.java

@@ -0,0 +1,44 @@
+package cn.lili.modules.order.order.entity.dto;
+
+import cn.lili.common.enums.PromotionTypeEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 优惠信息详情
+ *
+ * @author liushuai(liushuai711 @ gmail.com)
+ * @version v4.0
+ * @Description:
+ * @since 2022/12/23 14:52
+ */
+@Builder
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class DiscountPriceItem {
+
+
+    @ApiModelProperty(value = "促销类型")
+    private PromotionTypeEnum promotionTypeEnum;
+
+    @ApiModelProperty(value = "促销id")
+    private String promotionId;
+
+    @ApiModelProperty(value = "减免金额")
+    private Double discountPrice;
+
+    @ApiModelProperty(value = "涉及 商品ID")
+    private String goodsId;
+
+    @ApiModelProperty(value = "涉及 SKU ID")
+    private String skuId;
+
+
+    public String getPromotionName() {
+        return promotionTypeEnum.description();
+    }
+}

framework/src/main/java/cn/lili/modules/order/order/entity/dto/PriceDetailDTO.java

@@ -42,6 +42,9 @@ public class PriceDetailDTO implements Serializable {
     @ApiModelProperty(value = "优惠金额")
     private Double discountPrice;
 
+    @ApiModelProperty(value = "优惠详情")
+    private List<DiscountPriceItem> discountPriceDetail;
+
     @ApiModelProperty(value = "优惠券金额")
     private Double couponPrice;
 
@@ -101,6 +104,27 @@ public class PriceDetailDTO implements Serializable {
     private List<PromotionSkuVO> joinPromotion;
 
 
+    /**
+     * 设置促销详情
+     *
+     * @param discountPriceItem 促销信息
+     */
+    public void setDiscountPriceItem(DiscountPriceItem discountPriceItem) {
+        List<DiscountPriceItem> discountPriceItems = new ArrayList<>();
+        discountPriceItems.add(discountPriceItem);
+        this.discountPriceDetail = discountPriceItems;
+    }
+
+    /**
+     * 设置促销详情
+     *
+     * @param discountPriceItem 促销信息
+     */
+    public void addDiscountPriceItem(DiscountPriceItem discountPriceItem) {
+        discountPriceDetail.add(discountPriceItem);
+    }
+
+
     public Double getOriginalPrice() {
         if (originalPrice == 0D) {
             return flowPrice;
@@ -134,6 +158,7 @@ public class PriceDetailDTO implements Serializable {
         billPrice = 0d;
         settlementPrice = 0d;
 
+        discountPriceDetail = new ArrayList<>();
 
         joinPromotion = new ArrayList<>();
     }
@@ -204,6 +229,8 @@ public class PriceDetailDTO implements Serializable {
         billPrice = CurrencyUtil.add(billPrice, priceDetailDTO.getBillPrice());
         settlementPrice = CurrencyUtil.add(settlementPrice, priceDetailDTO.getSettlementPrice());
 
+        discountPriceDetail.addAll(priceDetailDTO.getDiscountPriceDetail());
+
     }
 
     /**