Merge branch 'Bulbasaur' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg

framework/src/main/java/cn/lili/common/aop/limiter/LimitInterceptor.java

@@ -1,6 +1,7 @@
 package cn.lili.common.aop.limiter;
 
 import cn.lili.common.aop.limiter.annotation.LimitPoint;
+import cn.lili.common.exception.ServiceException;
 import com.google.common.collect.ImmutableList;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -21,6 +22,7 @@ import java.lang.reflect.Method;
 
 /**
  * 流量拦截
+ *
  * @author Chopper
  */
 @Aspect
@@ -42,7 +44,7 @@ public class LimitInterceptor {
     }
 
     @Around("execution(public * *(..)) && @annotation(cn.lili.common.aop.limiter.annotation.LimitPoint)")
-    public Object interceptor(ProceedingJoinPoint pjp) {
+    public Object interceptor(ProceedingJoinPoint pjp) throws Throwable {
         MethodSignature signature = (MethodSignature) pjp.getSignature();
         Method method = signature.getMethod();
         LimitPoint limitPointAnnotation = method.getAnnotation(LimitPoint.class);
@@ -65,22 +67,26 @@ public class LimitInterceptor {
         try {
             Number count = redisTemplate.execute(limitScript, keys, limitCount, limitPeriod);
             log.info("Access try count is {} for name={} and key = {}", count, name, key);
-            if (count != null && count.intValue() <= limitCount) {
+            // 如果缓存里没有值，或者他的值小于限制频率
+            if (count.intValue() <= limitCount) {
                 return pjp.proceed();
             } else {
-                throw new RuntimeException("访问过于频繁，请稍后再试");
-            }
-        } catch (Throwable e) {
-            if (e instanceof RuntimeException) {
-                throw new RuntimeException(e.getLocalizedMessage());
+                throw new ServiceException("访问过于频繁，请稍后再试");
             }
+        }
+        //如果从redis中执行都值判定为空，则这里跳过
+        catch (NullPointerException e) {
+            return pjp.proceed();
+        } catch (Exception e) {
             throw new RuntimeException("服务器异常，请稍后再试");
         }
     }
 
 
+    //默认unknown常量值
     private static final String UNKNOWN = "unknown";
 
+    //获取ip
     public String getIpAddress() {
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
         String ip = request.getHeader("x-forwarded-for");

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

@@ -219,7 +219,7 @@ public enum CachePrefix {
     STORE_ID_FULL_DISCOUNT,
 
     /**
-     * 限时抢购活动缓存key前缀
+     * 秒杀活动活动缓存key前缀
      */
     STORE_ID_SECKILL,
 

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

@@ -1,6 +1,7 @@
 package cn.lili.common.cache.impl;
 
 import cn.lili.common.cache.Cache;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.core.*;
@@ -18,6 +19,7 @@ import java.util.function.Consumer;
  *
  * @author Chopepr
  */
+@Slf4j
 @Component
 public class RedisCache implements Cache {
 
@@ -158,7 +160,7 @@ public class RedisCache implements Cache {
                 return null;
 
             } catch (IOException e) {
-                e.printStackTrace();
+                log.error("scan错误",e);
                 throw new RuntimeException(e);
             }
         });

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

@@ -98,7 +98,7 @@ public abstract class BaseElasticsearchService {
             log.info(" Indicates whether the requisite number of shard copies were started for each shard in the index before timing out :{}", createIndexResponse.isShardsAcknowledged());
             return;
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("创建索引错误",e);
             throw new ElasticsearchException("创建索引 {" + index + "} 失败：" + e.getMessage());
         }
     }
@@ -420,7 +420,7 @@ public abstract class BaseElasticsearchService {
         try {
             searchResponse = client.search(searchRequest, COMMON_OPTIONS);
         } catch (IOException e) {
-            e.printStackTrace();
+            log.error("es 搜索错误",e);
         }
         return searchResponse;
     }

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

@@ -97,7 +97,8 @@ public enum ResultCode {
     USER_RECEIPT_NOT_EXIST(20014, "会员发票信息不存在"),
     USER_EDIT_ERROR(20015, "用户修改失败"),
     USER_OLD_PASSWORD_ERROR(20016, "旧密码不正确"),
-    USER_COLLECTION_EXIST(2001, "无法重复收藏"),
+    USER_COLLECTION_EXIST(20017, "无法重复收藏"),
+    USER_GRADE_IS_DEFAULT(20018, "会员等级为默认会员等级"),
     DELETE_EXIST(2001, "无法重复收藏"),
 
     /**
@@ -124,61 +125,97 @@ public enum ResultCode {
      * 购物车
      */
     CART_ERROR(30001, "读取结算页的购物车异常"),
+    CART_PINTUAN_NOT_EXIST_ERROR(30002, "拼团活动不存在错误"),
+    CART_PINTUAN_LIMIT_ERROR(30003, "购买数量超过拼团活动限制数量"),
     SHIPPING_NOT_APPLY(30005, "购物商品不支持当前收货地址配送"),
+
     /**
      * 订单
      */
     ORDER_ERROR(31001, "创建订单异常，请稍后重试"),
+
     ORDER_NOT_EXIST(31002, "订单不存在"),
+
     ORDER_DELIVERED_ERROR(31003, "订单状态错误，无法进行确认收货"),
+
     ORDER_UPDATE_PRICE_ERROR(31004, "已支付的订单不能修改金额"),
+
     ORDER_LOGISTICS_ERROR(31005, "物流错误"),
+
     ORDER_DELIVER_ERROR(31006, "物流错误"),
+
     ORDER_NOT_USER(31007, "非当前会员的订单"),
+
     ORDER_TAKE_ERROR(31008, "当前订单无法核销"),
+
     MEMBER_ADDRESS_NOT_EXIST(31009, "订单无收货地址，请先配置收货地址"),
 
+    ORDER_DELIVER_NUM_ERROR(31010, "没有待发货的订单"),
+
     /**
      * 支付
      */
     PAY_UN_WANTED(32000, "当前订单不需要付款，返回订单列表等待系统订单出库即可"),
+
     PAY_SUCCESS(32001, "支付成功"),
+
     PAY_INCONSISTENT_ERROR(32002, "付款金额和应付金额不一致"),
+
     PAY_DOUBLE_ERROR(32003, "订单已支付，不能再次进行支付"),
+
     PAY_CASHIER_ERROR(32004, "收银台信息获取错误"),
+
     PAY_ERROR(32005, "支付业务异常，请稍后重试"),
+
     PAY_BAN(32006, "当前订单不需要付款，请返回订单列表重新操作"),
+
     PAY_PARTIAL_ERROR(32007, "该订单已部分支付，请前往订单中心进行支付"),
+
     PAY_NOT_SUPPORT(32008, "支付暂不支持"),
+
     PAY_CLIENT_TYPE_ERROR(32009, "错误的客户端"),
+
     PAY_POINT_ENOUGH(32010, "积分不足，不能兑换"),
+
     PAY_NOT_EXIST_ORDER(32011, "支付订单不存在"),
 
     /**
      * 售后
      */
     AFTER_SALES_NOT_PAY_ERROR(33001, "当前订单未支付，不能申请售后"),
+
     AFTER_SALES_CANCEL_ERROR(33002, "当前售后单无法取消"),
+
     AFTER_SALES_BAN(33003, "订单状态不允许申请售后，请联系平台或商家"),
+
     AFTER_SALES_DOUBLE_ERROR(33004, "售后已审核，无法重复操作"),
+
     AFTER_SALES_LOGISTICS_ERROR(33005, "物流公司错误，请重新选择"),
+
     AFTER_STATUS_ERROR(33006, "售后状态错误，请刷新页面"),
 
     /**
      * 投诉
      */
     COMPLAINT_ORDER_ITEM_EMPTY_ERROR(33100, "订单不存在"),
+
     COMPLAINT_SKU_EMPTY_ERROR(33101, "商品已下架，如需投诉请联系平台客服"),
+
     COMPLAINT_ERROR(33102, "投诉异常，请稍后重试"),
 
     /**
      * 余额
      */
     WALLET_NOT_EXIT_ERROR(34000, "钱包不存在，请联系管理员"),
+
     WALLET_INSUFFICIENT(34001, "余额不足以支付订单，请充值!"),
+
     WALLET_WITHDRAWAL_INSUFFICIENT(34002, "可提现金额不足！"),
+
     WALLET_ERROR_INSUFFICIENT(34003, "零钱提现失败！"),
+
     WALLET_REMARK_ERROR(34004, "请填写审核备注！"),
+
     WALLET_APPLY_ERROR(34005, "提现申请异常！"),
 
     /**
@@ -195,52 +232,74 @@ public enum ResultCode {
      * 优惠券
      */
     COUPON_EDIT_STATUS_SUCCESS(41001, "修改状态成功！"),
+
     COUPON_CANCELLATION_SUCCESS(41002, "会员优惠券作废成功"),
+
     COUPON_EXPIRED(41003, "优惠券已使用/已过期，不能使用"),
+
     COUPON_EDIT_STATUS_ERROR(41004, "优惠券修改状态失败！"),
 
     /**
      * 拼团
      */
     PINTUAN_MANUAL_OPEN_SUCCESS(42001, "手动开启拼团活动成功"),
+
     PINTUAN_MANUAL_CLOSE_SUCCESS(42002, "手动关闭拼团活动成功"),
+
     PINTUAN_ADD_SUCCESS(42003, "添加拼团活动成功"),
+
     PINTUAN_EDIT_SUCCESS(42004, "修改拼团活动成功"),
+
     PINTUAN_DELETE_SUCCESS(42005, "删除拼团活动成功"),
+
     PINTUAN_MANUAL_OPEN_ERROR(42006, "手动开启拼团活动失败"),
+
     PINTUAN_MANUAL_CLOSE_ERROR(42007, "手动关闭拼团活动失败"),
+
     PINTUAN_ADD_ERROR(42008, "添加拼团活动失败"),
+
     PINTUAN_EDIT_ERROR(42009, "修改拼团活动失败"),
+
     PINTUAN_DELETE_ERROR(42010, "删除拼团活动失败"),
 
     /**
      * 满额活动
      */
     FULL_DISCOUNT_EDIT_SUCCESS(43001, "修改满优惠活动成功"),
+
     FULL_DISCOUNT_EDIT_DELETE(43002, "删除满优惠活动成功"),
 
     /**
      * 店铺
      */
     STORE_NOT_EXIST(50001, "此店铺不存在"),
+
     STORE_NAME_EXIST_ERROR(50002, "店铺名称已存在!"),
+
     STORE_APPLY_DOUBLE_ERROR(50003, "已有店铺，无需重复申请!"),
 
     /**
      * 结算单
      */
     BILL_CHECK_ERROR(51001, "只有已出账结算单可以核对"),
+
     BILL_COMPLETE_ERROR(51002, "只有已审核结算单可以支付"),
 
     /**
      * 文章
      */
     ARTICLE_CATEGORY_NAME_EXIST(60001, "文章分类名称已存在"),
+
     ARTICLE_CATEGORY_PARENT_NOT_EXIST(60002, "文章分类父分类不存在"),
+
     ARTICLE_CATEGORY_BEYOND_TWO(60003, "最多为二级分类,操作失败"),
+
     ARTICLE_CATEGORY_DELETE_ERROR(60004, "该文章分类下存在子分类，不能删除"),
+
     ARTICLE_CATEGORY_HAS_ARTICLE(60005, "该文章分类下存在文章，不能删除"),
+
     ARTICLE_CATEGORY_NO_DELETION(60007, "默认文章分类不能进行删除"),
+
     ARTICLE_NO_DELETION(60008, "默认文章不能进行删除"),
 
 
@@ -248,8 +307,11 @@ public enum ResultCode {
      * 页面
      */
     PAGE_NOT_EXIST(61001, "页面不存在"),
+
     PAGE_OPEN_DELETE_ERROR(61002, "当前页面为开启状态，无法删除"),
+
     PAGE_DELETE_ERROR(61003, "当前页面为唯一页面，无法删除"),
+
     PAGE_RELEASE_ERROR(61004, "页面已发布，无需重复提交"),
 
     /**
@@ -266,39 +328,49 @@ public enum ResultCode {
      * 站内信
      */
     NOTICE_NOT_EXIST(80101, "当前消息模板不存在"),
+
     NOTICE_ERROR(80102, "修改站内信异常，请稍后重试"),
 
     /**
      * OSS
      */
     OSS_NOT_EXIST(80201, "OSS未配置"),
+
     OSS_EXCEPTION(80202, "文件上传失败，请稍后重试"),
 
     /**
      * 验证码
      */
     VERIFICATION_SEND_SUCCESS(80301, "短信验证码,发送成功"),
+
     VERIFICATION_ERROR(80302, "验证失败"),
+
     VERIFICATION_SMS_ERROR(80303, "短信验证码错误，请重新校验"),
+
     VERIFICATION_SMS_EXPIRED_ERROR(80304, "验证码已失效，请重新校验"),
 
     /**
      * 配置错误
      */
     ALIPAY_NOT_SETTING(80401, "支付宝支付未配置"),
+
     ALIPAY_EXCEPTION(80402, "支付宝支付错误，请稍后重试"),
+
     ALIPAY_PARAMS_EXCEPTION(80403, "支付宝参数异常"),
 
     /**
      * 微信相关异常
      */
     WECHAT_CONNECT_NOT_SETTING(80500, "微信联合登陆信息未配置"),
+
     WECHAT_PAYMENT_NOT_SETTING(80501, "微信支付信息未配置"),
+
     WECHAT_QRCODE_ERROR(80502, "微信二维码生成异常"),
+
     WECHAT_MP_MESSAGE_ERROR(80503, "微信小程序小消息订阅异常"),
 
-    APP_VERSION_EXIST(80600, "APP版本已存在")
-    ;
+    APP_VERSION_EXIST(80600, "APP版本已存在");
+
     private final Integer code;
     private final String message;
 

framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java

@@ -119,7 +119,6 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil {
             default:
                 return;
         }
-
         //如果是测试模式 默认验证码 6个1
         if (systemSetting.getIsTestModel()) {
             code = "111111";
@@ -156,7 +155,7 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil {
         try {
             SendSmsResponse response = client.sendSms(sendSmsRequest);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("发送短信错误",e);
         }
     }
 
@@ -192,7 +191,7 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil {
             try {
                 client.sendBatchSms(sendBatchSmsRequest);
             } catch (Exception e) {
-                e.printStackTrace();
+                log.error("批量发送短信错误",e);
             }
         }
 
@@ -203,8 +202,6 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil {
     public void addSmsSign(SmsSign smsSign) throws Exception {
         //设置参数添加短信签名
         com.aliyun.dysmsapi20170525.Client client = this.createClient();
-        System.out.println(smsSign.getBusinessLicense().substring(smsSign.getBusinessLicense().lastIndexOf(".") + 1));
-        System.out.println(smsSign.getLicense().substring(smsSign.getLicense().lastIndexOf(".")));
         //营业执照
         AddSmsSignRequest.AddSmsSignRequestSignFileList signFileList0 = new AddSmsSignRequest.AddSmsSignRequestSignFileList()
                 .setFileContents(Base64Utils.encode(smsSign.getBusinessLicense()))
@@ -367,7 +364,7 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil {
             config.endpoint = "dysmsapi.aliyuncs.com";
             return new com.aliyun.dysmsapi20170525.Client(config);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("短信初始化错误",e);
         }
         return null;
     }

framework/src/main/java/cn/lili/common/trigger/delay/queue/PromotionDelayQueue.java

@@ -2,8 +2,6 @@ package cn.lili.common.trigger.delay.queue;
 
 import cn.lili.common.trigger.delay.AbstractDelayQueueMachineFactory;
 import cn.lili.common.trigger.enums.DelayQueueEnums;
-import cn.lili.common.trigger.interfaces.TimeTrigger;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -18,11 +16,9 @@ import org.springframework.stereotype.Component;
 @Component
 public class PromotionDelayQueue extends AbstractDelayQueueMachineFactory {
 
-    @Autowired
-    private TimeTrigger timeTrigger;
 
     @Override
     public String setDelayQueueName() {
-        return DelayQueueEnums.PROMOTION_QUEUE.name();
+        return DelayQueueEnums.PROMOTION.name();
     }
 }

framework/src/main/java/cn/lili/common/trigger/enums/DelayQueueEnums.java

@@ -7,9 +7,9 @@ public enum DelayQueueEnums {
 
 
     /**
-     * 促销任务队列
+     * 促销活动
      */
-    PROMOTION_QUEUE("促销任务队列");
+    PROMOTION("促销活动");
 
     private String description;
 

framework/src/main/java/cn/lili/common/trigger/enums/DelayTypeEnums.java

@@ -6,7 +6,7 @@ package cn.lili.common.trigger.enums;
  * @author paulG
  * @since 2021/5/7
  */
-public enum PromotionDelayTypeEnums {
+public enum DelayTypeEnums {
 
     /**
      * 促销活动
@@ -15,11 +15,16 @@ public enum PromotionDelayTypeEnums {
     /**
      * 拼团订单
      */
-    PINTUAN_ORDER("拼团订单");
+    PINTUAN_ORDER("拼团订单"),
+
+    /**
+     * 直播
+     */
+    BROADCAST("直播");
 
     private String description;
 
-    PromotionDelayTypeEnums(String description) {
+    DelayTypeEnums(String description) {
         this.description = description;
     }
 

framework/src/main/java/cn/lili/common/trigger/message/BroadcastMessage.java

@@ -0,0 +1,34 @@
+package cn.lili.common.delayqueue;
+
+import cn.hutool.core.date.DateTime;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * 直播消息实体
+ *
+ * @author Bulbasaur
+ * @date: 2021/6/1 4:48 下午
+ */
+@Data
+@NoArgsConstructor
+public class BroadcastMessage {
+
+    /**
+     * 直播间ID
+     */
+    private String studioId;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+
+    public BroadcastMessage(String studioId,  String status) {
+        this.studioId = studioId;
+        this.status = status;
+    }
+}

framework/src/main/java/cn/lili/common/trigger/model/TimeExecuteConstant.java

@@ -13,4 +13,9 @@ public abstract class TimeExecuteConstant {
      */
     public static final String PROMOTION_EXECUTOR = "promotionTimeTriggerExecutor";
 
+    /**
+     * 直播间延迟加载执行器
+     */
+    public static final String BROADCAST_EXECUTOR = "broadcastTimeTriggerExecutor";
+
 }

framework/src/main/java/cn/lili/common/trigger/util/DelayQueueTools.java

@@ -1,6 +1,6 @@
 package cn.lili.common.trigger.util;
 
-import cn.lili.common.trigger.enums.PromotionDelayTypeEnums;
+import cn.lili.common.trigger.enums.DelayTypeEnums;
 
 /**
  * 延时任务工具类
@@ -22,7 +22,7 @@ public class DelayQueueTools {
      * @param id   id
      * @return 唯一键
      */
-    public static String wrapperUniqueKey(PromotionDelayTypeEnums type, String id) {
+    public static String wrapperUniqueKey(DelayTypeEnums type, String id) {
         return "{TIME_TRIGGER_" + type.name() + "}_" + id;
     }
 

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

@@ -1,5 +1,6 @@
 package cn.lili.common.utils;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Base64;
@@ -12,6 +13,7 @@ import java.io.*;
  *
  * @author Chopper
  */
+@Slf4j
 public class Base64DecodeMultipartFile implements MultipartFile {
 
     private final byte[] imgContent;
@@ -64,7 +66,7 @@ public class Base64DecodeMultipartFile implements MultipartFile {
             stream = new FileOutputStream(dest);
             stream.write(imgContent);
         } catch (IOException e) {
-            e.printStackTrace();
+            log.error("transferTo错误",e);
         }finally {
             stream.close();
         }
@@ -92,7 +94,7 @@ public class Base64DecodeMultipartFile implements MultipartFile {
             byte[] bytes = Base64.getDecoder().decode(base64);
             stream = new ByteArrayInputStream(bytes);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("base64ToInputStream错误",e);
         }
         return stream;
     }
@@ -109,13 +111,13 @@ public class Base64DecodeMultipartFile implements MultipartFile {
             }
             data = swapStream.toByteArray();
         } catch (IOException e) {
-            e.printStackTrace();
+           log.error("转码错误",e);
         } finally {
             if (in != null) {
                 try {
                     in.close();
                 } catch (IOException e) {
-                    e.printStackTrace();
+                    log.error("inputStreamToStream错误",e);
                 }
             }
         }

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

@@ -1,5 +1,7 @@
 package cn.lili.common.utils;
 
+import lombok.extern.slf4j.Slf4j;
+
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -11,24 +13,9 @@ import javax.servlet.http.HttpServletResponse;
  * @version v1.0
  * 2020-12-14 09:32
  */
+@Slf4j
 public class CookieUtil {
 
-    /**
-     * 新增cookie
-     *
-     * @param key      key值
-     * @param value    对应值
-     * @param response 响应
-     */
-    public static void addCookie(String key, String value, HttpServletResponse response) {
-        try {
-            Cookie c = new Cookie(key, value);
-            c.setPath("/");
-            response.addCookie(c);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
 
     /**
      * 新增cookie
@@ -45,7 +32,7 @@ public class CookieUtil {
             c.setPath("/");
             response.addCookie(c);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("新增cookie错误",e);
         }
     }
 
@@ -61,7 +48,7 @@ public class CookieUtil {
             c.setMaxAge(0);
             response.addCookie(c);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("删除cookie错误",e);
         }
     }
 
@@ -83,7 +70,7 @@ public class CookieUtil {
                 }
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("获取cookie错误",e);
         }
         return null;
     }

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

@@ -56,6 +56,24 @@ public final class CurrencyUtil {
         return b1.multiply(b2).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
     }
 
+    /**
+     * 提供精确的乘法运算。
+     *
+     * @param v1 被乘数
+     * @param v2 乘数
+     * @param scale 表示表示需要精确到小数点以后几位。
+     * @return 两个参数的积
+     */
+    public static Double mul(double v1, double v2, int scale) {
+        if (scale < 0) {
+            throw new IllegalArgumentException(
+                    "The scale must be a positive integer or zero");
+        }
+        BigDecimal b1 = new BigDecimal(Double.toString(v1));
+        BigDecimal b2 = new BigDecimal(Double.toString(v2));
+        return b1.multiply(b2).setScale(scale, BigDecimal.ROUND_HALF_UP).doubleValue();
+    }
+
     /**
      * 提供（相对）精确的除法运算，当发生除不尽的情况时， 精确到小数点以后10位，以后的数字四舍五入。
      *

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

@@ -1,9 +1,12 @@
 package cn.lili.common.utils;
 
-import org.apache.http.*;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpEntityEnclosingRequest;
+import org.apache.http.HttpHost;
+import org.apache.http.HttpRequest;
+import org.apache.http.NoHttpResponseException;
 import org.apache.http.client.HttpRequestRetryHandler;
 import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
@@ -21,7 +24,6 @@ import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
-import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
 
 import javax.net.ssl.SSLException;
@@ -30,10 +32,9 @@ import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.net.URI;
 import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 
+@Slf4j
 public class HttpClientUtils {
 
     // org.apache.http.impl.client.CloseableHttpClient
@@ -146,11 +147,9 @@ public class HttpClientUtils {
             // 判断返回状态是否为200
             if (response.getStatusLine().getStatusCode() == 200) {
                 resultString = EntityUtils.toString(response.getEntity(), "UTF-8");
-            } else {
-                System.out.println(response.getStatusLine().getStatusCode());
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("get请求错误",e);
         } finally {
             try {
                 if (response != null) {
@@ -158,71 +157,9 @@ public class HttpClientUtils {
                 }
                 httpClient.close();
             } catch (IOException e) {
-                e.printStackTrace();
+                log.error("Get错误",e);
             }
         }
         return resultString;
     }
-
-    public static String doPost(String url, Map<String, String> param) {
-        // 创建HttpClient对象
-        CloseableHttpClient httpClient = getHttpClient();
-        CloseableHttpResponse response = null;
-        String resultString = "";
-        try {
-            // 创建Http Post请求
-            HttpPost httpPost = new HttpPost(url);
-            // 创建参数列表
-            if (param != null) {
-                List<NameValuePair> paramList = new ArrayList<>();
-                for (String key : param.keySet()) {
-                    paramList.add(new BasicNameValuePair(key, param.get(key)));
-                }
-                // 模拟表单
-                UrlEncodedFormEntity entity = new UrlEncodedFormEntity(paramList, "utf-8");
-                httpPost.setEntity(entity);
-            }
-            // 执行http请求
-            response = httpClient.execute(httpPost);
-            resultString = EntityUtils.toString(response.getEntity(), "utf-8");
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                response.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-
-        return resultString;
-    }
-
-
-    public static String doPostJson(String url, String json) {
-        // 创建HttpClient对象
-        CloseableHttpClient httpClient = getHttpClient();
-        CloseableHttpResponse response = null;
-        String resultString = "";
-        try {
-            // 创建Http Post请求
-            HttpPost httpPost = new HttpPost(url);
-            // 创建请求内容
-            StringEntity entity = new StringEntity(json, ContentType.APPLICATION_JSON);
-            httpPost.setEntity(entity);
-            // 执行http请求
-            response = httpClient.execute(httpPost);
-            resultString = EntityUtils.toString(response.getEntity(), "utf-8");
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                response.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-
-        return resultString;
-    }
 }

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

@@ -1,13 +1,12 @@
 package cn.lili.common.utils;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.DefaultTypedTuple;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
 
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
@@ -17,6 +16,7 @@ import java.util.concurrent.TimeUnit;
  * @author paulG
  * @since 2020/11/7
  **/
+@Slf4j
 @Component
 public class RedisUtil {
     @Autowired
@@ -38,51 +38,11 @@ public class RedisUtil {
             }
             return true;
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("指定缓存失效时间错误",e);
             return false;
         }
     }
 
-    /**
-     * 根据key 获取过期时间
-     *
-     * @param key 键 不能为null
-     * @return 时间(秒) 返回0代表为永久有效
-     */
-    public long getExpire(String key) {
-        return redisTemplate.getExpire(key, TimeUnit.SECONDS);
-    }
-
-    /**
-     * 判断key是否存在
-     *
-     * @param key 键
-     * @return true 存在 false不存在
-     */
-    public boolean hasKey(String key) {
-        try {
-            return redisTemplate.hasKey(key);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    /**
-     * 删除缓存
-     *
-     * @param key 可以传一个值 或多个
-     */
-    @SuppressWarnings("unchecked")
-    public void del(String... key) {
-        if (key != null && key.length > 0) {
-            if (key.length == 1) {
-                redisTemplate.delete(key[0]);
-            } else {
-                redisTemplate.delete(CollectionUtils.arrayToList(key));
-            }
-        }
-    }
 
     //============================String=============================
 
@@ -120,7 +80,7 @@ public class RedisUtil {
             redisTemplate.opsForValue().set(key, value);
             return true;
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("缓存放入错误",e);
             return false;
         }
 
@@ -143,215 +103,13 @@ public class RedisUtil {
             }
             return true;
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("普通缓存放入并设置时间错误",e);
             return false;
         }
     }
 
-    /**
-     * 递增
-     *
-     * @param key 键
-     * @return
-     */
-    public long incr(String key, long delta) {
-        if (delta < 0) {
-            throw new RuntimeException("递增因子必须大于0");
-        }
-        return redisTemplate.opsForValue().increment(key, delta);
-    }
-
-    /**
-     * 递减
-     *
-     * @param key 键
-     * @return
-     */
-    public long decr(String key, long delta) {
-        if (delta < 0) {
-            throw new RuntimeException("递减因子必须大于0");
-        }
-        return redisTemplate.opsForValue().increment(key, -delta);
-    }
-
     //================================Map=================================
 
-    /**
-     * HashGet
-     *
-     * @param key  键 不能为null
-     * @param item 项 不能为null
-     * @return 值
-     */
-    public Object hget(String key, String item) {
-        return redisTemplate.opsForHash().get(key, item);
-    }
-
-    /**
-     * 获取hashKey对应的所有键值
-     *
-     * @param key 键
-     * @return 对应的多个键值
-     */
-    public Map<Object, Object> hmget(String key) {
-        return redisTemplate.opsForHash().entries(key);
-    }
-
-    /**
-     * HashSet
-     *
-     * @param key 键
-     * @param map 对应多个键值
-     * @return true 成功 false 失败
-     */
-    public boolean hmset(String key, Map<String, Object> map) {
-        try {
-            redisTemplate.opsForHash().putAll(key, map);
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    /**
-     * HashSet 并设置时间
-     *
-     * @param key  键
-     * @param map  对应多个键值
-     * @param time 时间(秒)
-     * @return true成功 false失败
-     */
-    public boolean hmset(String key, Map<String, Object> map, long time) {
-        try {
-            redisTemplate.opsForHash().putAll(key, map);
-            if (time > 0) {
-                expire(key, time);
-            }
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    /**
-     * 向一张hash表中放入数据,如果不存在将创建
-     *
-     * @param key   键
-     * @param item  项
-     * @param value 值
-     * @return true 成功 false失败
-     */
-    public boolean hset(String key, String item, Object value) {
-        try {
-            redisTemplate.opsForHash().put(key, item, value);
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    /**
-     * 向一张hash表中放入数据,如果不存在将创建
-     *
-     * @param key   键
-     * @param item  项
-     * @param value 值
-     * @param time  时间(秒)  注意:如果已存在的hash表有时间,这里将会替换原有的时间
-     * @return true 成功 false失败
-     */
-    public boolean hset(String key, String item, Object value, long time) {
-        try {
-            redisTemplate.opsForHash().put(key, item, value);
-            if (time > 0) {
-                expire(key, time);
-            }
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    /**
-     * 删除hash表中的值
-     *
-     * @param key  键 不能为null
-     * @param item 项 可以使多个 不能为null
-     */
-    public void hdel(String key, Object... item) {
-        redisTemplate.opsForHash().delete(key, item);
-    }
-
-    /**
-     * 判断hash表中是否有该项的值
-     *
-     * @param key  键 不能为null
-     * @param item 项 不能为null
-     * @return true 存在 false不存在
-     */
-    public boolean hHasKey(String key, String item) {
-        return redisTemplate.opsForHash().hasKey(key, item);
-    }
-
-    /**
-     * hash递增 如果不存在,就会创建一个 并把新增后的值返回
-     *
-     * @param key  键
-     * @param item 项
-     * @param by   要增加几(大于0)
-     * @return
-     */
-    public double hincr(String key, String item, double by) {
-        return redisTemplate.opsForHash().increment(key, item, by);
-    }
-
-    /**
-     * hash递减
-     *
-     * @param key  键
-     * @param item 项
-     * @param by   要减少记(小于0)
-     * @return
-     */
-    public double hdecr(String key, String item, double by) {
-        return redisTemplate.opsForHash().increment(key, item, -by);
-    }
-
-    //============================set=============================
-
-    /**
-     * 根据key获取Set中的所有值
-     *
-     * @param key 键
-     * @return
-     */
-    public Set<Object> sGet(String key) {
-        try {
-            return redisTemplate.opsForSet().members(key);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    /**
-     * 根据value从一个set中查询,是否存在
-     *
-     * @param key   键
-     * @param value 值
-     * @return true 存在 false不存在
-     */
-    public boolean sHasKey(String key, Object value) {
-        try {
-            return redisTemplate.opsForSet().isMember(key, value);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
 
     /**
      * 将数据放入set缓存
@@ -364,112 +122,11 @@ public class RedisUtil {
         try {
             return redisTemplate.opsForSet().add(key, values);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("将数据放入set缓存错误",e);
             return 0;
         }
     }
 
-    /**
-     * 将set数据放入缓存
-     *
-     * @param key    键
-     * @param time   时间(秒)
-     * @param values 值 可以是多个
-     * @return 成功个数
-     */
-    public long sSetAndTime(String key, long time, Object... values) {
-        try {
-            Long count = redisTemplate.opsForSet().add(key, values);
-            if (time > 0) {
-                expire(key, time);
-            }
-            return count;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return 0;
-        }
-    }
-
-    /**
-     * 获取set缓存的长度
-     *
-     * @param key 键
-     * @return
-     */
-    public long sGetSetSize(String key) {
-        try {
-            return redisTemplate.opsForSet().size(key);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return 0;
-        }
-    }
-
-    /**
-     * 移除值为value的
-     *
-     * @param key    键
-     * @param values 值 可以是多个
-     * @return 移除的个数
-     */
-    public long setRemove(String key, Object... values) {
-        try {
-            Long count = redisTemplate.opsForSet().remove(key, values);
-            return count;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return 0;
-        }
-    }
-    //===============================listByParentId=================================
-
-    /**
-     * 获取list缓存的内容
-     *
-     * @param key   键
-     * @param start 开始
-     * @param end   结束  0 到 -1代表所有值
-     * @return
-     */
-    public List<Object> lGet(String key, long start, long end) {
-        try {
-            return redisTemplate.opsForList().range(key, start, end);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    /**
-     * 获取list缓存的长度
-     *
-     * @param key 键
-     * @return
-     */
-    public long lGetListSize(String key) {
-        try {
-            return redisTemplate.opsForList().size(key);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return 0;
-        }
-    }
-
-    /**
-     * 通过索引 获取list中的值
-     *
-     * @param key   键
-     * @param index 索引  index>=0时， 0 表头，1 第二个元素，依次类推；index<0时，-1，表尾，-2倒数第二个元素，依次类推
-     * @return
-     */
-    public Object lGetIndex(String key, long index) {
-        try {
-            return redisTemplate.opsForList().index(key, index);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
 
     /**
      * 将list放入缓存
@@ -483,7 +140,7 @@ public class RedisUtil {
             redisTemplate.opsForList().rightPush(key, value);
             return true;
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("将list放入缓存错误",e);
             return false;
         }
     }
@@ -504,7 +161,7 @@ public class RedisUtil {
             }
             return true;
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("将list放入缓存错误",e);
             return false;
         }
     }
@@ -521,27 +178,11 @@ public class RedisUtil {
             redisTemplate.opsForList().rightPushAll(key, value);
             return true;
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("将list放入缓存错误",e);
             return false;
         }
     }
 
-    /**
-     * 将list放入缓存
-     *
-     * @param key   键
-     * @param value 值
-     * @return
-     */
-    public <T> boolean lPush(String key, List<T> value) {
-        try {
-            redisTemplate.opsForList().leftPushAll(key, value);
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
 
     /**
      * 将list放入缓存
@@ -559,46 +200,12 @@ public class RedisUtil {
             }
             return true;
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("将list放入缓存错误",e);
             return false;
         }
     }
 
-    /**
-     * 根据索引修改list中的某条数据
-     *
-     * @param key   键
-     * @param index 索引
-     * @param value 值
-     * @return
-     */
-    public boolean lUpdateIndex(String key, long index, Object value) {
-        try {
-            redisTemplate.opsForList().set(key, index, value);
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
 
-    /**
-     * 移除N个值为value
-     *
-     * @param key   键
-     * @param count 移除多少个
-     * @param value 值
-     * @return 移除的个数
-     */
-    public long lRemove(String key, long count, Object value) {
-        try {
-            Long remove = redisTemplate.opsForList().remove(key, count, value);
-            return remove;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return 0;
-        }
-    }
     //===============================ZSet=================================
 
     /**

framework/src/main/java/cn/lili/common/verification/service/impl/VerificationServiceImpl.java

@@ -82,7 +82,7 @@ public class VerificationServiceImpl implements VerificationService {
         } catch (ServiceException e) {
             throw e;
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("创建校验错误",e);
             return null;
         }
     }

framework/src/main/java/cn/lili/config/elasticsearch/ElasticsearchConfig.java

@@ -1,6 +1,7 @@
 package cn.lili.config.elasticsearch;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpHost;
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.UsernamePasswordCredentials;
@@ -27,6 +28,7 @@ import java.util.List;
  * @author paulG
  * @since 2020/10/13
  **/
+@Slf4j
 @Configuration
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 public class ElasticsearchConfig extends AbstractElasticsearchConfiguration {
@@ -96,7 +98,7 @@ public class ElasticsearchConfig extends AbstractElasticsearchConfiguration {
         try {
             this.client.close();
         } catch (IOException e) {
-            e.printStackTrace();
+            log.error("es clientClose错误",e);
         }
     }
 

framework/src/main/java/cn/lili/config/rocketmq/RocketmqCustomProperties.java

@@ -61,4 +61,8 @@ public class RocketmqCustomProperties {
 
     private String afterSaleGroup;
 
+    private String broadcastTopic;
+
+    private String broadcastGroup;
+
 }

framework/src/main/java/cn/lili/modules/base/serviceimpl/RegionServiceImpl.java

@@ -58,7 +58,7 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
             //删除缓存
             cache.vagueDel("{regions}");
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("同步行政数据错误",e);
         }
     }
 

framework/src/main/java/cn/lili/modules/broadcast/entity/dos/Commodity.java

@@ -0,0 +1,64 @@
+package cn.lili.modules.broadcast.entity.dos;
+
+import cn.lili.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * 小程序直播商品
+ * @author Bulbasaur
+ * @date: 2021/5/17 9:34 上午
+ *
+ */
+@Data
+@Entity
+@ApiModel(value = "Commodity", description = "直播商品")
+@TableName("li_commodity")
+@Table(name = "li_commodity")
+public class Commodity extends BaseEntity {
+
+    @ApiModelProperty(value = "图片")
+    private String goodsImage;
+
+    @ApiModelProperty(value = "商品名称")
+    private String name;
+
+    //1：一口价（只需要传入price，price2不传）
+    // 2：价格区间（price字段为左边界，price2字段为右边界，price和price2必传）
+    // 3：显示折扣价（price字段为原价，price2字段为现价， price和price2必传
+    @ApiModelProperty(value = "价格类型")
+    private Integer priceType;
+
+    @ApiModelProperty(value = "价格")
+    private Double price;
+
+    @ApiModelProperty(value = "价格2")
+    private Double price2;
+
+    @ApiModelProperty(value = "商品详情页的小程序路径")
+    private String url;
+
+    @ApiModelProperty(value = "微信程序直播商品ID")
+    private Integer liveGoodsId;
+
+    @ApiModelProperty(value = "审核单ID")
+    private String auditId;
+
+    @ApiModelProperty(value = "审核状态")
+    private String auditStatus;
+
+    @ApiModelProperty(value = "店铺ID")
+    private String storeId;
+
+    @ApiModelProperty(value = "商品ID")
+    private String goodsId;
+
+    @ApiModelProperty(value = "规格ID")
+    private String skuId;
+
+}

framework/src/main/java/cn/lili/modules/broadcast/entity/dos/Studio.java

@@ -0,0 +1,97 @@
+package cn.lili.modules.broadcast.entity.dos;
+
+import cn.lili.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * 小程序直播间
+ *
+ * @author Bulbasaur
+ * @date: 2021/5/17 9:47 上午
+ */
+@Data
+@Entity
+@ApiModel(value = "直播间")
+@TableName("li_studio")
+@Table(name = "li_studio")
+public class Studio extends BaseEntity {
+
+    /**
+     * 直播间名字，最短3个汉字，最长17个汉字，1个汉字相当于2个字符
+     */
+    @ApiModelProperty(value = "直播间名字")
+    private String name;
+
+    /**
+     * 背景图，填入mediaID（mediaID获取后，三天内有效）；图片mediaID的获取，请参考以下文档： https://developers.weixin.qq.com/doc/offiaccount/Asset_Management/New_temporary_materials.html；直播间背景图，图片规则：建议像素1080*1920，大小不超过2M
+     */
+    @ApiModelProperty(value = "背景图")
+    private String coverImg;
+
+    /**
+     * 直播计划开始时间（开播时间需要在当前时间的10分钟后 并且 开始时间不能在 6 个月后）
+     */
+    @ApiModelProperty(value = "开始时间")
+    private String startTime;
+
+    /**
+     * 直播计划结束时间（开播时间和结束时间间隔不得短于30分钟，不得超过24小时）
+     */
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
+
+    /**
+     * 主播昵称，最短2个汉字，最长15个汉字，1个汉字相当于2个字符
+     */
+    @ApiModelProperty(value = "主播昵称")
+    private String anchorName;
+
+    /**
+     * 主播微信号，如果未实名认证，需要先前往“小程序直播”小程序进行实名验证, 小程序二维码链接：https://res.wx.qq.com/op_res/9rSix1dhHfK4rR049JL0PHJ7TpOvkuZ3mE0z7Ou_Etvjf-w1J_jVX0rZqeStLfwh
+     */
+    @ApiModelProperty(value = "主播微信号")
+    private String anchorWechat;
+
+    /**
+     * 分享图，填入mediaID（mediaID获取后，三天内有效）；图片mediaID的获取，请参考以下文档： https://developers.weixin.qq.com/doc/offiaccount/Asset_Management/New_temporary_materials.html；直播间分享图，图片规则：建议像素800*640，大小不超过1M；
+     */
+    @ApiModelProperty(value = "分享图")
+    private String shareImg;
+
+    /**
+     * 购物直播频道封面图，填入mediaID（mediaID获取后，三天内有效）；图片mediaID的获取，请参考以下文档： https://developers.weixin.qq.com/doc/offiaccount/Asset_Management/New_temporary_materials.html; 购物直播频道封面图，图片规则：建议像素800*800，大小不超过100KB；
+     */
+    @ApiModelProperty(value = "封面图")
+    private String feedsImg;
+
+
+    @ApiModelProperty(value = "回放视频链接")
+    private String mediaUrl;
+
+    @ApiModelProperty(value = "房间ID")
+    private Integer roomId;
+
+    @ApiModelProperty(value = "小程序直播码")
+    private String qrCodeUrl;
+
+    @ApiModelProperty(value = "店铺ID")
+    private String storeId;
+
+    @ApiModelProperty(value = "直播间商品数量")
+    private Integer roomGoodsNum;
+
+    @ApiModelProperty(value = "直播间商品(最多展示两个商品：name/goodsImage)")
+    private String roomGoodsList;
+
+    @ApiModelProperty(value = "推荐直播间")
+    private boolean recommend;
+
+    @ApiModelProperty(value = "直播间状态")
+    private String  status;
+}

framework/src/main/java/cn/lili/modules/broadcast/entity/dos/StudioCommodity.java

@@ -0,0 +1,47 @@
+package cn.lili.modules.broadcast.entity.dos;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 直播商品
+ *
+ * @author Bulbasaur
+ * @date: 2021/5/18 5:42 下午
+ */
+@Data
+@Entity
+@ApiModel(value = "直播商品")
+@TableName("li_studio_commodity")
+@Table(name = "li_studio_commodity")
+@NoArgsConstructor
+public class StudioCommodity {
+
+    @Id
+    @TableId
+    @TableField
+    @Column(columnDefinition = "bigint(20)")
+    @ApiModelProperty(value = "唯一标识", hidden = true)
+    private String id;
+
+    @ApiModelProperty(value = "房间ID")
+    private Integer roomId;
+
+    @ApiModelProperty(value = "商品ID")
+    private Integer goodsId;
+
+    public StudioCommodity(Integer roomId, Integer goodsId) {
+        this.roomId = roomId;
+        this.goodsId = goodsId;
+    }
+}

framework/src/main/java/cn/lili/modules/broadcast/entity/dto/CommodityDTO.java

@@ -0,0 +1,22 @@
+package cn.lili.modules.broadcast.entity.dto;
+
+import lombok.Data;
+
+/**
+ * 直播商品DTO
+ * 用于获取直播商品状态时使用
+ *
+ * @author Bulbasaur
+ * @date: 2021/5/25 12:12 下午
+ */
+@Data
+public class CommodityDTO {
+    //商品ID
+    private Integer goods_id;
+    //商品名称
+    private String name;
+    //地址
+    private String url;
+    //审核状态
+    private Integer audit_status;
+}

framework/src/main/java/cn/lili/modules/broadcast/entity/dto/GoodsInfo.java

@@ -0,0 +1,43 @@
+package cn.lili.modules.broadcast.entity.dto;
+
+import cn.lili.common.utils.BeanUtil;
+import cn.lili.modules.broadcast.entity.dos.Commodity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 微信小程序直播商品DTO
+ * @author Bulbasaur
+ * @date: 2021/5/17 11:03 上午
+ *
+ */
+@Data
+@NoArgsConstructor
+public class GoodsInfo {
+
+    @ApiModelProperty(value = "图片mediaID")
+    private String coverImgUrl;
+
+    @ApiModelProperty(value = "商品名称")
+    private String name;
+
+    //1：一口价（只需要传入price，price2不传）
+    // 2：价格区间（price字段为左边界，price2字段为右边界，price和price2必传）
+    // 3：显示折扣价（price字段为原价，price2字段为现价， price和price2必传
+    @ApiModelProperty(value = "价格类型")
+    private Integer priceType;
+
+    @ApiModelProperty(value = "价格")
+    private Double price;
+
+    @ApiModelProperty(value = "价格2")
+    private Double price2;
+
+    @ApiModelProperty(value = "商品详情页的小程序路径")
+    private String url;
+
+    public GoodsInfo(Commodity commodity){
+        BeanUtil.copyProperties(commodity, this);
+    }
+}

framework/src/main/java/cn/lili/modules/broadcast/entity/dto/SimpleCommodity.java

@@ -0,0 +1,18 @@
+package cn.lili.modules.broadcast.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 用于直播间前台使用的直播间商品DTO
+ *
+ * @author Bulbasaur
+ * @date: 2021/5/20 2:34 下午
+ */
+public class SimpleCommodity {
+
+    @ApiModelProperty(value = "图片")
+    private String goodsImage;
+
+    @ApiModelProperty(value = "商品名称")
+    private String name;
+}

framework/src/main/java/cn/lili/modules/broadcast/entity/enums/StudioStatusEnum.java

@@ -0,0 +1,27 @@
+package cn.lili.modules.broadcast.entity.enums;
+
+
+/**
+ * 直播间状态
+ * @author Bulbasaur
+ * @date: 2021/5/31 10:32 上午
+ *
+ */
+public enum StudioStatusEnum {
+
+    NEW("新建"), START("开始"), END("结束");
+
+    private final String clientName;
+
+    StudioStatusEnum(String des) {
+        this.clientName = des;
+    }
+
+    public String clientName() {
+        return this.clientName;
+    }
+
+    public String value() {
+        return this.name();
+    }
+}

framework/src/main/java/cn/lili/modules/broadcast/entity/vos/CommodityVO.java

@@ -0,0 +1,21 @@
+package cn.lili.modules.broadcast.entity.vos;
+
+import cn.lili.modules.broadcast.entity.dos.Commodity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 直播商品VO
+ *
+ * @author Bulbasaur
+ * @date: 2021/5/26 6:09 下午
+ */
+@Data
+public class CommodityVO extends Commodity {
+
+    @ApiModelProperty(value = "SKU库存")
+    private Integer quantity;
+
+    @ApiModelProperty(value = "店铺名称")
+    private String storeName;
+}

framework/src/main/java/cn/lili/modules/broadcast/entity/vos/StudioVO.java

@@ -0,0 +1,22 @@
+package cn.lili.modules.broadcast.entity.vos;
+
+import cn.lili.modules.broadcast.entity.dos.Commodity;
+import cn.lili.modules.broadcast.entity.dos.Studio;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 直播间VO
+ *
+ * @author Bulbasaur
+ * @date: 2021/5/31 11:58 上午
+ */
+@Data
+public class StudioVO extends Studio {
+
+    @ApiModelProperty(value = "直播间商品列表")
+    private List<Commodity> commodityList;
+
+}

framework/src/main/java/cn/lili/modules/broadcast/mapper/CommodityMapper.java

@@ -0,0 +1,35 @@
+package cn.lili.modules.broadcast.mapper;
+
+import cn.lili.modules.broadcast.entity.dos.Commodity;
+import cn.lili.modules.broadcast.entity.dto.SimpleCommodity;
+import cn.lili.modules.broadcast.entity.vos.CommodityVO;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * 直播商品数据层
+ *
+ * @author Bulbasaur
+ * @date: 2021/5/17 9:56 上午
+ */
+public interface CommodityMapper extends BaseMapper<Commodity> {
+
+    @Select("SELECT live_goods_id FROM li_commodity WHERE audit_status='0' or audit_status='1'")
+    List<String> getAuditCommodity();
+
+    @Select("SELECT * FROM li_commodity c INNER JOIN li_studio_commodity sc ON sc.goods_id = c.live_goods_id WHERE sc.room_id =#{roomId}")
+    List<Commodity> getCommodityByRoomId(Integer roomId);
+
+    @Select("SELECT goods_image FROM li_commodity c INNER JOIN li_studio_commodity sc ON sc.goods_id = c.live_goods_id WHERE sc.room_id =#{roomId}")
+    List<String> getSimpleCommodityByRoomId(Integer roomId);
+
+    @Select("SELECT c.*,gs.quantity,s.store_name FROM li_commodity c INNER JOIN li_goods_sku gs ON c.sku_id = gs.id INNER JOIN li_store s ON s.id=c.store_id ${ew.customSqlSegment}")
+    IPage<CommodityVO> commodityVOList(IPage<CommodityVO> page, @Param(Constants.WRAPPER) Wrapper<CommodityVO> queryWrapper);
+
+}

framework/src/main/java/cn/lili/modules/broadcast/mapper/StudioCommodityMapper.java

@@ -0,0 +1,13 @@
+package cn.lili.modules.broadcast.mapper;
+
+import cn.lili.modules.broadcast.entity.dos.StudioCommodity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 直播间-商品关联持久层
+ * @author Bulbasaur
+ * @date: 2021/5/17 3:14 下午
+ *
+ */
+public interface StudioCommodityMapper extends BaseMapper<StudioCommodity> {
+}

framework/src/main/java/cn/lili/modules/broadcast/mapper/StudioMapper.java

@@ -0,0 +1,14 @@
+package cn.lili.modules.broadcast.mapper;
+
+import cn.lili.modules.broadcast.entity.dos.Studio;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 直播间数据层
+ *
+ * @author Bulbasaur
+ * @date: 2021/5/17 9:56 上午
+ */
+public interface StudioMapper extends BaseMapper<Studio> {
+
+}

framework/src/main/java/cn/lili/modules/broadcast/service/CommodityService.java

@@ -0,0 +1,45 @@
+package cn.lili.modules.broadcast.service;
+
+import cn.lili.common.vo.PageVO;
+import cn.lili.modules.broadcast.entity.dos.Commodity;
+import cn.lili.modules.broadcast.entity.vos.CommodityVO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * 直播商品业务层
+ *
+ * @author Bulbasaur
+ * @date: 2021/5/17 10:39 上午
+ */
+public interface CommodityService extends IService<Commodity> {
+
+    /**
+     * 添加直播商品
+     * @return 添加结果
+     */
+    boolean addCommodity(List<Commodity> commodity);
+
+    /**
+     * 删除直播商品
+     * @param goodsId 直播商品ID
+     * @return 删除结果
+     */
+    boolean deleteCommodity(String goodsId);
+
+    /**
+     * 查询微信小程序直播商品审核状态
+     */
+    void getGoodsWareHouse();
+
+    /**
+     * 查看直播商品分页
+     * @param pageVO 分页
+     * @param name 商品名称
+     * @param auditStatus 审核状态
+     * @return 直播商品分页
+     */
+    IPage<CommodityVO> commodityList(PageVO pageVO, String name, String auditStatus);
+}

framework/src/main/java/cn/lili/modules/broadcast/service/StudioCommodityService.java

@@ -0,0 +1,13 @@
+package cn.lili.modules.broadcast.service;
+
+import cn.lili.modules.broadcast.entity.dos.StudioCommodity;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 直播间-商品关联业务层
+ *
+ * @author Bulbasaur
+ * @date: 2021/5/17 3:19 下午
+ */
+public interface StudioCommodityService extends IService<StudioCommodity> {
+}

framework/src/main/java/cn/lili/modules/broadcast/service/StudioService.java

@@ -0,0 +1,79 @@
+package cn.lili.modules.broadcast.service;
+
+import cn.lili.common.delayqueue.BroadcastMessage;
+import cn.lili.common.vo.PageVO;
+import cn.lili.modules.broadcast.entity.dos.Studio;
+import cn.lili.modules.broadcast.entity.vos.StudioVO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 直播间业务层
+ *
+ * @author Bulbasaur
+ * @date: 2021/5/17 10:02 上午
+ */
+public interface StudioService extends IService<Studio> {
+
+    /**
+     * 创建直播间
+     * 直播间默认手机直播
+     * 默认开启：点赞、商品货架、评论、回放
+     * @param studio 直播间
+     * @return 开启状态
+     */
+    Boolean create(Studio studio);
+
+    /**
+     * 修改直播间
+     * 直播间默认手机直播
+     * @param studio 直播间
+     * @return 修改状态
+     */
+    Boolean edit(Studio studio);
+
+    /**
+     * 获取直播间信息
+     * @param id 直播间ID
+     * @return 直播间VO
+     */
+    StudioVO getStudioVO(String id);
+
+    /**
+     * 获取直播间回放
+     * @param roomId 房间ID
+     * @return 直播间回放地址
+     */
+    String getLiveInfo(Integer roomId);
+
+    /**
+     * 推送商品
+     * @param roomId 店铺ID
+     * @param goodsId 商品ID
+     * @return 操作结果
+     */
+    Boolean push(Integer roomId,Integer goodsId);
+
+    /**
+     * 删除商品
+     * @param roomId 店铺ID
+     * @param goodsId 商品ID
+     * @return 操作结果
+     */
+    Boolean goodsDeleteInRoom(Integer roomId,Integer goodsId);
+
+    /**
+     * 获取直播间列表
+     * @param pageVO 分页
+     * @param recommend 是否推荐
+     * @param status 直播间状态
+     * @return 直播间分页
+     */
+    IPage<Studio> studioList(PageVO pageVO, Integer recommend, String status);
+
+    /**
+     * 修改直播间状态
+     * @param broadcastMessage 直播间消息
+     */
+    void updateStudioStatus(BroadcastMessage broadcastMessage);
+}

framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/CommodityServiceImpl.java

@@ -0,0 +1,112 @@
+package cn.lili.modules.broadcast.serviceimpl;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import cn.lili.common.exception.ServiceException;
+import cn.lili.common.security.context.UserContext;
+import cn.lili.common.security.enums.UserEnums;
+import cn.lili.common.utils.PageUtil;
+import cn.lili.common.vo.PageVO;
+import cn.lili.modules.broadcast.entity.dos.Commodity;
+import cn.lili.modules.broadcast.entity.dto.CommodityDTO;
+import cn.lili.modules.broadcast.entity.vos.CommodityVO;
+import cn.lili.modules.broadcast.mapper.CommodityMapper;
+import cn.lili.modules.broadcast.service.CommodityService;
+import cn.lili.modules.broadcast.util.WechatLivePlayerUtil;
+import cn.lili.modules.goods.entity.dos.GoodsSku;
+import cn.lili.modules.goods.entity.enums.GoodsAuthEnum;
+import cn.lili.modules.goods.service.GoodsSkuService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 直播商品业务层实现
+ *
+ * @author Bulbasaur
+ * @date: 2021/5/17 11:16 上午
+ */
+@Service
+public class CommodityServiceImpl extends ServiceImpl<CommodityMapper, Commodity> implements CommodityService {
+
+    @Autowired
+    private WechatLivePlayerUtil wechatLivePlayerUtil;
+    @Autowired
+    private GoodsSkuService goodsSkuService;
+
+    @Override
+    public boolean addCommodity(List<Commodity> commodityList) {
+        for (Commodity commodity : commodityList) {
+            //检测直播商品
+            checkCommodity(commodity);
+            //添加直播商品
+            JSONObject json = wechatLivePlayerUtil.addGoods(commodity);
+            if(!json.getStr("errcode").equals("0")){
+                throw new ServiceException(json.getStr("errmsg"));
+            }
+            commodity.setLiveGoodsId(Convert.toInt(json.getStr("goodsId")));
+            commodity.setAuditId(json.getStr("auditId"));
+            commodity.setStoreId(UserContext.getCurrentUser().getStoreId());
+            //默认为待审核状态
+            commodity.setAuditStatus("0");
+            this.save(commodity);
+        }
+        return true;
+    }
+
+    private void checkCommodity(Commodity commodity) {
+        //商品是否审核通过
+        GoodsSku goodsSku = goodsSkuService.getById(commodity.getSkuId());
+        if (!goodsSku.getIsAuth().equals(GoodsAuthEnum.PASS.name())) {
+            throw new ServiceException(goodsSku.getGoodsName() + " 未审核通过，不能添加直播商品");
+        }
+        //是否已添加规格商品
+        if (this.count(new LambdaQueryWrapper<Commodity>().eq(Commodity::getSkuId, commodity.getSkuId())) > 0) {
+            throw new ServiceException(goodsSku.getGoodsName() + " 已添加规格商品，无法重复增加");
+        }
+    }
+
+    @Override
+    public boolean deleteCommodity(String goodsId) {
+        JSONObject json = wechatLivePlayerUtil.deleteGoods(goodsId);
+        if (json.getStr("errcode").equals("0")) {
+            return this.remove(new LambdaQueryWrapper<Commodity>().eq(Commodity::getLiveGoodsId, goodsId));
+        }
+        return false;
+    }
+
+    @Override
+    public void getGoodsWareHouse() {
+        //查询审核中的商品
+        List<String> goodsIdList = this.baseMapper.getAuditCommodity();
+        if (goodsIdList.size() > 0) {
+            //同步状态
+            JSONObject json = wechatLivePlayerUtil.getGoodsWareHouse(goodsIdList);
+            //修改状态
+            List<CommodityDTO> commodityDTOList = JSONUtil.toList((JSONArray) json.get("goods"), CommodityDTO.class);
+            for (CommodityDTO commodityDTO : commodityDTOList) {
+                //修改审核状态
+                this.update(new LambdaUpdateWrapper<Commodity>()
+                        .eq(Commodity::getLiveGoodsId, commodityDTO.getGoods_id())
+                        .set(Commodity::getAuditStatus, commodityDTO.getAudit_status()));
+            }
+        }
+    }
+
+    @Override
+    public IPage<CommodityVO> commodityList(PageVO pageVO, String name, String auditStatus) {
+        return this.baseMapper.commodityVOList(PageUtil.initPage(pageVO),
+                new QueryWrapper<CommodityVO>().like(name != null, "c.name", name)
+                        .eq(auditStatus != null, "c.audit_status", auditStatus)
+                        .eq(UserContext.getCurrentUser().getRole().equals(UserEnums.STORE), "c.store_id", UserContext.getCurrentUser().getStoreId())
+                        .orderByDesc("create_time"));
+    }
+}

framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/StudioCommodityServiceImpl.java

@@ -0,0 +1,17 @@
+package cn.lili.modules.broadcast.serviceimpl;
+
+import cn.lili.modules.broadcast.entity.dos.StudioCommodity;
+import cn.lili.modules.broadcast.mapper.StudioCommodityMapper;
+import cn.lili.modules.broadcast.service.StudioCommodityService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 直播间-商品关联业务层实现
+ *
+ * @author Bulbasaur
+ * @date: 2021/5/17 3:20 下午
+ */
+@Service
+public class StudioCommodityServiceImpl extends ServiceImpl<StudioCommodityMapper, StudioCommodity> implements StudioCommodityService {
+}

framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/StudioServiceImpl.java

@@ -0,0 +1,212 @@
+package cn.lili.modules.broadcast.serviceimpl;
+
+import cn.hutool.json.JSONUtil;
+import cn.lili.common.delayqueue.BroadcastMessage;
+import cn.lili.common.enums.ResultCode;
+import cn.lili.common.exception.ServiceException;
+import cn.lili.common.security.context.UserContext;
+import cn.lili.common.trigger.enums.DelayTypeEnums;
+import cn.lili.common.trigger.interfaces.TimeTrigger;
+import cn.lili.common.trigger.model.TimeExecuteConstant;
+import cn.lili.common.trigger.model.TimeTriggerMsg;
+import cn.lili.common.trigger.util.DelayQueueTools;
+import cn.lili.common.utils.BeanUtil;
+import cn.lili.common.utils.DateUtil;
+import cn.lili.common.utils.PageUtil;
+import cn.lili.common.vo.PageVO;
+import cn.lili.config.rocketmq.RocketmqCustomProperties;
+import cn.lili.modules.broadcast.entity.dos.Studio;
+import cn.lili.modules.broadcast.entity.dos.StudioCommodity;
+import cn.lili.modules.broadcast.entity.enums.StudioStatusEnum;
+import cn.lili.modules.broadcast.entity.vos.StudioVO;
+import cn.lili.modules.broadcast.mapper.CommodityMapper;
+import cn.lili.modules.broadcast.mapper.StudioMapper;
+import cn.lili.modules.broadcast.service.StudioCommodityService;
+import cn.lili.modules.broadcast.service.StudioService;
+import cn.lili.modules.broadcast.util.WechatLivePlayerUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * 小程序直播间业务层实现
+ *
+ * @author Bulbasaur
+ * @date: 2021/5/17 10:04 上午
+ */
+@Service
+public class StudioServiceImpl extends ServiceImpl<StudioMapper, Studio> implements StudioService {
+
+    @Autowired
+    private WechatLivePlayerUtil wechatLivePlayerUtil;
+    @Autowired
+    private StudioCommodityService studioCommodityService;
+    @Resource
+    private CommodityMapper commodityMapper;
+    //延时任务
+    @Autowired
+    private TimeTrigger timeTrigger;
+    //Rocketmq
+    @Autowired
+    private RocketmqCustomProperties rocketmqCustomProperties;
+
+    @Override
+    public Boolean create(Studio studio) {
+        try {
+            //创建小程序直播
+            Map<String, String> roomMap = wechatLivePlayerUtil.create(studio);
+            studio.setRoomId(Integer.parseInt(roomMap.get("roomId")));
+            studio.setQrCodeUrl(roomMap.get("qrcodeUrl"));
+            studio.setStoreId(UserContext.getCurrentUser().getStoreId());
+            studio.setStatus(StudioStatusEnum.NEW.name());
+            //直播间添加成功发送直播间开启、关闭延时任务
+            if (this.save(studio)) {
+                //直播开启延时任务
+                BroadcastMessage broadcastMessage = new BroadcastMessage(studio.getId(), StudioStatusEnum.START.name());
+                TimeTriggerMsg timeTriggerMsg = new TimeTriggerMsg(TimeExecuteConstant.BROADCAST_EXECUTOR,
+                        Long.parseLong(studio.getStartTime()) * 1000L, broadcastMessage,
+                        DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.BROADCAST, studio.getId()),
+                        rocketmqCustomProperties.getPromotionTopic());
+
+                // 发送促销活动开始的延时任务
+                this.timeTrigger.addDelay(timeTriggerMsg);
+
+                //直播结束延时任务
+                broadcastMessage = new BroadcastMessage(studio.getId(), StudioStatusEnum.END.name());
+                timeTriggerMsg = new TimeTriggerMsg(TimeExecuteConstant.BROADCAST_EXECUTOR,
+                        Long.parseLong(studio.getEndTime()) * 1000L, broadcastMessage,
+                        DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.BROADCAST, studio.getId()),
+                        rocketmqCustomProperties.getPromotionTopic());
+                // 发送促销活动开始的延时任务
+                this.timeTrigger.addDelay(timeTriggerMsg);
+            }
+            return true;
+
+        } catch (Exception e) {
+            throw new ServiceException(ResultCode.ERROR);
+        }
+
+    }
+
+    @Override
+    public Boolean edit(Studio studio) {
+        Studio oldStudio = this.getById(studio.getId());
+        wechatLivePlayerUtil.editRoom(studio);
+        if (this.updateById(studio)) {
+            // 发送更新延时任务
+            //直播间开始
+            BroadcastMessage broadcastMessage = new BroadcastMessage(studio.getId(), StudioStatusEnum.START.name());
+            this.timeTrigger.edit(
+                    TimeExecuteConstant.BROADCAST_EXECUTOR,
+                    broadcastMessage,
+                    Long.parseLong(oldStudio.getStartTime()),
+                    Long.parseLong(studio.getStartTime()),
+                    DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.BROADCAST, studio.getId()),
+                    DateUtil.getDelayTime(Long.parseLong(studio.getStartTime())),
+                    rocketmqCustomProperties.getPromotionTopic());
+
+            //直播间结束
+            broadcastMessage = new BroadcastMessage(studio.getId(), StudioStatusEnum.START.name());
+            this.timeTrigger.edit(
+                    TimeExecuteConstant.BROADCAST_EXECUTOR,
+                    broadcastMessage,
+                    Long.parseLong(oldStudio.getEndTime()),
+                    Long.parseLong(studio.getEndTime()),
+                    DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.BROADCAST, studio.getId()),
+                    DateUtil.getDelayTime(Long.parseLong(studio.getEndTime())),
+                    rocketmqCustomProperties.getPromotionTopic());
+        }
+        return true;
+    }
+
+    @Override
+    public StudioVO getStudioVO(String id) {
+        StudioVO studioVO = new StudioVO();
+        //获取直播间信息
+        BeanUtil.copyProperties(this.getById(id), studioVO);
+        //获取直播间商品信息
+        studioVO.setCommodityList(commodityMapper.getCommodityByRoomId(studioVO.getRoomId()));
+        return studioVO;
+    }
+
+    @Override
+    public String getLiveInfo(Integer roomId) {
+        Studio studio = this.getByRoomId(roomId);
+        //获取直播间并判断回放内容是否为空，如果为空则获取直播间回放并保存
+        if (studio.getMediaUrl() != null) {
+            return studio.getMediaUrl();
+        } else {
+            String mediaUrl = wechatLivePlayerUtil.getLiveInfo(roomId);
+            studio.setMediaUrl(mediaUrl);
+            this.save(studio);
+            return mediaUrl;
+        }
+    }
+
+    @Override
+    public Boolean push(Integer roomId, Integer goodsId) {
+        //调用微信接口添加直播间商品并进行记录
+        if (wechatLivePlayerUtil.pushGoods(roomId, goodsId)) {
+            studioCommodityService.save(new StudioCommodity(roomId, goodsId));
+            //添加直播间商品数量
+            Studio studio = this.getByRoomId(roomId);
+            studio.setRoomGoodsNum(studio.getRoomGoodsNum() != null ? studio.getRoomGoodsNum() + 1 : 1);
+            //设置直播间默认的商品（前台展示）只展示两个
+            if (studio.getRoomGoodsNum() < 3) {
+                studio.setRoomGoodsList(JSONUtil.toJsonStr(commodityMapper.getSimpleCommodityByRoomId(roomId)));
+            }
+            return this.updateById(studio);
+        }
+        return false;
+    }
+
+    @Override
+    public Boolean goodsDeleteInRoom(Integer roomId, Integer goodsId) {
+        //调用微信接口删除直播间商品并进行记录
+        if (wechatLivePlayerUtil.goodsDeleteInRoom(roomId, goodsId)) {
+            studioCommodityService.remove(new QueryWrapper<StudioCommodity>().eq("room_id", roomId).eq("goods_id", goodsId));
+            //减少直播间商品数量
+            Studio studio = this.getByRoomId(roomId);
+            studio.setRoomGoodsNum(studio.getRoomGoodsNum() - 1);
+            //设置直播间默认的商品（前台展示）只展示两个
+            if (studio.getRoomGoodsNum() < 3) {
+                studio.setRoomGoodsList(JSONUtil.toJsonStr(commodityMapper.getSimpleCommodityByRoomId(roomId)));
+            }
+            return this.updateById(studio);
+        }
+        return false;
+    }
+
+    @Override
+    public IPage<Studio> studioList(PageVO pageVO, Integer recommend, String status) {
+        return this.page(PageUtil.initPage(pageVO), new QueryWrapper<Studio>()
+                .eq(recommend != null, "recommend", true)
+                .eq(status != null, "status", status)
+                .orderByDesc("create_time"));
+
+    }
+
+    @Override
+    public void updateStudioStatus(BroadcastMessage broadcastMessage) {
+        this.update(new LambdaUpdateWrapper<Studio>()
+                .eq(Studio::getId, broadcastMessage.getStudioId())
+                .set(Studio::getStatus, broadcastMessage.getStatus()));
+    }
+
+    /**
+     * 根据直播间ID获取直播间
+     *
+     * @param roomId 直播间ID
+     * @return 直播间
+     */
+    private Studio getByRoomId(Integer roomId) {
+        return this.getOne(new LambdaQueryWrapper<Studio>().eq(Studio::getRoomId, roomId));
+    }
+}

framework/src/main/java/cn/lili/modules/broadcast/util/WechatLivePlayerUtil.java

@@ -0,0 +1,261 @@
+package cn.lili.modules.broadcast.util;
+
+import cn.hutool.json.JSONObject;
+import cn.lili.common.exception.ServiceException;
+import cn.lili.modules.base.entity.enums.ClientTypeEnum;
+import cn.lili.modules.broadcast.entity.dos.Commodity;
+import cn.lili.modules.broadcast.entity.dos.Studio;
+import cn.lili.modules.broadcast.entity.dto.GoodsInfo;
+import cn.lili.modules.message.util.WechatAccessTokenUtil;
+import cn.lili.modules.system.utils.HttpUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 微信小程序直播工具类
+ *
+ * @author Bulbasaur
+ * @date: 2021/5/17 10:16 上午
+ */
+@Slf4j
+@Component
+public class WechatLivePlayerUtil {
+
+    @Autowired
+    private WechatAccessTokenUtil wechatAccessTokenUtil;
+    @Autowired
+    private WechatMediaUtil wechatMediaUtil;
+
+    /**
+     * 创建小程序直播间
+     *
+     * @param studio 小程序直播
+     * @return 房间ID
+     */
+    public Map<String, String> create(Studio studio) throws Exception {
+        //获取token
+        String token = wechatAccessTokenUtil.cgiAccessToken(ClientTypeEnum.WECHAT_MP);
+        //发送url
+        String url = "https://api.weixin.qq.com/wxaapi/broadcast/room/create?access_token=" + token;
+        //添加直播间
+        Map<String, String> map = this.mockRoom(token, studio);
+        String content = HttpUtils.doPostWithJson(url, map);
+        JSONObject json = new JSONObject(content);
+        log.info("微信小程序直播间创建结果：" + content);
+        if (!json.getStr("errcode").equals("0")) {
+            throw new ServiceException(json.getStr("errmsg"));
+        }
+        Map<String, String> roomMap = new HashMap<>();
+        roomMap.put("roomId", json.getStr("roomId"));
+        roomMap.put("qrcodeUrl", json.getStr("qrcode_url"));
+        return roomMap;
+    }
+
+    /**
+     * 创建小程序直播间
+     *
+     * @param studio 小程序直播
+     * @return 房间ID
+     */
+    public boolean editRoom(Studio studio) {
+        //获取token
+        String token = wechatAccessTokenUtil.cgiAccessToken(ClientTypeEnum.WECHAT_MP);
+        //发送url
+        String url = "https://api.weixin.qq.com/wxaapi/broadcast/room/editroom?access_token=" + token;
+
+        //修改直播间
+        Map<String, String> map = this.mockRoom(token, studio);
+        map.put("id", studio.getRoomId().toString());
+        String content = HttpUtils.doPostWithJson(url, map);
+        JSONObject json = new JSONObject(content);
+        log.info("微信小程序直播间修改结果：" + content);
+        if (!json.getStr("errcode").equals("0")) {
+            throw new ServiceException(json.getStr("errmsg"));
+        }
+        return true;
+    }
+
+
+    /**
+     * 获取直播间回放
+     *
+     * @param roomId 房间ID
+     * @return 回放地址
+     */
+    public String getLiveInfo(Integer roomId) {
+        //获取token
+        String token = wechatAccessTokenUtil.cgiAccessToken(ClientTypeEnum.WECHAT_MP);
+        //发送url
+        String url = "https://api.weixin.qq.com/wxa/business/getliveinfo?access_token=" + token;
+        Map<String, Object> map = new HashMap<>();
+        // 获取回放
+        map.put("action", "get_replay");
+        // 直播间ID
+        map.put("room_id", roomId);
+        // 起始拉取视频，0表示从第一个视频片段开始拉取
+        map.put("start", "0");
+        // 每次拉取的数量，建议100以内
+        map.put("limit", "1");
+
+        String content = HttpUtils.doPostWithJson(url, map);
+        JSONObject json = new JSONObject(content);
+        log.info("微信小程序获取信息：" + content);
+        //TODO get media_url
+        return json.getStr("live_replay");
+    }
+
+    /**
+     * 推送直播间商品
+     *
+     * @param roomId  房间ID
+     * @param goodsId 商品ID
+     * @return 操作结果
+     */
+    public Boolean pushGoods(Integer roomId, Integer goodsId) {
+        //获取token
+        String token = wechatAccessTokenUtil.cgiAccessToken(ClientTypeEnum.WECHAT_MP);
+        //发送url
+        String url = "https://api.weixin.qq.com/wxaapi/broadcast/room/addgoods?access_token=" + token;
+        Map<String, Object> map = new HashMap<>();
+        // 直播间回放
+        Integer[] ids = {goodsId};
+        map.put("ids", ids);
+        // 商品ID
+        map.put("roomId", roomId);
+        String content = HttpUtils.doPostWithJson(url, map);
+        JSONObject json = new JSONObject(content);
+        log.info("直播间导入商品：" + content);
+        if (!json.getStr("errcode").equals("0")) {
+            throw new ServiceException(json.getStr("errmsg"));
+        }
+        return true;
+    }
+
+    /**
+     * 删除直播间商品
+     *
+     * @param roomId  房间ID
+     * @param goodsId 商品ID
+     * @return 操作结果
+     */
+    public Boolean goodsDeleteInRoom(Integer roomId, Integer goodsId) {
+        //获取token
+        String token = wechatAccessTokenUtil.cgiAccessToken(ClientTypeEnum.WECHAT_MP);
+        //发送url
+        String url = "https://api.weixin.qq.com/wxaapi/broadcast/goods/deleteInRoom?access_token=" + token;
+        Map<String, Integer> map = new HashMap<>();
+        // 直播间回放
+        map.put("goodsId", goodsId);
+        // 商品ID
+        map.put("roomId", roomId);
+        String content = HttpUtils.doPostWithJson(url, map);
+        JSONObject json = new JSONObject(content);
+        log.info("微信小程序直播间删除商品：" + content);
+        return json.getStr("errcode").equals("0");
+    }
+
+    /**
+     * 添加直播商品
+     *
+     * @param commodity 直播商品
+     * @return 添加结果
+     */
+    public JSONObject addGoods(Commodity commodity) {
+        //获取token
+        String token = wechatAccessTokenUtil.cgiAccessToken(ClientTypeEnum.WECHAT_MP);
+        //发送url
+        String url = "https://api.weixin.qq.com/wxaapi/broadcast/goods/add?access_token=" + token;
+
+        //商品名称，最长14个汉字
+        if (commodity.getName().length() > 14) {
+            commodity.setName(commodity.getName().substring(0, 13));
+        }
+
+        //新建微信商品DTO
+        GoodsInfo goodsInfo = new GoodsInfo(commodity);
+        //上传微信临时图片
+        goodsInfo.setCoverImgUrl(wechatMediaUtil.uploadMedia(token, "image", commodity.getGoodsImage()));
+        Map<String, GoodsInfo> map = new HashMap<>();
+        //调用新增直播商品接口
+        map.put("goodsInfo", goodsInfo);
+        String content = HttpUtils.doPostWithJson(url, map);
+        JSONObject json = new JSONObject(content);
+        log.info("微信小程序添加直播商品结果：" + content);
+        return json;
+    }
+
+    /**
+     * 删除直播商品
+     *
+     * @param goodsId 商品ID
+     * @return 删除结果
+     */
+    public JSONObject deleteGoods(String goodsId) {
+        //获取token
+        String token = wechatAccessTokenUtil.cgiAccessToken(ClientTypeEnum.WECHAT_MP);
+        //发送url
+        String url = "https://api.weixin.qq.com/wxaapi/broadcast/goods/delete?access_token=" + token;
+        Map<String, Object> map = new HashMap<>();
+        map.put("goodsId", goodsId);
+        String content = HttpUtils.doPostWithJson(url, map);
+        JSONObject json = new JSONObject(content);
+        log.info("微信小程序删除直播商品结果：" + content);
+        return json;
+    }
+
+    /**
+     * 查询直播商品状态
+     *
+     * @param goodsIdList 商品ID列表
+     * @return 删除结果
+     */
+    public JSONObject getGoodsWareHouse(List<String> goodsIdList) {
+        //获取token
+        String token = wechatAccessTokenUtil.cgiAccessToken(ClientTypeEnum.WECHAT_MP);
+        //发送url
+        String url = "https://api.weixin.qq.com/wxa/business/getgoodswarehouse?access_token=" + token;
+        Map<String, Object> map = new HashMap<>();
+        map.put("goods_ids", goodsIdList);
+        String content = HttpUtils.doPostWithJson(url, map);
+        JSONObject json = new JSONObject(content);
+        log.info("微信小程序查询直播商品结果：" + content);
+        return json;
+    }
+
+    private Map<String, String> mockRoom(String token, Studio studio) {
+        Map<String, String> map = new HashMap<>();
+        // 背景图
+        map.put("coverImg", wechatMediaUtil.uploadMedia(token, "image", studio.getCoverImg()));
+        // 分享图
+        map.put("shareImg", wechatMediaUtil.uploadMedia(token, "image", studio.getShareImg()));
+        // 购物直播频道封面图
+        map.put("feedsImg", wechatMediaUtil.uploadMedia(token, "image", studio.getFeedsImg()));
+        // 直播间名字
+        map.put("name", studio.getName());
+        // 直播计划开始时间
+        map.put("startTime", studio.getStartTime());
+        // 直播计划结束时间
+        map.put("endTime", studio.getEndTime());
+        // 主播昵称
+        map.put("anchorName", studio.getAnchorName());
+        // 主播微信号
+        map.put("anchorWechat", studio.getAnchorWechat());
+        // 直播间类型
+        map.put("type", "0");
+        // 是否关闭点赞
+        map.put("closeLike", "0");
+        // 是否关闭货架
+        map.put("closeGoods", "0");
+        // 是否关闭评论
+        map.put("closeComment", "0");
+        // 直播间名字
+        map.put("closeReplay", "0");
+
+        return map;
+    }
+}

framework/src/main/java/cn/lili/modules/broadcast/util/WechatMediaUtil.java

@@ -0,0 +1,123 @@
+package cn.lili.modules.broadcast.util;
+
+import cn.hutool.json.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.Date;
+
+/**
+ * 微信媒体工具
+ *
+ * @author Bulbasaur
+ * @date: 2021/5/19 8:02 下午
+ */
+@Slf4j
+@Component
+public class WechatMediaUtil {
+
+    /**
+     * 上传多媒体数据到微信服务器
+     * @param accessToken 从微信获取到的access_token
+     * @param mediaFileUrl 来自网络上面的媒体文件地址
+     * @return
+     */
+    public String uploadMedia(String accessToken, String type, String mediaFileUrl) {
+        /*
+         * 上传媒体文件到微信服务器需要请求的地址
+         */
+        String MEDIA_URL = "https://api.weixin.qq.com/cgi-bin/media/upload?access_token=ACCESS_TOKEN&type=TYPE";
+
+        StringBuffer resultStr = null;
+        //拼装url地址
+        String mediaStr = MEDIA_URL.replace("ACCESS_TOKEN", accessToken).replace("TYPE", type);
+        URL mediaUrl;
+        try {
+            String boundary = "----WebKitFormBoundaryOYXo8heIv9pgpGjT";
+            URL url = new URL(mediaStr);
+            HttpURLConnection urlConn = (HttpURLConnection)url.openConnection();
+            //让输入输出流开启
+            urlConn.setDoInput(true);
+            urlConn.setDoOutput(true);
+            //使用post方式请求的时候必须关闭缓存
+            urlConn.setUseCaches(false);
+            //设置请求头的Content-Type属性
+            urlConn.setRequestProperty("Content-Type", "multipart/form-data; boundary="+boundary);
+            urlConn.setRequestMethod("POST");
+            //获取输出流，使用输出流拼接请求体
+            OutputStream out = urlConn.getOutputStream();
+
+            //读取文件的数据,构建一个GET请求，然后读取指定地址中的数据
+            mediaUrl = new URL(mediaFileUrl);
+            HttpURLConnection mediaConn = (HttpURLConnection)mediaUrl.openConnection();
+            //设置请求方式
+            mediaConn.setRequestMethod("GET");
+            //设置可以打开输入流
+            mediaConn.setDoInput(true);
+            //获取传输的数据类型
+            String contentType = mediaConn.getHeaderField("Content-Type");
+            //将获取大到的类型转换成扩展名
+            String fileExt = judgeType(contentType);
+            //获取输入流，从mediaURL里面读取数据
+            InputStream in = mediaConn.getInputStream();
+            BufferedInputStream bufferedIn = new BufferedInputStream(in);
+            //数据读取到这个数组里面
+            byte[] bytes = new byte[1024];
+            int size = 0;
+            //使用outputStream流输出信息到请求体当中去
+            out.write(("--"+boundary+"\r\n").getBytes());
+            out.write(("Content-Disposition: form-data; name=\"media\";\r\n"
+                    + "filename=\""+(new Date().getTime())+fileExt+"\"\r\n"
+                    + "Content-Type: "+contentType+"\r\n\r\n").getBytes());
+            while( (size = bufferedIn.read(bytes)) != -1) {
+                out.write(bytes, 0, size);
+            }
+            //切记，这里的换行符不能少，否则将会报41005错误
+            out.write(("\r\n--"+boundary+"--\r\n").getBytes());
+
+            bufferedIn.close();
+            in.close();
+            mediaConn.disconnect();
+
+            InputStream resultIn = urlConn.getInputStream();
+            InputStreamReader reader = new InputStreamReader(resultIn);
+            BufferedReader bufferedReader = new BufferedReader(reader);
+            String tempStr = null;
+            resultStr = new StringBuffer();
+            while((tempStr = bufferedReader.readLine()) != null) {
+                resultStr.append(tempStr);
+            }
+            bufferedReader.close();
+            reader.close();
+            resultIn.close();
+            urlConn.disconnect();
+        }  catch (Exception e) {
+            log.error("微信媒体上传失败",e);
+        }
+        JSONObject jsonObject=new JSONObject(resultStr.toString());
+        return jsonObject.get("media_id").toString();
+    }
+    /**
+     * 通过传过来的contentType判断是哪一种类型
+     * @param contentType 获取来自连接的contentType
+     * @return
+     */
+    public String judgeType(String contentType) {
+        String fileExt = "";
+        switch (contentType){
+            case "image/png":
+                fileExt = ".png";
+                break;
+            case "image/jpeg":
+                fileExt = ".jpeg";
+                break;
+            case "image/jpg":
+                fileExt = ".jpg";
+                break;
+        }
+        return fileExt;
+    }
+}

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

@@ -7,8 +7,6 @@ import cn.lili.modules.connect.mapper.ConnectConfigMapper;
 import cn.lili.modules.connect.service.ConnectConfigService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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;
 
@@ -23,8 +21,6 @@ import java.util.List;
 @Service
 @Transactional(rollbackFor = Exception.class)
 public class ConnectConfigServiceImpl extends ServiceImpl<ConnectConfigMapper, ConnectConfig> implements ConnectConfigService {
-    @Autowired
-    private ConnectConfigMapper connectConfigMapper;
 
     @Override
     public List<ConnectConfigForm> listForms() {

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

@@ -339,7 +339,7 @@ public class ConnectServiceImpl extends ServiceImpl<ConnectMapper, Connect> impl
                 return JSONUtil.parseObj(result);
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("解密，获取微信信息错误",e);
         }
         throw new ServiceException(ResultCode.USER_CONNECT_ERROR);
     }

framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java

@@ -29,6 +29,7 @@ import cn.lili.modules.system.entity.dto.connect.dto.QQConnectSettingItem;
 import cn.lili.modules.system.entity.dto.connect.dto.WechatConnectSettingItem;
 import cn.lili.modules.system.entity.enums.SettingEnum;
 import cn.lili.modules.system.service.SettingService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -45,6 +46,7 @@ import java.util.regex.Pattern;
  * @version v1.0
  * 2020-11-25 21:16
  */
+@Slf4j
 @Component
 public class ConnectUtil {
 
@@ -106,7 +108,7 @@ public class ConnectUtil {
         try {
             httpServletResponse.sendRedirect(url);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("登录回调错误",e);
         }
     }
 

framework/src/main/java/cn/lili/modules/connect/util/IpUtils.java

@@ -1,5 +1,7 @@
 package cn.lili.modules.connect.util;
 
+import lombok.extern.slf4j.Slf4j;
+
 import javax.servlet.http.HttpServletRequest;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -11,6 +13,7 @@ import java.net.UnknownHostException;
  * @version v1.0
  * 2020-12-08 15:32
  */
+@Slf4j
 public class IpUtils {
 
     /**
@@ -22,7 +25,7 @@ public class IpUtils {
         try {
             return InetAddress.getLocalHost().getHostAddress();
         } catch (UnknownHostException e) {
-            e.printStackTrace();
+            log.error("获取本机IP错误",e);
             return null;
         }
     }

framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionOrderMapper.java

@@ -3,7 +3,7 @@ package cn.lili.modules.distribution.mapper;
 import cn.hutool.core.date.DateTime;
 import cn.lili.modules.distribution.entity.dos.DistributionOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 /**
  * 分销订单数据处理层
@@ -16,9 +16,8 @@ public interface DistributionOrderMapper extends BaseMapper<DistributionOrder> {
     /**
      * 分销提佣
      */
-    @Select("UPDATE li_distribution AS d " +
-            "SET d.can_rebate =(d.can_rebate +(SELECT SUM( dorder.rebate ) FROM li_distribution_order AS dorder WHERE dorder.distribution_id = d.id AND " +
-            "dorder.distribution_order_status=#{distributionOrderStatus} AND dorder.settle_cycle< #{settleCycle} ))")
+    @Update("UPDATE li_distribution AS d " +
+            "SET d.can_rebate =(d.can_rebate +(SELECT SUM( dorder.rebate ) FROM li_distribution_order AS dorder WHERE dorder.distribution_id = d.id AND dorder.distribution_order_status=#{distributionOrderStatus} AND dorder.settle_cycle< #{settleCycle} ))")
     void rebate(String distributionOrderStatus, DateTime settleCycle);
 
 }

framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionGoodsServiceImpl.java

@@ -34,9 +34,6 @@ import org.springframework.transaction.annotation.Transactional;
 @Transactional
 public class DistributionGoodsServiceImpl extends ServiceImpl<DistributionGoodsMapper, DistributionGoods> implements DistributionGoodsService {
 
-    //分销商品
-    @Autowired
-    private DistributionGoodsMapper distributionGoodsMapper;
     //分销员
     @Autowired
     private DistributionService distributionService;
@@ -48,22 +45,22 @@ public class DistributionGoodsServiceImpl extends ServiceImpl<DistributionGoodsM
     public IPage<DistributionGoodsVO> goodsPage(DistributionGoodsSearchParams searchParams) {
         //获取商家的分销商品列表
         if (UserContext.getCurrentUser().getRole().equals(UserEnums.STORE)) {
-            return distributionGoodsMapper.getDistributionGoodsVO(PageUtil.initPage(searchParams), searchParams.storeQueryWrapper());
+            return this.baseMapper.getDistributionGoodsVO(PageUtil.initPage(searchParams), searchParams.storeQueryWrapper());
         } else if (UserContext.getCurrentUser().getRole().equals(UserEnums.MEMBER)) {
             //判断当前登录用户是否为分销员
             Distribution distribution = distributionService.getDistribution();
             if (distribution != null) {
                 //判断查看已选择的分销商品列表
                 if (searchParams.isChecked()) {
-                    return distributionGoodsMapper.selectGoods(PageUtil.initPage(searchParams), searchParams.distributionQueryWrapper(), distribution.getId());
+                    return this.baseMapper.selectGoods(PageUtil.initPage(searchParams), searchParams.distributionQueryWrapper(), distribution.getId());
                 } else {
-                    return distributionGoodsMapper.notSelectGoods(PageUtil.initPage(searchParams), searchParams.distributionQueryWrapper(), distribution.getId());
+                    return this.baseMapper.notSelectGoods(PageUtil.initPage(searchParams), searchParams.distributionQueryWrapper(), distribution.getId());
                 }
             }
             throw new ServiceException(ResultCode.DISTRIBUTION_NOT_EXIST);
         }
         //如果是平台则直接进行查询
-        return distributionGoodsMapper.getDistributionGoodsVO(PageUtil.initPage(searchParams), searchParams.distributionQueryWrapper());
+        return this.baseMapper.getDistributionGoodsVO(PageUtil.initPage(searchParams), searchParams.distributionQueryWrapper());
     }
 
     @Override

framework/src/main/java/cn/lili/modules/goods/entity/dos/Category.java

@@ -11,6 +11,7 @@ import lombok.NoArgsConstructor;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -35,18 +36,23 @@ public class Category extends BaseEntity {
     @ApiModelProperty(value = "分类名称")
     private String name;
 
+    @NotEmpty(message = "请选择父分类")
     @ApiModelProperty(value = "父id, 根节点为0")
     private String parentId;
 
+    @NotNull(message = "层级不能为空")
     @ApiModelProperty(value = "层级, 从0开始")
     private Integer level;
 
+    @NotNull(message = "排序值不能为空")
     @ApiModelProperty(value = "排序值")
     private BigDecimal sortOrder;
 
+    @NotNull(message = "请填写佣金比例")
     @ApiModelProperty(value = "佣金比例")
     private Double commissionRate;
 
+    @NotEmpty(message = "分类图标不能为空")
     @ApiModelProperty(value = "分类图标")
     private String image;
 

framework/src/main/java/cn/lili/modules/goods/entity/dos/DraftGoods.java

@@ -112,9 +112,6 @@ public class DraftGoods extends BaseEntity {
     @ApiModelProperty(value = "运费模板id")
     private String templateId;
 
-    @ApiModelProperty(value = "运费承担者")
-    private String freightPayer;
-
     @ApiModelProperty(value = "是否自营")
     private Boolean selfOperated;
     /**
@@ -154,4 +151,10 @@ public class DraftGoods extends BaseEntity {
     @ApiModelProperty(value = "sku列表JSON")
     private String skuListJson;
 
+    /**
+     * @see cn.lili.modules.goods.entity.enums.GoodsTypeEnum
+     */
+    @ApiModelProperty(value = "商品类型", required = true)
+    private String goodsType;
+
 }

framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java

@@ -145,11 +145,6 @@ public class Goods extends BaseEntity {
      */
     @ApiModelProperty(value = "运费模板id")
     private String templateId;
-    /**
-     * 谁承担运费 BUYER：买家承担，STORE：卖家承担
-     */
-    @ApiModelProperty(value = " 谁承担运费 BUYER：买家承担，STORE：卖家承担")
-    private String freightPayer;
     /**
      * 审核状态
      *
@@ -190,11 +185,19 @@ public class Goods extends BaseEntity {
     @ApiModelProperty(value = "销售模式", required = true)
     private String salesModel;
 
+
+    /**
+     * @see cn.lili.modules.goods.entity.enums.GoodsTypeEnum
+     */
+    @ApiModelProperty(value = "商品类型", required = true)
+    private String goodsType;
+
     @ApiModelProperty(value = "商品参数json", hidden = true)
     @Column(columnDefinition = "TEXT")
     @JsonIgnore
     private String params;
 
+
     public Goods() {
     }
 
@@ -206,7 +209,6 @@ public class Goods extends BaseEntity {
         this.sn = goodsOperationDTO.getSn();
         this.price = goodsOperationDTO.getPrice();
         this.weight = goodsOperationDTO.getWeight();
-        this.freightPayer = goodsOperationDTO.getFreightPayer();
         this.templateId = goodsOperationDTO.getTemplateId();
         this.recommend = goodsOperationDTO.isRecommend();
         this.sellingPoint = goodsOperationDTO.getSellingPoint();
@@ -220,6 +222,6 @@ public class Goods extends BaseEntity {
         }
         //如果立即上架则
         this.marketEnable = goodsOperationDTO.isRelease() ? GoodsStatusEnum.UPPER.name() : GoodsStatusEnum.DOWN.name();
-
+        this.goodsType=goodsOperationDTO.getGoodsType();
     }
 }

framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java

@@ -131,8 +131,6 @@ public class GoodsSku extends BaseEntity {
     @ApiModelProperty(value = "运费模板id")
     private String templateId;
 
-    @ApiModelProperty(value = " 谁承担运费 BUYER：买家承担，STORE：卖家承担")
-    private String freightPayer;
     /**
      * @see GoodsAuthEnum
      */
@@ -160,6 +158,11 @@ public class GoodsSku extends BaseEntity {
 
     @ApiModelProperty(value = "销售模式", required = true)
     private String salesModel;
+    /**
+     * @see cn.lili.modules.goods.entity.enums.GoodsTypeEnum
+     */
+    @ApiModelProperty(value = "商品类型", required = true)
+    private String goodsType;
 
     @Override
     public Date getUpdateTime() {

framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java

@@ -16,7 +16,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 商品查询条件
+ * 商品编辑DTO
  *
  * @author pikachu
  * @date 2020-02-24 19:27:20
@@ -66,9 +66,6 @@ public class GoodsOperationDTO implements Serializable {
     @Max(value = 99999999, message = "重量不能超过99999999")
     private Double weight;
 
-    @ApiModelProperty(value = "谁承担运费 BUYER：买家承担，STORE：卖家承担", required = true)
-    private String freightPayer;
-
     @ApiModelProperty(value = "详情")
     private String intro;
 
@@ -118,4 +115,10 @@ public class GoodsOperationDTO implements Serializable {
 
     @ApiModelProperty(value = "是否重新生成sku数据")
     private Boolean regeneratorSkuFlag = true;
+
+    /**
+     * @see cn.lili.modules.goods.entity.enums.GoodsTypeEnum
+     */
+    @ApiModelProperty(value = "商品类型")
+    private String goodsType;
 }

framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSearchParams.java

@@ -67,6 +67,12 @@ public class GoodsSearchParams extends PageVO {
     @ApiModelProperty(value = "是否为推荐商品")
     private Boolean recommend;
 
+    /**
+     * @see cn.lili.modules.goods.entity.enums.GoodsTypeEnum
+     */
+    @ApiModelProperty(value = "商品类型")
+    private String goodsType;
+
     public <T> QueryWrapper<T> queryWrapper() {
         QueryWrapper<T> queryWrapper = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(goodsId)) {
@@ -108,6 +114,10 @@ public class GoodsSearchParams extends PageVO {
         if (recommend != null) {
             queryWrapper.le("recommend", recommend);
         }
+        if (goodsType != null) {
+            queryWrapper.eq("goods_type", goodsType);
+        }
+
         queryWrapper.eq("delete_flag", false);
         this.betweenWrapper(queryWrapper);
         return queryWrapper;

framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsFreightEnum.java

@@ -1,28 +0,0 @@
-package cn.lili.modules.goods.entity.enums;
-
-/**
- * 商品运费承担者
- *
- * @author pikachu
- * @date 2020-02-26 23:24:13
- */
-public enum GoodsFreightEnum {
-    /**
-     * 买家承担运费
-     */
-    BUYER("买家承担运费"),
-    /**
-     * 卖家承担运费
-     */
-    STORE("卖家承担运费");
-
-    private final String description;
-
-    GoodsFreightEnum(String description) {
-        this.description = description;
-    }
-
-    public String description() {
-        return description;
-    }
-}

framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsTypeEnum.java

@@ -0,0 +1,29 @@
+package cn.lili.modules.goods.entity.enums;
+
+/**
+ * 商品类型
+ *
+ * @author Bulbasaur
+ * @date: 2021/5/28 4:23 下午
+ */
+public enum GoodsTypeEnum {
+
+
+    PHYSICAL_GOODS("实物商品"),
+
+    VIRTUAL_GOODS("虚拟商品"),
+
+    E_COUPON("电子卡券");
+
+
+    private final String description;
+
+    GoodsTypeEnum(String description) {
+        this.description = description;
+    }
+
+    public String description() {
+        return description;
+    }
+
+}

framework/src/main/java/cn/lili/modules/goods/service/GoodsService.java

@@ -109,11 +109,10 @@ public interface GoodsService extends IService<Goods> {
      * 设置商品运费模板
      *
      * @param goodsIds     商品列表
-     * @param freightPayer 承担运费者
      * @param templateId   运费模板ID
      * @return 操作结果
      */
-    Boolean freight(List<String> goodsIds, String freightPayer, String templateId);
+    Boolean freight(List<String> goodsIds, String templateId);
 
     /**
      * 修改商品库存数量

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

@@ -24,18 +24,14 @@ import java.util.List;
 @Transactional
 public class CategoryBrandServiceImpl extends ServiceImpl<CategoryBrandMapper, CategoryBrand> implements CategoryBrandService {
 
-    //分类品牌绑定
-    @Autowired
-    private CategoryBrandMapper categoryBrandMapper;
-
     @Override
     public List<CategoryBrandVO> getCategoryBrandList(String categoryId) {
-        return categoryBrandMapper.getCategoryBrandList(categoryId);
+        return this.baseMapper.getCategoryBrandList(categoryId);
     }
 
     @Override
     public void deleteByCategoryId(String categoryId) {
-        categoryBrandMapper.delete(new LambdaUpdateWrapper<CategoryBrand>().eq(CategoryBrand::getCategoryId, categoryId));
+        this.baseMapper.delete(new LambdaUpdateWrapper<CategoryBrand>().eq(CategoryBrand::getCategoryId, categoryId));
     }
 
     @Override

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

@@ -17,7 +17,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 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;
@@ -40,9 +39,6 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
     //缓存
     @Autowired
     private Cache cache;
-    //分类
-    @Autowired
-    private CategoryMapper categoryMapper;
 
     @Override
     public List<Category> dbList(String parentId) {
@@ -159,7 +155,7 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
                 .ne(category.getId() != null, "id", category.getId())
                 .eq(DELETE_FLAG_COLUMN, false)
                 .orderByAsc("sort_order");
-        return this.categoryMapper.selectList(queryWrapper);
+        return this.baseMapper.selectList(queryWrapper);
     }
 
     @Override
@@ -188,7 +184,7 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
                 .set("sort_order", category.getSortOrder())
                 .set(DELETE_FLAG_COLUMN, category.getDeleteFlag())
                 .set("commission_rate", category.getCommissionRate());
-        categoryMapper.update(category, updateWrapper);
+        this.baseMapper.update(category, updateWrapper);
         removeCache();
     }
 

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

@@ -23,12 +23,10 @@ import java.util.List;
 @Service
 @Transactional
 public class CategorySpecificationServiceImpl extends ServiceImpl<CategorySpecificationMapper, CategorySpecification> implements CategorySpecificationService {
-    @Autowired
-    private CategorySpecificationMapper categorySpecificationMapper;
 
     @Override
     public List<CategorySpecificationVO> getCategorySpecList(String categoryId) {
-        return categorySpecificationMapper.getCategorySpecList(categoryId);
+        return this.baseMapper.getCategorySpecList(categoryId);
     }
 
     @Override
@@ -38,6 +36,6 @@ public class CategorySpecificationServiceImpl extends ServiceImpl<CategorySpecif
 
     @Override
     public void deleteByCategoryId(String categoryId) {
-        categorySpecificationMapper.delete(new LambdaQueryWrapper<CategorySpecification>().eq(CategorySpecification::getCategoryId,categoryId));
+        this.baseMapper.delete(new LambdaQueryWrapper<CategorySpecification>().eq(CategorySpecification::getCategoryId,categoryId));
     }
 }

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

@@ -16,7 +16,6 @@ import cn.lili.modules.goods.service.GoodsGalleryService;
 import cn.lili.modules.goods.service.GoodsSkuService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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;
@@ -70,7 +69,7 @@ public class DraftGoodsServiceImpl extends ServiceImpl<DraftGoodsMapper, DraftGo
         draftGoods.setGoodsGalleryListJson(JSONUtil.toJsonStr(draftGoods.getGoodsGalleryList()));
         draftGoods.setSkuListJson(JSONUtil.toJsonStr(this.getGoodsSkuList(draftGoods.getSkuList())));
         draftGoods.setGoodsParamsListJson(JSONUtil.toJsonStr(draftGoods.getGoodsParamsList()));
-        this.saveOrUpdate(draftGoods);
+        this.save(draftGoods);
     }
 
     @Override

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

@@ -32,9 +32,7 @@ public class GoodsGalleryServiceImpl extends ServiceImpl<GoodsGalleryMapper, Goo
     //文件
     @Autowired
     private FileManagerPlugin fileManagerPlugin;
-    //商品相册数据层
-    @Autowired
-    private GoodsGalleryMapper goodsGalleryMapper;
+
     //设置
     @Autowired
     private SettingService settingService;
@@ -43,7 +41,7 @@ public class GoodsGalleryServiceImpl extends ServiceImpl<GoodsGalleryMapper, Goo
     @Override
     public void add(List<String> goodsGalleryList, String goodsId) {
         //删除原来商品相册信息
-        this.goodsGalleryMapper.delete(new UpdateWrapper<GoodsGallery>().eq("goods_id", goodsId));
+        this.baseMapper.delete(new UpdateWrapper<GoodsGallery>().eq("goods_id", goodsId));
         //确定好图片选择器后进行处理
         int i = 0;
         for (String origin : goodsGalleryList) {
@@ -53,7 +51,7 @@ public class GoodsGalleryServiceImpl extends ServiceImpl<GoodsGalleryMapper, Goo
             // 默认第一个为默认图片
             galley.setIsDefault(i == 0 ? 1 : 0);
             i++;
-            this.goodsGalleryMapper.insert(galley);
+            this.baseMapper.insert(galley);
         }
     }
 
@@ -77,6 +75,6 @@ public class GoodsGalleryServiceImpl extends ServiceImpl<GoodsGalleryMapper, Goo
     @Override
     public List<GoodsGallery> goodsGalleryList(String goodsId) {
         //根据商品id查询商品相册
-        return goodsGalleryMapper.selectList(new QueryWrapper<GoodsGallery>().eq("goods_id", goodsId));
+        return this.baseMapper.selectList(new QueryWrapper<GoodsGallery>().eq("goods_id", goodsId));
     }
 }

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

@@ -102,41 +102,19 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
 
     @Override
     public void addGoods(GoodsOperationDTO goodsOperationDTO) {
-
         Goods goods = new Goods(goodsOperationDTO);
-
-        //判定商品是否需要审核
-        this.checkNeedAuth(goods);
-
+        //检查商品
+        this.checkGoods(goods);
         // 向goods加入图片
         this.setGoodsGalleryParam(goodsOperationDTO.getGoodsGalleryList().get(0), goods);
-
-        //商品添加卖家信息
-        StoreVO storeDetail = this.storeService.getStoreDetail();
-        goods.setStoreId(storeDetail.getId());
-        goods.setStoreName(storeDetail.getStoreName());
-        if (storeDetail.getSelfOperated() != null) {
-            goods.setSelfOperated(storeDetail.getSelfOperated());
-        }
-        // 评论次数
-        goods.setCommentNum(0);
-        // 购买次数
-        goods.setBuyCount(0);
-        // 购买次数
-        goods.setQuantity(0);
-        // 商品评分
-        goods.setGrade(100.0);
-
+        //添加商品
         this.save(goods);
-
         // 添加商品参数
         if (goodsOperationDTO.getGoodsParamsList() != null && !goodsOperationDTO.getGoodsParamsList().isEmpty()) {
             this.goodsParamsService.addParams(goodsOperationDTO.getGoodsParamsList(), goods.getId());
         }
-
         // 添加商品sku信息
         this.goodsSkuService.add(goodsOperationDTO.getSkuList(), goods);
-
         // 添加相册
         if (goodsOperationDTO.getGoodsGalleryList() != null && !goodsOperationDTO.getGoodsGalleryList().isEmpty()) {
             this.goodsGalleryService.add(goodsOperationDTO.getGoodsGalleryList(), goods.getId());
@@ -146,35 +124,25 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
 
     @Override
     public void editGoods(GoodsOperationDTO goodsOperationDTO, String goodsId) {
-        this.checkExist(goodsId);
         Goods goods = new Goods(goodsOperationDTO);
         goods.setId(goodsId);
-
-        //是否需要审核
-        this.checkNeedAuth(goods);
-
+        //检查商品信息
+        this.checkGoods(goods);
         // 向goods加入图片
         this.setGoodsGalleryParam(goodsOperationDTO.getGoodsGalleryList().get(0), goods);
-
-        //商品添加卖家信息
-        StoreVO storeDetail = this.storeService.getStoreDetail();
-        if (storeDetail.getSelfOperated() != null) {
-            goods.setSelfOperated(storeDetail.getSelfOperated());
-        }
-        goods.setStoreId(storeDetail.getId());
-        goods.setStoreName(storeDetail.getStoreName());
-
         //修改商品
         this.updateById(goods);
-
         // 添加商品参数
-        this.goodsParamsService.addParams(goodsOperationDTO.getGoodsParamsList(), goods.getId());
-
-        //修改商品规格
+        if (goodsOperationDTO.getGoodsParamsList() != null && !goodsOperationDTO.getGoodsParamsList().isEmpty()) {
+            this.goodsParamsService.addParams(goodsOperationDTO.getGoodsParamsList(), goods.getId());
+        }
+        //修改商品sku信息
         this.goodsSkuService.update(goodsOperationDTO.getSkuList(), goods, goodsOperationDTO.getRegeneratorSkuFlag());
-
         // 添加相册
-        this.goodsGalleryService.add(goodsOperationDTO.getGoodsGalleryList(), goods.getId());
+        if (goodsOperationDTO.getGoodsGalleryList() != null && !goodsOperationDTO.getGoodsGalleryList().isEmpty()) {
+            this.goodsGalleryService.add(goodsOperationDTO.getGoodsGalleryList(), goods.getId());
+        }
+
     }
 
     @Override
@@ -305,9 +273,8 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     }
 
     @Override
-    public Boolean freight(List<String> goodsIds, String freightPayer, String templateId) {
+    public Boolean freight(List<String> goodsIds, String templateId) {
         LambdaUpdateWrapper<Goods> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
-        lambdaUpdateWrapper.set(Goods::getFreightPayer, freightPayer);
         lambdaUpdateWrapper.set(Goods::getTemplateId, templateId);
         lambdaUpdateWrapper.in(Goods::getId, goodsIds);
         return this.update(lambdaUpdateWrapper);
@@ -355,16 +322,62 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     }
 
     /**
-     * 商品是否需要审核
+     * 检查商品信息
+     * 如果商品是虚拟商品则无需配置配送模板
+     * 如果商品是实物商品需要配置配送模板
+     * 判断商品是否存在
+     * 判断商品是否需要审核
+     * 判断当前用户是否为店铺
      *
      * @param goods 商品
      */
-    private void checkNeedAuth(Goods goods) {
+    private void checkGoods(Goods goods) {
+        //判断商品类型
+        switch (goods.getGoodsType()) {
+            case "PHYSICAL_GOODS":
+                if (goods.getTemplateId().equals("0")) {
+                    throw new ServiceException("实物商品需选择配送模板");
+                }
+                break;
+            case "VIRTUAL_GOODS":
+                if (!goods.getTemplateId().equals("0")) {
+                    throw new ServiceException("虚拟商品不需要选择配送模板");
+                }
+                break;
+            default:
+                throw new ServiceException("需选择商品类型");
+        }
+        //检查商品是否存在--修改商品时使用
+        if (goods.getId() != null) {
+            this.checkExist(goods.getId());
+        } else {
+            // 评论次数
+            goods.setCommentNum(0);
+            // 购买次数
+            goods.setBuyCount(0);
+            // 购买次数
+            goods.setQuantity(0);
+            // 商品评分
+            goods.setGrade(100.0);
+        }
+
         //获取商品系统配置决定是否审核
         Setting setting = settingService.get(SettingEnum.GOODS_SETTING.name());
         GoodsSetting goodsSetting = JSONUtil.toBean(setting.getSettingValue(), GoodsSetting.class);
         //是否需要审核
         goods.setIsAuth(Boolean.TRUE.equals(goodsSetting.getGoodsCheck()) ? GoodsAuthEnum.TOBEAUDITED.name() : GoodsAuthEnum.PASS.name());
+        //判断当前用户是否为店铺
+        if (UserContext.getCurrentUser().getRole().equals(UserEnums.STORE)) {
+            StoreVO storeDetail = this.storeService.getStoreDetail();
+            if (storeDetail.getSelfOperated() != null) {
+                goods.setSelfOperated(storeDetail.getSelfOperated());
+            }
+            goods.setStoreId(storeDetail.getId());
+            goods.setStoreName(storeDetail.getStoreName());
+            goods.setSelfOperated(storeDetail.getSelfOperated());
+        } else {
+            throw new ServiceException("当前未登录店铺");
+        }
     }
 
     /**

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

@@ -510,6 +510,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
             if (goods.getSelfOperated() != null) {
                 goodsSku.setSelfOperated(goods.getSelfOperated());
             }
+            goodsSku.setGoodsType(goods.getGoodsType());
             EsGoodsIndex goodsIndex = (EsGoodsIndex) resultMap.get("goodsIndex");
             skus.add(goodsSku);
             goodsIndices.add(goodsIndex);
@@ -566,8 +567,6 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
         sku.setIntro(goods.getIntro());
         sku.setMobileIntro(goods.getMobileIntro());
         sku.setGoodsUnit(goods.getGoodsUnit());
-        //运费
-        sku.setFreightPayer(goods.getFreightPayer());
         //商品状态
         sku.setIsAuth(goods.getIsAuth());
         sku.setSalesModel(goods.getSalesModel());
@@ -594,6 +593,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
         StringBuilder goodsName = new StringBuilder(goods.getGoodsName());
         //规格商品缩略图
         String thumbnail = "";
+        String small = "";
         //规格值
         Map<String, Object> specMap = new HashMap<>();
         //商品属性
@@ -613,6 +613,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
                         throw new ServiceException("sku图片至少为一个");
                     }
                     thumbnail = goodsGalleryService.getGoodsGallery(images.get(0).get("url")).getThumbnail();
+                    small = goodsGalleryService.getGoodsGallery(images.get(0).get("url")).getSmall();
                 } else {
                     //设置商品名称
                     goodsName.append(" ").append(m.getValue());
@@ -637,6 +638,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
         //设置规格信息
         sku.setGoodsName(goodsName.toString());
         sku.setThumbnail(thumbnail);
+        sku.setSmall(small);
 
         //规格信息
         sku.setId(Convert.toStr(map.get("id"), ""));

framework/src/main/java/cn/lili/modules/member/entity/aop/interceptor/PointLogInterceptor.java

@@ -5,6 +5,7 @@ import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.entity.dos.MemberPointsHistory;
 import cn.lili.modules.member.service.MemberPointsHistoryService;
 import cn.lili.modules.member.service.MemberService;
+import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.After;
 import org.aspectj.lang.annotation.Aspect;
@@ -17,6 +18,7 @@ import org.springframework.stereotype.Component;
  * @author Chopper
  * @date 2020/11/17 7:22 下午
  */
+@Slf4j
 @Aspect
 @Component
 public class PointLogInterceptor {
@@ -62,7 +64,7 @@ public class PointLogInterceptor {
                 memberPointsHistoryService.save(memberPointsHistory);
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("积分操作错误",e);
         }
 
 

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

@@ -85,6 +85,14 @@ public class Member extends BaseEntity {
     @ApiModelProperty(value = "最后一次登录时间")
     private Date lastLoginDate;
 
+    @ApiModelProperty(value = "会员等级ID")
+    private String gradeId;
+
+    @Min(message = "必须为数字", value = 0)
+    @ApiModelProperty(value = "经验值数量")
+    private Long experience;
+
+
     public Member(String username, String password, String mobile) {
         this.username = username;
         this.password = password;

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

@@ -0,0 +1,40 @@
+package cn.lili.modules.member.entity.dos;
+
+import cn.lili.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 会员等级
+ *
+ * @author Bulbasaur
+ * @date 2021/5/14 5:43 下午
+ */
+@Data
+@Entity
+@Table(name = "li_member_grade")
+@TableName("li_member_grade")
+@ApiModel(value = "会员等级")
+public class MemberGrade extends BaseEntity {
+
+    @NotNull
+    @ApiModelProperty(value = "等级名称")
+    private String gradeName;
+
+    @NotNull
+    @ApiModelProperty(value = "等级图片")
+    private String gradeImage;
+
+    @NotNull
+    @ApiModelProperty(value = "所需经验值")
+    private Integer experienceValue;
+
+    @ApiModelProperty(value = "是否为默认等级")
+    private Boolean isDefault;
+}

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

@@ -15,8 +15,8 @@ public class MemberPointMessage {
     @ApiModelProperty(value = "积分")
     private Long point;
 
-    @ApiModelProperty(value = "类型 1为增加")
-    private Integer type;
+    @ApiModelProperty(value = "是否增加积分")
+    private Boolean type;
 
     @ApiModelProperty(value = "会员id")
     private String memberId;

framework/src/main/java/cn/lili/modules/member/mapper/MemberGradeMapper.java

@@ -0,0 +1,14 @@
+package cn.lili.modules.member.mapper;
+
+import cn.lili.modules.member.entity.dos.MemberGrade;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 会员等级数据层
+ *
+ * @author Bulbasaur
+ * @date: 2021/5/14 5:57 下午
+ */
+public interface MemberGradeMapper extends BaseMapper<MemberGrade> {
+
+}

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

@@ -0,0 +1,15 @@
+package cn.lili.modules.member.service;
+
+import cn.lili.modules.member.entity.dos.MemberGrade;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 会员等级业务层
+ * @author Bulbasaur
+ * @date: 2021/5/14 5:57 下午
+ *
+ */
+public interface MemberGradeService extends IService<MemberGrade> {
+
+
+}

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

@@ -29,7 +29,6 @@ public interface MemberPointsHistoryService extends IService<MemberPointsHistory
      * @param memberName 会员名称
      * @return 积分历史分页
      */
-    IPage<MemberPointsHistory> MemberPointsHistoryList(PageVO page, String memberId, String memberName);
-
+    IPage<MemberPointsHistory>  MemberPointsHistoryList(PageVO page, String memberId, String memberName);
 
 }

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

@@ -176,12 +176,23 @@ public interface MemberService extends IService<Member> {
      * 会员积分变动
      *
      * @param point    变动积分
-     * @param type     变动类型 1为增加 0为消费
+     * @param type     是否增加积分
      * @param memberId 会员id
      * @param content  变动详细
      * @return 操作结果
      */
-    Boolean updateMemberPoint(Long point, Integer type, String memberId, String content);
+    Boolean updateMemberPoint(Long point, Boolean type, String memberId, String content);
+
+    /**
+     * 会员积分变动
+     *
+     * @param experience    变动经验值
+     * @param type          是否增加经验值
+     * @param memberId      会员id
+     * @param content       变动详细
+     * @return 操作结果
+     */
+    Boolean updateMemberExperience(Long experience, Boolean type, String memberId, String content);
 
     /**
      * 修改会员状态

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

@@ -11,7 +11,6 @@ import cn.lili.modules.search.service.EsGoodsSearchService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 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;
@@ -30,9 +29,6 @@ import java.util.Objects;
 @Transactional
 public class FootprintServiceImpl extends ServiceImpl<FootprintMapper, FootPrint> implements FootprintService {
 
-    //足迹数据层
-    @Autowired
-    private FootprintMapper footprintMapper;
     //es商品业务层
     @Autowired
     private EsGoodsSearchService esGoodsSearchService;
@@ -54,7 +50,7 @@ public class FootprintServiceImpl extends ServiceImpl<FootprintMapper, FootPrint
             footPrint.setCreateTime(new Date());
             this.save(footPrint);
             //删除超过100条后的记录
-            footprintMapper.deleteLastFootPrint(footPrint.getMemberId());
+            this.baseMapper.deleteLastFootPrint(footPrint.getMemberId());
             return footPrint;
         }
     }
@@ -82,7 +78,7 @@ public class FootprintServiceImpl extends ServiceImpl<FootprintMapper, FootPrint
         lambdaQueryWrapper.eq(FootPrint::getMemberId, UserContext.getCurrentUser().getId());
         lambdaQueryWrapper.eq(FootPrint::getDeleteFlag,false);
         lambdaQueryWrapper.orderByDesc(FootPrint::getUpdateTime);
-        List<String> skuIdList = footprintMapper.footprintSkuIdList(PageUtil.initPage(pageVO), lambdaQueryWrapper);
+        List<String> skuIdList = this.baseMapper.footprintSkuIdList(PageUtil.initPage(pageVO), lambdaQueryWrapper);
         if (skuIdList.size() > 0) {
             List<EsGoodsIndex> list = esGoodsSearchService.getEsGoodsBySkuIds(skuIdList);
             //去除为空的商品数据

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

@@ -17,7 +17,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -37,9 +36,6 @@ import java.util.Optional;
 
 public class GoodsCollectionServiceImpl extends ServiceImpl<GoodsCollectionMapper, GoodsCollection> implements GoodsCollectionService {
 
-    //商品收藏
-    @Autowired
-    private GoodsCollectionMapper goodsCollectionMapper;
     //rocketMq
     @Autowired
     private RocketMQTemplate rocketMQTemplate;
@@ -53,7 +49,7 @@ public class GoodsCollectionServiceImpl extends ServiceImpl<GoodsCollectionMappe
         queryWrapper.eq("gc.member_id", UserContext.getCurrentUser().getId());
         queryWrapper.groupBy("gc.id");
         queryWrapper.orderByDesc("gc.create_time");
-        return goodsCollectionMapper.goodsCollectionVOList(PageUtil.initPage(pageVo), queryWrapper);
+        return this.baseMapper.goodsCollectionVOList(PageUtil.initPage(pageVo), queryWrapper);
     }
 
     @Override

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

@@ -45,6 +45,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 
@@ -59,7 +60,7 @@ import java.util.Map;
 public class MemberEvaluationServiceImpl extends ServiceImpl<MemberEvaluationMapper, MemberEvaluation> implements MemberEvaluationService {
 
     //会员评价数据层
-    @Autowired
+    @Resource
     private MemberEvaluationMapper memberEvaluationMapper;
     //订单
     @Autowired
@@ -91,7 +92,6 @@ public class MemberEvaluationServiceImpl extends ServiceImpl<MemberEvaluationMap
         return memberEvaluationMapper.getMemberEvaluationList(PageUtil.initPage(evaluationQueryParams), evaluationQueryParams.queryWrapper());
     }
 
-
     @Override
     public MemberEvaluationDTO addMemberEvaluation(MemberEvaluationDTO memberEvaluationDTO) {
         //获取子订单信息
@@ -156,7 +156,7 @@ public class MemberEvaluationServiceImpl extends ServiceImpl<MemberEvaluationMap
     @Override
     public EvaluationNumberVO getEvaluationNumber(String goodsId) {
         EvaluationNumberVO evaluationNumberVO = new EvaluationNumberVO();
-        List<Map<String, Object>> list = memberEvaluationMapper.getEvaluationNumber(goodsId);
+        List<Map<String, Object>> list = this.baseMapper.getEvaluationNumber(goodsId);
 
 
         Integer good = 0;

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

@@ -0,0 +1,18 @@
+package cn.lili.modules.member.serviceimpl;
+
+import cn.lili.modules.member.entity.dos.MemberGrade;
+import cn.lili.modules.member.mapper.MemberGradeMapper;
+import cn.lili.modules.member.service.MemberGradeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 会员等级业务层实现
+ *
+ * @author Bulbasaur
+ * @date: 2021/5/14 5:58 下午
+ */
+@Service
+public class MemberGradeServiceImpl extends ServiceImpl<MemberGradeMapper, MemberGrade> implements MemberGradeService {
+
+}

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

@@ -62,9 +62,6 @@ import java.util.List;
 @Transactional
 public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> implements MemberService {
 
-    //会员数据处理层
-    @Autowired
-    private MemberMapper memberMapper;
     //会员token
     @Autowired
     private MemberTokenGenerate memberTokenGenerate;
@@ -90,7 +87,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
     public Member findByUsername(String userName) {
         QueryWrapper<Member> queryWrapper = new QueryWrapper();
         queryWrapper.eq("username", userName);
-        return memberMapper.selectOne(queryWrapper);
+        return this.baseMapper.selectOne(queryWrapper);
     }
 
 
@@ -107,7 +104,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
     public boolean findByMobile(String uuid, String mobile) {
         QueryWrapper<Member> queryWrapper = new QueryWrapper();
         queryWrapper.eq("mobile", mobile);
-        Member member = memberMapper.selectOne(queryWrapper);
+        Member member = this.baseMapper.selectOne(queryWrapper);
         if (member == null) {
             throw new ServiceException(ResultCode.USER_NOT_PHONE);
         }
@@ -165,7 +162,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
     private Member findMember(String userName) {
         QueryWrapper<Member> queryWrapper = new QueryWrapper();
         queryWrapper.eq("username", userName).or().eq("mobile", userName);
-        return memberMapper.selectOne(queryWrapper);
+        return this.getOne(queryWrapper);
     }
 
     @Override
@@ -216,7 +213,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
     public Token mobilePhoneLogin(String mobilePhone) {
         QueryWrapper<Member> queryWrapper = new QueryWrapper();
         queryWrapper.eq("mobile", mobilePhone);
-        Member member = memberMapper.selectOne(queryWrapper);
+        Member member = this.baseMapper.selectOne(queryWrapper);
         //如果手机号不存在则自动注册用户
         if (member == null) {
             member = new Member(mobilePhone, UuidUtils.getUUID(), mobilePhone);
@@ -362,13 +359,13 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
 
     @Override
     @PointLogPoint
-    public Boolean updateMemberPoint(Long point, Integer type, String memberId, String content) {
+    public Boolean updateMemberPoint(Long point, Boolean type, String memberId, String content) {
         //获取当前会员信息
         Member member = this.getById(memberId);
         if (member != null) {
             //积分变动后的会员积分
             long currentPoint;
-            if (type == 1) {
+            if (type) {
                 currentPoint = CurrencyUtil.add(member.getPoint(), point).longValue();
             } else {
                 currentPoint = CurrencyUtil.sub(member.getPoint(), point) < 0 ? 0 : new Double(CurrencyUtil.sub(member.getPoint(), point)).longValue();
@@ -391,6 +388,25 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
         throw new ServiceException(ResultCode.USER_NOT_EXIST);
     }
 
+    @Override
+    public Boolean updateMemberExperience(Long experience, Boolean type, String memberId, String content) {
+        //获取当前会员信息
+        Member member = this.getById(memberId);
+        if (member != null) {
+            //积分变动后的会员积分
+            long currentExperience;
+            if (type) {
+                currentExperience = CurrencyUtil.add(member.getPoint(), experience).longValue();
+            } else {
+                currentExperience = CurrencyUtil.sub(member.getPoint(), experience) < 0 ? 0 : new Double(CurrencyUtil.sub(member.getExperience(), experience)).longValue();
+            }
+            member.setExperience(currentExperience);
+
+            return this.updateById(member);
+        }
+        throw new ServiceException(ResultCode.USER_NOT_EXIST);
+    }
+
 
     @Override
     public Boolean updateMemberStatus(List<String> memberIds, Boolean status) {
@@ -403,7 +419,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
 
     @Override
     public List<MemberDistributionVO> distribution() {
-        List<MemberDistributionVO> memberDistributionVOS = memberMapper.distribution();
+        List<MemberDistributionVO> memberDistributionVOS = this.baseMapper.distribution();
         return memberDistributionVOS;
     }
 
@@ -416,7 +432,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
     private Member findByPhone(String mobilePhone) {
         QueryWrapper<Member> queryWrapper = new QueryWrapper();
         queryWrapper.eq("mobile", mobilePhone);
-        return memberMapper.selectOne(queryWrapper);
+        return this.baseMapper.selectOne(queryWrapper);
     }
 
     /**

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

@@ -21,7 +21,6 @@ import cn.lili.modules.system.service.SettingService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.gson.Gson;
-import lombok.RequiredArgsConstructor;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -41,9 +40,6 @@ import java.util.Map;
 @Transactional
 public class MemberSignServiceImpl extends ServiceImpl<MemberSignMapper, MemberSign> implements MemberSignService {
 
-    //会员签到
-    @Autowired
-    private MemberSignMapper memberSignMapper;
     //RocketMQ
     @Autowired
     private RocketMQTemplate rocketMQTemplate;
@@ -67,12 +63,12 @@ public class MemberSignServiceImpl extends ServiceImpl<MemberSignMapper, MemberS
             queryWrapper.eq("member_id",authUser.getId());
             queryWrapper.between("create_time",new Date(DateUtil.startOfTodDay()*1000),DateUtil.getCurrentDayEndTime());
             //校验今天是否已经签到
-            List<MemberSign> todaySigns = memberSignMapper.getTodayMemberSign(queryWrapper);
+            List<MemberSign> todaySigns = this.baseMapper.getTodayMemberSign(queryWrapper);
             if (todaySigns.size() > 0) {
                 throw new ServiceException(ResultCode.MEMBER_SIGN_REPEAT);
             }
             //当前签到天数的前一天日期
-            List<MemberSign> signs = memberSignMapper.getBeforeMemberSign(authUser.getId());
+            List<MemberSign> signs = this.baseMapper.getBeforeMemberSign(authUser.getId());
             //构建参数
             MemberSign memberSign = new MemberSign();
             memberSign.setMemberId(authUser.getId());
@@ -85,7 +81,7 @@ public class MemberSignServiceImpl extends ServiceImpl<MemberSignMapper, MemberS
             } else {
                 memberSign.setSignDay(1);
             }
-            Integer result = memberSignMapper.insert(memberSign);
+            Integer result = this.baseMapper.insert(memberSign);
             //签到成功后发送消息赠送积分
             if (result > 0) {
                 String destination = rocketmqCustomProperties.getMemberTopic() + ":" + MemberTagsEnum.MEMBER_SING.name();
@@ -102,7 +98,7 @@ public class MemberSignServiceImpl extends ServiceImpl<MemberSignMapper, MemberS
         //获取当前会员
         AuthUser authUser = UserContext.getCurrentUser();
         if (authUser != null) {
-            return memberSignMapper.getMonthMemberSign(authUser.getId(), time);
+            return this.baseMapper.getMonthMemberSign(authUser.getId(), time);
         }
         throw new ServiceException(ResultCode.USER_NOT_LOGIN);
     }
@@ -137,10 +133,10 @@ public class MemberSignServiceImpl extends ServiceImpl<MemberSignMapper, MemberS
                     content = "会员签到第" + day + "天，赠送积分" + point + "分";
                 }
                 //赠送会员积分
-                memberService.updateMemberPoint(point, 1, memberId, content);
+                memberService.updateMemberPoint(point, true, memberId, content);
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("会员签到错误",e);
         }
     }
 

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

@@ -45,9 +45,6 @@ import java.util.Date;
 @Transactional
 public class MemberWalletServiceImpl extends ServiceImpl<MemberWalletMapper, MemberWallet> implements MemberWalletService {
 
-    //预存款数据层
-    @Autowired
-    private MemberWalletMapper walletMapper;
     //预存款日志
     @Autowired
     private WalletLogService walletLogService;
@@ -67,7 +64,7 @@ public class MemberWalletServiceImpl extends ServiceImpl<MemberWalletMapper, Mem
         QueryWrapper<MemberWallet> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("member_id", memberId);
         //执行查询
-        MemberWallet memberWallet = this.walletMapper.selectOne(queryWrapper);
+        MemberWallet memberWallet = this.baseMapper.selectOne(queryWrapper);
         //如果没有钱包，则创建钱包
         if (memberWallet == null) {
             memberWallet = this.save(memberId, memberService.getById(memberId).getUsername());
@@ -83,7 +80,7 @@ public class MemberWalletServiceImpl extends ServiceImpl<MemberWalletMapper, Mem
         //余额变动
         memberWallet.setMemberWallet(CurrencyUtil.add(memberWallet.getMemberWallet(), money));
         memberWallet.setMemberFrozenWallet(CurrencyUtil.sub(memberWallet.getMemberFrozenWallet(), money));
-        this.walletMapper.updateById(memberWallet);
+        this.updateById(memberWallet);
         //新增预存款日志
         WalletLog walletLog = new WalletLog(memberWallet.getMemberId(), memberWallet.getMemberName(), money, detail, serviceType);
         walletLogService.save(walletLog);
@@ -96,7 +93,7 @@ public class MemberWalletServiceImpl extends ServiceImpl<MemberWalletMapper, Mem
         MemberWallet memberWallet = this.checkMemberWallet(memberId);
         //新增预存款
         memberWallet.setMemberWallet(CurrencyUtil.add(memberWallet.getMemberWallet(), money));
-        this.walletMapper.updateById(memberWallet);
+        this.baseMapper.updateById(memberWallet);
         //新增预存款日志
         WalletLog walletLog = new WalletLog(memberWallet.getMemberId(), memberWallet.getMemberName(), money, detail, serviceType);
         walletLogService.save(walletLog);
@@ -114,7 +111,7 @@ public class MemberWalletServiceImpl extends ServiceImpl<MemberWalletMapper, Mem
         }
         memberWallet.setMemberWallet(CurrencyUtil.sub(memberWallet.getMemberWallet(), money));
         //保存记录
-        this.walletMapper.updateById(memberWallet);
+        this.updateById(memberWallet);
         //新增预存款日志
         WalletLog walletLog = new WalletLog(memberWallet.getMemberId(), memberWallet.getMemberName(), -money, detail, serviceType);
         walletLogService.save(walletLog);
@@ -133,7 +130,7 @@ public class MemberWalletServiceImpl extends ServiceImpl<MemberWalletMapper, Mem
         memberWallet.setMemberWallet(CurrencyUtil.sub(memberWallet.getMemberWallet(), money));
         memberWallet.setMemberFrozenWallet(CurrencyUtil.add(memberWallet.getMemberFrozenWallet(), money));
         //修改余额
-        this.walletMapper.updateById(memberWallet);
+        this.updateById(memberWallet);
         //新增预存款日志
         WalletLog walletLog = new WalletLog(memberWallet.getMemberId(), memberWallet.getMemberName(), -money, detail, serviceType);
         walletLogService.save(walletLog);
@@ -150,7 +147,7 @@ public class MemberWalletServiceImpl extends ServiceImpl<MemberWalletMapper, Mem
             throw new ServiceException(ResultCode.WALLET_WITHDRAWAL_INSUFFICIENT);
         }
         memberWallet.setMemberWallet(CurrencyUtil.sub(memberWallet.getMemberWallet(), money));
-        this.walletMapper.updateById(memberWallet);
+        this.updateById(memberWallet);
         //新增预存款日志
         WalletLog walletLog = new WalletLog(memberWallet.getMemberId(), memberWallet.getMemberName(), -money, "提现金额已冻结，审核通过提现成功", serviceType);
         walletLogService.save(walletLog);
@@ -164,7 +161,7 @@ public class MemberWalletServiceImpl extends ServiceImpl<MemberWalletMapper, Mem
      */
     private MemberWallet checkMemberWallet(String memberId) {
         //获取会员预存款信息
-        MemberWallet memberWallet = this.walletMapper.selectOne(new QueryWrapper<MemberWallet>().eq("member_id", memberId));
+        MemberWallet memberWallet = this.getOne(new QueryWrapper<MemberWallet>().eq("member_id", memberId));
         //如果会员预存款信息不存在则同步重新建立预存款信息
         if (memberWallet == null) {
             Member member = memberService.getById(memberId);
@@ -184,11 +181,11 @@ public class MemberWalletServiceImpl extends ServiceImpl<MemberWalletMapper, Mem
         //校验会员预存款是否存在
         QueryWrapper<MemberWallet> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("member_id", member.getId());
-        MemberWallet memberWallet = this.walletMapper.selectOne(queryWrapper);
+        MemberWallet memberWallet = this.getOne(queryWrapper);
         //如果 预存款信息不为空 执行设置密码
         if (memberWallet != null) {
             memberWallet.setWalletPassword(pwd);
-            this.walletMapper.updateById(memberWallet);
+            this.updateById(memberWallet);
         }
     }
 
@@ -200,7 +197,7 @@ public class MemberWalletServiceImpl extends ServiceImpl<MemberWalletMapper, Mem
         //构建查询条件
         QueryWrapper<MemberWallet> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("member_id", authUser.getId());
-        MemberWallet wallet = this.walletMapper.selectOne(queryWrapper);
+        MemberWallet wallet = this.getOne(queryWrapper);
         return wallet != null && !StringUtils.isEmpty(wallet.getWalletPassword());
     }
 
@@ -211,7 +208,7 @@ public class MemberWalletServiceImpl extends ServiceImpl<MemberWalletMapper, Mem
         memberWallet.setMemberName(memberName);
         memberWallet.setMemberWallet(0D);
         memberWallet.setMemberFrozenWallet(0D);
-        this.walletMapper.insert(memberWallet);
+        this.save(memberWallet);
         return memberWallet;
     }
 

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

@@ -33,6 +33,7 @@ import java.util.Date;
 @Service
 @Transactional
 public class MemberWithdrawApplyServiceImpl extends ServiceImpl<MemberWithdrawApplyMapper, MemberWithdrawApply> implements MemberWithdrawApplyService {
+
     //提现申请数据层
     //会员余额
     @Autowired
@@ -41,7 +42,8 @@ public class MemberWithdrawApplyServiceImpl extends ServiceImpl<MemberWithdrawAp
     @Override
     public Boolean audit(String applyId, Boolean result, String remark) {
         //查询申请记录
-        MemberWithdrawApply memberWithdrawApply = baseMapper.selectById(applyId);
+        MemberWithdrawApply memberWithdrawApply = this.getById(applyId);
+        memberWithdrawApply.setInspectRemark(remark);
         if (memberWithdrawApply != null) {
             //写入备注
             memberWithdrawApply.setInspectRemark(remark);
@@ -54,7 +56,7 @@ public class MemberWithdrawApplyServiceImpl extends ServiceImpl<MemberWithdrawAp
                 }
                 memberWithdrawApply.setApplyStatus(WithdrawStatusEnum.VIA_AUDITING.name());
                 //保存审核记录
-                baseMapper.updateById(memberWithdrawApply);
+                this.updateById(memberWithdrawApply);
                 //提现，微信提现成功后扣减冻结金额
                 Boolean bool = memberWalletService.withdrawal(memberWithdrawApply);
                 if (bool) {
@@ -67,7 +69,7 @@ public class MemberWithdrawApplyServiceImpl extends ServiceImpl<MemberWithdrawAp
                     throw new ServiceException(ResultCode.WALLET_REMARK_ERROR);
                 }
                 memberWithdrawApply.setApplyStatus(WithdrawStatusEnum.FAIL_AUDITING.name());
-                baseMapper.updateById(memberWithdrawApply);
+                this.updateById(memberWithdrawApply);
                 //需要从冻结金额扣减到余额
                 memberWalletService.increaseWithdrawal(memberWithdrawApply.getApplyMoney(), memberWithdrawApply.getMemberId(), "审核拒绝，提现金额解冻到余额", DepositServiceTypeEnum.WALLET_WITHDRAWAL.name());
                 return true;

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

@@ -13,8 +13,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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;
 
@@ -29,15 +27,13 @@ import java.util.Optional;
 @Service
 @Transactional
 public class StoreCollectionServiceImpl extends ServiceImpl<StoreCollectionMapper, StoreCollection> implements StoreCollectionService {
-    @Autowired
-    private StoreCollectionMapper storeCollectionMapper;
 
     @Override
     public IPage<StoreCollectionVO> storeCollection(PageVO pageVo) {
         QueryWrapper<StoreCollectionVO> queryWrapper = new QueryWrapper();
         queryWrapper.eq("sc.member_id", UserContext.getCurrentUser().getId());
         queryWrapper.orderByDesc("sc.create_time");
-        return storeCollectionMapper.storeCollectionVOList(PageUtil.initPage(pageVo), queryWrapper);
+        return this.baseMapper.storeCollectionVOList(PageUtil.initPage(pageVo), queryWrapper);
     }
 
     @Override

framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsSignServiceImpl.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -25,6 +26,7 @@ import java.util.Map;
  * @author Chopper
  * @date 2021/1/30 4:27 下午
  */
+@Slf4j
 @Service
 @Transactional
 public class SmsSignServiceImpl extends ServiceImpl<SmsSignMapper, SmsSign> implements SmsSignService {
@@ -42,7 +44,7 @@ public class SmsSignServiceImpl extends ServiceImpl<SmsSignMapper, SmsSign> impl
             smsSign.setSignStatus(0);
             this.save(smsSign);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("添加短信签名错误",e);
         }
     }
 
@@ -55,7 +57,7 @@ public class SmsSignServiceImpl extends ServiceImpl<SmsSignMapper, SmsSign> impl
                 this.removeById(id);
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("删除短信签名错误",e);
         }
 
     }
@@ -74,7 +76,7 @@ public class SmsSignServiceImpl extends ServiceImpl<SmsSignMapper, SmsSign> impl
                 this.updateById(smsSign);
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("查询短信签名错误",e);
         }
     }
 
@@ -84,7 +86,7 @@ public class SmsSignServiceImpl extends ServiceImpl<SmsSignMapper, SmsSign> impl
             aliSmsUtil.modifySmsSign(smsSign);
             this.updateById(smsSign);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("更新短信签名错误",e);
         }
     }
 

framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsTemplateServiceImpl.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -23,6 +24,7 @@ import java.util.Map;
  * @author Chopper
  * @date 2021/1/30 4:27 下午
  */
+@Slf4j
 @Service
 @Transactional
 public class SmsTemplateServiceImpl extends ServiceImpl<SmsTemplateMapper, SmsTemplate> implements SmsTemplateService {
@@ -38,7 +40,7 @@ public class SmsTemplateServiceImpl extends ServiceImpl<SmsTemplateMapper, SmsTe
             smsTemplate.setTemplateType(1);
             this.save(smsTemplate);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("添加短信模板错误",e);
         }
     }
 
@@ -51,7 +53,7 @@ public class SmsTemplateServiceImpl extends ServiceImpl<SmsTemplateMapper, SmsTe
             }
             this.removeById(id);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("删除短信模板错误",e);
         }
 
     }
@@ -71,7 +73,7 @@ public class SmsTemplateServiceImpl extends ServiceImpl<SmsTemplateMapper, SmsTe
                 this.updateById(smsTemplate);
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("查询短信模板错误",e);
         }
     }
 
@@ -82,7 +84,7 @@ public class SmsTemplateServiceImpl extends ServiceImpl<SmsTemplateMapper, SmsTe
             smsTemplate.setTemplateStatus(0);
             this.updateById(smsTemplate);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("重新提交短信模板错误",e);
         }
     }
 

framework/src/main/java/cn/lili/modules/message/serviceimpl/StoreMessageServiceImpl.java

@@ -14,7 +14,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.elasticsearch.ResourceNotFoundException;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -29,15 +28,12 @@ import java.util.List;
 @Service
 @Transactional
 public class StoreMessageServiceImpl extends ServiceImpl<StoreMessageMapper, StoreMessage> implements StoreMessageService {
-    @Autowired
-    private StoreMessageMapper storeMessageMapper;
 
     @Override
     public boolean deleteByMessageId(String messageId) {
         StoreMessage storeMessage = this.getById(messageId);
         if (storeMessage != null) {
-            int result = storeMessageMapper.deleteById(messageId);
-            return result > 0;
+            return this.removeById(messageId);
         }
         return false;
 
@@ -60,7 +56,7 @@ public class StoreMessageServiceImpl extends ServiceImpl<StoreMessageMapper, Sto
             queryWrapper.eq("status", storeMessageQueryVO.getStatus());
         }
         queryWrapper.orderByDesc("status");
-        return storeMessageMapper.queryByParams(PageUtil.initPage(pageVO), queryWrapper);
+        return this.baseMapper.queryByParams(PageUtil.initPage(pageVO), queryWrapper);
 
     }
 
@@ -78,8 +74,7 @@ public class StoreMessageServiceImpl extends ServiceImpl<StoreMessageMapper, Sto
                 throw new ResourceNotFoundException(ResultCode.USER_AUTHORITY_ERROR.message());
             }
             storeMessage.setStatus(status);
-            int result = this.storeMessageMapper.updateById(storeMessage);
-            return result > 0;
+            return this.updateById(storeMessage);
         }
         return false;
     }

framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMPMessageServiceImpl.java

@@ -36,8 +36,6 @@ import java.util.Map;
 @Transactional(rollbackFor = Exception.class)
 
 public class WechatMPMessageServiceImpl extends ServiceImpl<WechatMPMessageMapper, WechatMPMessage> implements WechatMPMessageService {
-    @Autowired
-    private WechatMPMessageMapper wechatMPMessageMapper;
     @Autowired
     private WechatAccessTokenUtil wechatAccessTokenUtil;
 
@@ -53,7 +51,7 @@ public class WechatMPMessageServiceImpl extends ServiceImpl<WechatMPMessageMappe
 
     @Override
     public void init() {
-        wechatMPMessageMapper.deleteAll();
+        this.baseMapper.deleteAll();
         try {
             String accessToken = wechatAccessTokenUtil.cgiAccessToken(ClientTypeEnum.WECHAT_MP);
             //获取已有模版，删除

framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java

@@ -17,7 +17,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -35,8 +34,7 @@ import java.util.Map;
 @Service
 @Transactional(rollbackFor = Exception.class)
 public class WechatMessageServiceImpl extends ServiceImpl<WechatMessageMapper, WechatMessage> implements WechatMessageService {
-    @Autowired
-    private WechatMessageMapper wechatMessageMapper;
+
     @Autowired
     private WechatAccessTokenUtil wechatAccessTokenUtil;
 
@@ -50,7 +48,7 @@ public class WechatMessageServiceImpl extends ServiceImpl<WechatMessageMapper, W
     @Override
     public void init() {
         try {
-            wechatMessageMapper.deleteAll();
+            this.baseMapper.deleteAll();
 
             String accessToken = wechatAccessTokenUtil.cgiAccessToken(ClientTypeEnum.H5);
             //获取已有模版，删除

framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java

@@ -170,7 +170,7 @@ public class WechatMessageUtil {
         try {
             content = HttpUtil.post(url, JSONUtil.toJsonStr(map));
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("微信消息发送错误",e);
         }
         JSONObject json = new JSONObject(content);
         log.info("微信消息发送结果：" + content);

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

@@ -15,7 +15,7 @@ import java.io.Serializable;
 public class StoreRemarkDTO implements Serializable {
 
     private static final long serialVersionUID = -6793274046513576434L;
-    @ApiModelProperty(value = "商家id")
+    @ApiModelProperty(value = "店铺id")
     private String storeId;
 
     @ApiModelProperty(value = "备注")

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

@@ -65,14 +65,12 @@ public class TradeDTO implements Serializable {
     /**
      * key 为商家id
      * value 为商家优惠券
-     * 商家优惠券
+     * 店铺优惠券
      */
     private Map<String, MemberCouponDTO> storeCoupons;
 
     /**
-     * key 为商家id
-     * value 为商家优惠券
-     * 商家优惠券
+     * 店铺备注
      */
     private List<StoreRemarkDTO> storeRemark;
 

framework/src/main/java/cn/lili/modules/order/cart/entity/enums/CartTypeEnum.java

@@ -24,5 +24,9 @@ public enum CartTypeEnum {
      * 积分
      */
     POINTS,
+    /**
+     * 虚拟商品
+     */
+    VIRTUAL;
 
 }

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

@@ -51,10 +51,6 @@ public class CartSkuVO extends CartBase implements Serializable {
     @ApiModelProperty(value = "是否选中，要去结算")
     private Boolean checked;
 
-
-    @ApiModelProperty(value = " 谁承担运费 BUYER：买家承担，STORE：卖家承担")
-    private String freightPayer;
-
     @ApiModelProperty(value = "是否免运费")
     private Boolean isFreeFreight;
 
@@ -100,7 +96,6 @@ public class CartSkuVO extends CartBase implements Serializable {
         this.isShip = true;
         this.purchasePrice = goodsSku.getIsPromotion() != null && goodsSku.getIsPromotion() ? goodsSku.getPromotionPrice() : goodsSku.getPrice();
         this.isFreeFreight = false;
-        this.freightPayer = goodsSku.getFreightPayer();
         this.setStoreId(goodsSku.getStoreId());
         this.setStoreName(goodsSku.getStoreName());
     }

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

@@ -5,6 +5,7 @@ import cn.lili.modules.promotion.entity.dos.MemberCoupon;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -19,6 +20,7 @@ import java.util.List;
  */
 @Data
 @ApiModel(description = "购物车")
+@NoArgsConstructor
 public class CartVO extends CartBase implements Serializable {
 
     private static final long serialVersionUID = -5651775413457562422L;
@@ -44,7 +46,6 @@ public class CartVO extends CartBase implements Serializable {
     @ApiModelProperty(value = "使用的优惠券列表")
     private List<MemberCoupon> couponList;
 
-
     @ApiModelProperty(value = "赠品列表")
     private List<String> giftList;
 
@@ -72,9 +73,6 @@ public class CartVO extends CartBase implements Serializable {
     @ApiModelProperty(value = "已参与的的促销活动提示，直接展示给客户")
     private String promotionNotice;
 
-    public CartVO() {
-    }
-
     public CartVO(CartSkuVO cartSkuVO) {
         this.setStoreId(cartSkuVO.getStoreId());
         this.setStoreName(cartSkuVO.getStoreName());

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

@@ -16,7 +16,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 /**
- * TradeBuilder
+ * 交易构造&&创建
  *
  * @author Chopper
  * @date2020-04-01 9:47 下午
@@ -24,36 +24,41 @@ import java.util.stream.Collectors;
 @Service
 @Slf4j
 public class TradeBuilder {
-    //购物车渲染
+
+    //购物车渲染步骤
     @Autowired
     private List<CartRenderStep> cartRenderSteps;
+
     //交易
     @Autowired
     private TradeService tradeService;
 
+    //购物车业务
+    @Autowired
+    private CartService cartService;
+
+
     /**
      * 渲染整比交易
+     * 0-> 校验商品， 1-》 满优惠渲染， 2->渲染优惠， 3->优惠券渲染， 4->计算运费， 5->计算价格， 6->分销渲染， 7->扩展操作
      */
     int[] defaultRender = {0, 1, 2, 4, 5, 6, 7};
 
     /**
      * 购物车购物车渲染
+     * 0-> 校验商品， 1-》 满优惠渲染， 2->渲染优惠，  5->计算价格
      */
     int[] cartRender = {0, 1, 2, 5};
 
-    /**
-     * 0-> 校验商品 1-》 满优惠渲染 2->渲染优惠 3->优惠券渲染 4->计算运费 5->计算价格 6->分销渲染 7->扩展操作
-     */
-    @Autowired
-    private CartService cartService;
-
     /**
      * 构造购物车
+     * 购物车与结算信息不一致的地方主要是优惠券计算和运费计算，其他规则都是一致都
      *
      * @param checkedWay 购物车类型
      * @return 购物车展示信息
      */
     public TradeDTO buildCart(CartTypeEnum checkedWay) {
+        //读取对应购物车的商品信息
         TradeDTO tradeDTO = cartService.readDTO(checkedWay);
 
         //购物车需要将交易中的优惠券取消掉
@@ -67,7 +72,7 @@ public class TradeBuilder {
             try {
                 cartRenderSteps.get(index).render(tradeDTO);
             } catch (Exception e) {
-                log.error("购物车渲染异常：", e);
+                log.error("购物车{}渲染异常：", cartRenderSteps.get(index).getClass(), e);
             }
         }
         return tradeDTO;
@@ -80,28 +85,26 @@ public class TradeBuilder {
      * @return 购物车展示信息
      */
     public TradeDTO buildTrade(CartTypeEnum checkedWay) {
+        //读取对应购物车的商品信息
         TradeDTO tradeDTO = cartService.readDTO(checkedWay);
-        tradeDTO.setNotSupportFreight(null);
+        //将购物车到sku未选择信息过滤
         List<CartSkuVO> collect = tradeDTO.getSkuList().parallelStream().filter(i -> Boolean.TRUE.equals(i.getChecked())).collect(Collectors.toList());
-        //拼团类型订单预处理
-        if (checkedWay.equals(CartTypeEnum.PINTUAN)) {
-            for (CartSkuVO cartSkuVO : collect) {
-                cartSkuVO.setPintuanId("");
-            }
-        }
         tradeDTO.setSkuList(collect);
         //按照计划进行渲染
         for (int index : defaultRender) {
             try {
                 cartRenderSteps.get(index).render(tradeDTO);
             } catch (Exception e) {
-                log.error("购物车渲染异常：", e);
+                log.error("购物车{}渲染异常：", cartRenderSteps.get(index).getClass(), e);
             }
         }
+        //购物车信息接受
         List<CartVO> cartVOList = new ArrayList<>();
-        for (CartVO i : tradeDTO.getCartList()) {
-            i.setSkuList(i.getSkuList().stream().filter(j -> Boolean.TRUE.equals(j.getChecked())).collect(Collectors.toList()));
-            cartVOList.add(i);
+        //循环购物车信息
+        for (CartVO cartVO : tradeDTO.getCartList()) {
+            //如果商品选中，则加入到对应购物车
+            cartVO.setSkuList(cartVO.getSkuList().stream().filter(j -> Boolean.TRUE.equals(j.getChecked())).collect(Collectors.toList()));
+            cartVOList.add(cartVO);
         }
         tradeDTO.setCartList(cartVOList);
         return tradeDTO;
@@ -111,12 +114,10 @@ public class TradeBuilder {
      * 创建一笔交易
      *
      * @param checkedWay    购物车类型
-     * @param parentOrderSn 是否为其他订单下的订单，如果是则为依赖订单的sn，否则为空
      * @return 交易信息
      */
-    public Trade createTrade(CartTypeEnum checkedWay, String parentOrderSn) {
+    public Trade createTrade(CartTypeEnum checkedWay) {
         TradeDTO tradeDTO = this.buildTrade(checkedWay);
-        tradeDTO.setParentOrderSn(parentOrderSn);
         return tradeService.createTrade(tradeDTO);
     }
 }

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

@@ -1,18 +1,28 @@
 package cn.lili.modules.order.cart.render.impl;
 
+import cn.hutool.core.text.CharSequenceUtil;
+import cn.lili.common.exception.ServiceException;
+import cn.lili.common.security.context.UserContext;
 import cn.lili.common.utils.CurrencyUtil;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.goods.entity.enums.GoodsAuthEnum;
 import cn.lili.modules.goods.entity.enums.GoodsStatusEnum;
 import cn.lili.modules.goods.service.GoodsSkuService;
 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.vo.CartSkuVO;
+import cn.lili.modules.order.cart.entity.vo.CartVO;
 import cn.lili.modules.order.cart.render.CartRenderStep;
-import lombok.RequiredArgsConstructor;
+import cn.lili.modules.order.order.service.OrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 /**
  * 商品有效性校验
  *
@@ -26,10 +36,31 @@ public class CheckDataRender implements CartRenderStep {
     @Autowired
     private GoodsSkuService goodsSkuService;
 
+    @Autowired
+    private OrderService orderService;
+
     @Override
     public void render(TradeDTO tradeDTO) {
+        //校验商品有效性
+        checkData(tradeDTO);
+        //店铺分组数据初始化
+        groupStore(tradeDTO);
+        //预校验
+        preCalibration(tradeDTO);
+
+    }
+
+    /**
+     * 校验商品属性
+     *
+     * @param tradeDTO
+     */
+    private void checkData(TradeDTO tradeDTO) {
+        //循环购物车中的商品
         for (CartSkuVO cartSkuVO : tradeDTO.getSkuList()) {
+            //缓存中的商品信息
             GoodsSku dataSku = goodsSkuService.getGoodsSkuByIdFromCache(cartSkuVO.getGoodsSku().getId());
+            //商品有效性判定
             if (dataSku == null || dataSku.getUpdateTime().before(cartSkuVO.getGoodsSku().getUpdateTime())) {
                 //设置购物车未选中
                 cartSkuVO.setChecked(false);
@@ -39,6 +70,7 @@ public class CheckDataRender implements CartRenderStep {
                 cartSkuVO.setErrorMessage("商品信息发生变化,已失效");
                 continue;
             }
+            // 商品上架状态判定
             if (!GoodsAuthEnum.PASS.name().equals(dataSku.getIsAuth()) || !GoodsStatusEnum.UPPER.name().equals(dataSku.getMarketEnable())) {
                 //设置购物车未选中
                 cartSkuVO.setChecked(false);
@@ -48,17 +80,59 @@ public class CheckDataRender implements CartRenderStep {
                 cartSkuVO.setErrorMessage("商品已下架");
                 continue;
             }
-            //商品库存不足
-            if (dataSku.getQuantity() <= 0) {
+            // 商品库存判定
+            if (dataSku.getQuantity() < cartSkuVO.getNum()) {
                 //设置购物车未选中
                 cartSkuVO.setChecked(false);
-                //设置购物车此sku商品已失效
-                cartSkuVO.setInvalid(true);
                 //设置失效消息
-                cartSkuVO.setErrorMessage("商品库存不足");
+                cartSkuVO.setErrorMessage("商品库存不足,现有库存数量[" + dataSku.getQuantity() + "]");
             }
             //写入初始价格
             cartSkuVO.getPriceDetailDTO().setGoodsPrice(CurrencyUtil.mul(cartSkuVO.getPurchasePrice(), cartSkuVO.getNum()));
         }
     }
+
+    /**
+     * 店铺分组
+     *
+     * @param tradeDTO
+     */
+    private void groupStore(TradeDTO tradeDTO) {
+        // 渲染的购物车
+        List<CartVO> cartList = new ArrayList<>();
+
+        // 根据店铺分组
+        Map<String, List<CartSkuVO>> storeCollect = tradeDTO.getSkuList().parallelStream().collect(Collectors.groupingBy(CartSkuVO::getStoreId));
+        for (Map.Entry<String, List<CartSkuVO>> storeCart : storeCollect.entrySet()) {
+            if (!storeCart.getValue().isEmpty()) {
+                CartVO cartVO = new CartVO(storeCart.getValue().get(0));
+                if (CharSequenceUtil.isEmpty(cartVO.getDeliveryMethod())) {
+                    cartVO.setDeliveryMethod(DeliveryMethodEnum.LOGISTICS.name());
+                }
+                cartVO.setSkuList(storeCart.getValue());
+                storeCart.getValue().stream().filter(i -> Boolean.TRUE.equals(i.getChecked())).findFirst().ifPresent(cartSkuVO -> cartVO.setChecked(true));
+                cartList.add(cartVO);
+            }
+        }
+        tradeDTO.setCartList(cartList);
+    }
+
+    /**
+     * 订单预校验
+     * 1、自己拼团自己创建都拼团判定
+     *
+     * @param tradeDTO
+     */
+    private void preCalibration(TradeDTO tradeDTO) {
+        //拼团判定，不能参与自己创建的拼团
+        if (tradeDTO.getParentOrderSn() != null) {
+            //订单接受
+            cn.lili.modules.order.order.entity.dos.Order parentOrder = orderService.getBySn(tradeDTO.getParentOrderSn());
+            //参与活动判定
+            if (parentOrder.getMemberId().equals(UserContext.getCurrentUser().getId())) {
+                throw new ServiceException("不能参与自己发起的拼团活动！");
+            }
+        }
+    }
+
 }

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

@@ -1,15 +1,12 @@
 package cn.lili.modules.order.cart.render.impl;
 
-import cn.hutool.core.text.CharSequenceUtil;
 import cn.lili.modules.order.cart.entity.dto.TradeDTO;
-import cn.lili.modules.order.cart.entity.enums.DeliveryMethodEnum;
-import cn.lili.modules.promotion.entity.dos.PromotionGoods;
-import cn.lili.modules.promotion.service.FullDiscountService;
 import cn.lili.modules.order.cart.entity.vo.CartSkuVO;
 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 lombok.RequiredArgsConstructor;
+import cn.lili.modules.promotion.entity.dos.PromotionGoods;
+import cn.lili.modules.promotion.service.FullDiscountService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Service;
@@ -38,60 +35,63 @@ public class FullDiscountRender implements CartRenderStep {
         // 获取购物车中所有的商品
         List<CartSkuVO> cartSkuList = tradeDTO.getSkuList();
 
-        // 渲染的购物车
-        List<CartVO> cartList = new ArrayList<>();
-
-        // 确定有哪些商家
+        // 店铺id集合
         List<String> storeIds = new ArrayList<>();
 
-        // 根据店铺分组
-        Map<String, List<CartSkuVO>> storeCollect = cartSkuList.parallelStream().collect(Collectors.groupingBy(CartSkuVO::getStoreId));
+        // 店铺集合
+        List<CartVO> cartList = tradeDTO.getCartList();
+
+
+        // 获取店铺id
+        Map<String, List<CartSkuVO>> storeCollect = tradeDTO.getSkuList().parallelStream().collect(Collectors.groupingBy(CartSkuVO::getStoreId));
         for (Map.Entry<String, List<CartSkuVO>> storeCart : storeCollect.entrySet()) {
             if (!storeCart.getValue().isEmpty()) {
                 storeIds.add(storeCart.getKey());
-                CartVO cartVO = new CartVO(storeCart.getValue().get(0));
-                if (CharSequenceUtil.isEmpty(cartVO.getDeliveryMethod())) {
-                    cartVO.setDeliveryMethod(DeliveryMethodEnum.LOGISTICS.name());
-                }
-                cartVO.setSkuList(storeCart.getValue());
-                storeCart.getValue().stream().filter(i -> Boolean.TRUE.equals(i.getChecked())).findFirst().ifPresent(cartSkuVO -> cartVO.setChecked(true));
-                cartList.add(cartVO);
-
             }
         }
 
+        // 获取当前店铺进行到满减活动
         List<FullDiscountVO> fullDiscounts = fullDiscountService.currentPromotion(storeIds);
+        //循环满减信息
         for (FullDiscountVO fullDiscount : fullDiscounts) {
+            //判定参与活动的商品
             if (fullDiscount.getPromotionGoodsList() != null || fullDiscount.getNumber() == -1) {
+                //循环店铺购物车
                 for (CartVO cart : cartList) {
+                    //如果购物车中的店铺id与活动店铺id相等，则进行促销计算
                     if (fullDiscount.getStoreId().equals(cart.getStoreId())) {
+                        //写入满减活动
                         cart.setFullDiscount(fullDiscount);
                         List<String> skuIds;
+                        // 参与活动的sku判定
                         if (fullDiscount.getNumber() != -1) {
                             skuIds = initFullDiscountGoods(fullDiscount, cartSkuList);
                         } else {
                             skuIds = cart.getSkuList().stream().map(i -> i.getGoodsSku().getId()).collect(Collectors.toList());
                         }
+                        //记录参与满减活动的sku
                         cart.setFullDiscountSkuIds(skuIds);
                     }
                 }
             }
         }
 
-        tradeDTO.setCartList(cartList);
     }
 
     /**
      * 获取参与满优惠的商品id
      *
      * @param fullDiscount 满优惠信息
-     * @param cartSkuVOS 购物车商品sku信息
+     * @param cartSkuVOS   购物车商品sku信息
      * @return 参与满优惠的商品id
      */
     public List<String> initFullDiscountGoods(FullDiscountVO fullDiscount, List<CartSkuVO> cartSkuVOS) {
         List<String> goodsIds = new ArrayList<>();
+        //判定参与活动的商品
         for (PromotionGoods promotionGoods : fullDiscount.getPromotionGoodsList()) {
+            //sku 集合判定
             for (CartSkuVO cartSkuVO : cartSkuVOS) {
+                //如果参加，则记录商品sku
                 if (cartSkuVO.getGoodsSku().getId().equals(promotionGoods.getSkuId())) {
                     goodsIds.add(promotionGoods.getSkuId());
                 }

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

@@ -1,6 +1,8 @@
 package cn.lili.modules.order.cart.render.impl;
 
 import cn.hutool.core.util.NumberUtil;
+import cn.lili.common.enums.ResultCode;
+import cn.lili.common.exception.ServiceException;
 import cn.lili.common.utils.CurrencyUtil;
 import cn.lili.modules.member.entity.dos.MemberAddress;
 import cn.lili.modules.order.cart.entity.dto.TradeDTO;
@@ -11,7 +13,6 @@ import cn.lili.modules.store.entity.dto.FreightTemplateChildDTO;
 import cn.lili.modules.store.entity.enums.FreightTemplateEnum;
 import cn.lili.modules.store.entity.vos.FreightTemplateVO;
 import cn.lili.modules.store.service.FreightTemplateService;
-import com.xkcoding.http.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Service;
@@ -37,27 +38,26 @@ public class SkuFreightRender implements CartRenderStep {
         List<CartSkuVO> cartSkuVOS = tradeDTO.getSkuList();
         //会员收货地址问题处理
         MemberAddress memberAddress = tradeDTO.getMemberAddress();
+        //如果收货地址为空，则抛出异常
         if (memberAddress == null) {
-            return;
+            throw new ServiceException(ResultCode.MEMBER_ADDRESS_NOT_EXIST);
         }
         //循环渲染购物车商品运费价格
         forSku:
         for (CartSkuVO cartSkuVO : cartSkuVOS) {
+            //获取sku运费模版
             String freightTemplateId = cartSkuVO.getGoodsSku().getFreightTemplateId();
-            //如果商品设置卖家承担运费,或者没设置运费，则跳出此商品运费计算
-            if (StringUtil.isEmpty(cartSkuVO.getFreightPayer())||cartSkuVO.getFreightPayer().equals("STORE")) {
-                continue;
-            }
-
             //免运费则跳出运费计算
             if (Boolean.TRUE.equals(cartSkuVO.getIsFreeFreight()) || freightTemplateId == null) {
                 continue;
             }
-
             //寻找对应对商品运费计算模版
             FreightTemplateVO freightTemplate = freightTemplateService.getFreightTemplate(freightTemplateId);
             if (freightTemplate != null && freightTemplate.getFreightTemplateChildList() != null && !freightTemplate.getFreightTemplateChildList().isEmpty()) {
-
+                //店铺支付运费则跳过
+                if (freightTemplate.getPricingMethod().equals(FreightTemplateEnum.FREE.name())) {
+                    break;
+                }
                 FreightTemplateChild freightTemplateChild = null;
 
                 //获取市级别id
@@ -70,7 +70,7 @@ public class SkuFreightRender implements CartRenderStep {
                         break;
                     }
                 }
-
+                //如果没有匹配到物流规则，则说明不支持配送
                 if (freightTemplateChild == null) {
                     if (tradeDTO.getNotSupportFreight() == null) {
                         tradeDTO.setNotSupportFreight(new ArrayList<>());
@@ -79,6 +79,7 @@ public class SkuFreightRender implements CartRenderStep {
                     continue forSku;
                 }
 
+                //物流规则模型创立
                 FreightTemplateChildDTO freightTemplateChildDTO = new FreightTemplateChildDTO(freightTemplateChild);
 
                 freightTemplateChildDTO.setPricingMethod(freightTemplate.getPricingMethod());

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

@@ -1,16 +1,12 @@
 package cn.lili.modules.order.cart.service;
 
 
-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.CartTypeEnum;
-import cn.lili.modules.order.cart.entity.vo.CartSkuVO;
 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;
-
 /**
  * 购物车业务层
  *
@@ -171,13 +167,4 @@ public interface CartService {
      * @return 交易信息
      */
     Trade createTrade(TradeParams tradeParams);
-
-    /**
-     * 检查商品是否在配送范围
-     *
-     * @param skuList       商品列表
-     * @param memberAddress 配送地址
-     */
-    void checkAddressScope(List<CartSkuVO> skuList, MemberAddress memberAddress);
-
 }

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

@@ -24,18 +24,17 @@ import cn.lili.modules.order.cart.render.TradeBuilder;
 import cn.lili.modules.order.order.entity.dos.Trade;
 import cn.lili.modules.order.order.entity.vo.ReceiptVO;
 import cn.lili.modules.promotion.entity.dos.MemberCoupon;
+import cn.lili.modules.promotion.entity.dos.Pintuan;
 import cn.lili.modules.promotion.entity.dos.PromotionGoods;
 import cn.lili.modules.promotion.entity.enums.CouponScopeTypeEnum;
 import cn.lili.modules.promotion.entity.enums.MemberCouponStatusEnum;
 import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum;
 import cn.lili.modules.promotion.service.MemberAddressService;
 import cn.lili.modules.promotion.service.MemberCouponService;
+import cn.lili.modules.promotion.service.PintuanService;
 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.FreightTemplateChild;
-import cn.lili.modules.store.entity.vos.FreightTemplateVO;
-import cn.lili.modules.store.service.FreightTemplateService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -77,9 +76,10 @@ public class CartServiceImpl implements CartService {
     //ES商品
     @Autowired
     private EsGoodsSearchService esGoodsSearchService;
-    //运费模板
+
+    //拼团服务
     @Autowired
-    private FreightTemplateService freightTemplateService;
+    private PintuanService pintuanService;
     //交易
     @Autowired
     private TradeBuilder tradeBuilder;
@@ -134,10 +134,16 @@ public class CartServiceImpl implements CartService {
                 promotionGoodsService.updatePromotion(cartSkuVO);
                 //再设置加入购物车的数量
                 this.checkSetGoodsQuantity(cartSkuVO, skuId, num);
+
+                //拼团判定
+                checkPintuan(cartTypeEnum, cartSkuVO);
+
                 //计算购物车小计
                 cartSkuVO.setSubTotal(CurrencyUtil.mul(cartSkuVO.getPurchasePrice(), cartSkuVO.getNum()));
                 cartSkuVOS.add(cartSkuVO);
             }
+
+
             tradeDTO.setCartTypeEnum(cartTypeEnum);
             // 如购物车发生更改，则重置优惠券
             tradeDTO.setStoreCoupons(null);
@@ -499,55 +505,15 @@ public class CartServiceImpl implements CartService {
         //设置基础属性
         tradeDTO.setClientType(tradeParams.getClient());
         tradeDTO.setStoreRemark(tradeParams.getRemark());
-        //过滤勾选商品
-        List<CartSkuVO> collect = tradeDTO.getSkuList().parallelStream().filter(i -> Boolean.TRUE.equals(i.getChecked())).collect(Collectors.toList());
-        //校验收获地址
-        MemberAddress memberAddress = tradeDTO.getMemberAddress();
-        this.checkAddressScope(collect, memberAddress);
+        tradeDTO.setParentOrderSn(tradeParams.getParentOrderSn());
+        //将购物车信息写入缓存，后续逻辑调用校验
         this.resetTradeDTO(tradeDTO);
         //构建交易
-        Trade trade = tradeBuilder.createTrade(cartTypeEnum, tradeParams.getParentOrderSn());
+        Trade trade = tradeBuilder.createTrade(cartTypeEnum);
         this.cleanChecked(tradeDTO);
         return trade;
     }
 
-    /**
-     * 检查商品是否在配送范围
-     *
-     * @param skuList       商品列表
-     * @param memberAddress 配送地址
-     */
-    @Override
-    public void checkAddressScope(List<CartSkuVO> skuList, MemberAddress memberAddress) {
-        //如果收货地址为空，则抛出异常
-        if (memberAddress == null) {
-            throw new ServiceException(ResultCode.MEMBER_ADDRESS_NOT_EXIST);
-        }
-        for (CartSkuVO cartSkuVO : skuList) {
-            //店铺支付运费则跳过
-            if (cartSkuVO.getFreightPayer().equals("STORE")) {
-                break;
-            }
-            String freightTemplateId = cartSkuVO.getGoodsSku().getFreightTemplateId();
-            FreightTemplateVO freightTemplate = freightTemplateService.getFreightTemplate(freightTemplateId);
-            //收货地址判定
-            forTemplates:
-            if (freightTemplate != null && freightTemplate.getFreightTemplateChildList() != null && !freightTemplate.getFreightTemplateChildList().isEmpty()) {
-
-                //获取市级别id
-                String addressId = memberAddress.getConsigneeAddressIdPath().split(",")[1];
-                //获取匹配的收货地址
-                for (FreightTemplateChild templateChild : freightTemplate.getFreightTemplateChildList()) {
-                    //如果当前模版包含，则返回
-                    if (templateChild.getAreaId().contains(addressId)) {
-                        break forTemplates;
-                    }
-                }
-                throw new ServiceException(ResultCode.SHIPPING_NOT_APPLY, cartSkuVO.getGoodsSku().getGoodsName());
-
-            }
-        }
-    }
 
     /**
      * 获取购物车类型
@@ -568,6 +534,13 @@ public class CartServiceImpl implements CartService {
         return cartTypeEnum;
     }
 
+    /**
+     * 使用优惠券判定
+     *
+     * @param tradeDTO     交易对象
+     * @param memberCoupon 会员优惠券
+     * @param cartTypeEnum 购物车
+     */
     private void useCoupon(TradeDTO tradeDTO, MemberCoupon memberCoupon, CartTypeEnum cartTypeEnum) {
         //如果是平台优惠券
         if (Boolean.TRUE.equals(memberCoupon.getIsPlatform())) {
@@ -575,24 +548,34 @@ public class CartServiceImpl implements CartService {
             Double cartPrice = 0d;
             for (CartSkuVO cartSkuVO : tradeDTO.getSkuList()) {
                 // 获取商品的促销信息
-                Optional<PromotionGoods> promotionOptional = cartSkuVO.getPromotions().parallelStream().filter(i -> (i.getPromotionType().equals(PromotionTypeEnum.PINTUAN.name()) && cartTypeEnum.equals(CartTypeEnum.PINTUAN))
-                        || i.getPromotionType().equals(PromotionTypeEnum.SECKILL.name())).findAny();
+                Optional<PromotionGoods> promotionOptional =
+                        cartSkuVO.getPromotions().parallelStream().filter(promotionGoods ->
+                                (promotionGoods.getPromotionType().equals(PromotionTypeEnum.PINTUAN.name()) &&
+                                        cartTypeEnum.equals(CartTypeEnum.PINTUAN)) ||
+                                        promotionGoods.getPromotionType().equals(PromotionTypeEnum.SECKILL.name())).findAny();
+                //有促销金额则用促销金额，否则用商品原价
                 if (promotionOptional.isPresent()) {
-                    cartPrice += CurrencyUtil.mul(promotionOptional.get().getPrice(), cartSkuVO.getNum());
+                    cartPrice = CurrencyUtil.add(cartPrice, CurrencyUtil.mul(promotionOptional.get().getPrice(), cartSkuVO.getNum()));
                 } else {
-                    cartPrice += CurrencyUtil.mul(cartSkuVO.getGoodsSku().getPrice(), cartSkuVO.getNum());
+                    cartPrice = CurrencyUtil.add(cartPrice, CurrencyUtil.mul(cartSkuVO.getGoodsSku().getPrice(), cartSkuVO.getNum()));
                 }
 
             }
+            //如果购物车金额大于消费门槛则使用
             if (memberCoupon.getConsumeThreshold() <= cartPrice) {
                 tradeDTO.setPlatformCoupon(new MemberCouponDTO(memberCoupon));
+                //选择平台优惠券，则将品台优惠券清空
                 tradeDTO.setStoreCoupons(new HashMap<>());
             }
-        } else {
+        }
+        //否则为店铺优惠券
+        else {
+            //过滤对应店铺购物车
             CartSkuVO cartVO = tradeDTO.getSkuList().stream().filter(i -> i.getStoreId().equals(memberCoupon.getStoreId())).findFirst().orElse(null);
             // 优惠券消费门槛 <= 商品购买时的成交价（单品） * 购买数量
             if (cartVO != null && memberCoupon.getConsumeThreshold() <= CurrencyUtil.mul(cartVO.getPurchasePrice(), cartVO.getNum())) {
                 tradeDTO.getStoreCoupons().put(memberCoupon.getStoreId(), new MemberCouponDTO(memberCoupon));
+                //选择店铺优惠券，则将品台优惠券清空
                 tradeDTO.setPlatformCoupon(null);
             }
         }
@@ -607,9 +590,12 @@ public class CartServiceImpl implements CartService {
      */
     private boolean checkCoupon(MemberCoupon memberCoupon, TradeDTO tradeDTO) {
         List<CartSkuVO> cartSkuVOS;
+        //如果是店铺优惠券，判定的内容
         if (Boolean.FALSE.equals(memberCoupon.getIsPlatform())) {
             cartSkuVOS = tradeDTO.getSkuList().stream().filter(i -> i.getStoreId().equals(memberCoupon.getStoreId())).collect(Collectors.toList());
-        } else {
+        }
+        //否则为平台优惠券，筛选商品为全部商品
+        else {
             cartSkuVOS = tradeDTO.getSkuList();
         }
 
@@ -627,8 +613,33 @@ public class CartServiceImpl implements CartService {
         return true;
     }
 
-    @Autowired
-    public void setTradeBuilder(TradeBuilder tradeBuilder) {
-        this.tradeBuilder = tradeBuilder;
+    /**
+     * 校验拼团信息
+     *
+     * @param cartTypeEnum 购物车枚举
+     * @param cartSkuVO    购物车信息
+     */
+    private void checkPintuan(CartTypeEnum cartTypeEnum, CartSkuVO cartSkuVO) {
+
+        //拼团活动的话，需要对限购数量进行判定
+        if (cartTypeEnum.equals(CartTypeEnum.PINTUAN)) {
+            //获取拼团信息
+            List<PromotionGoods> currentPromotion = cartSkuVO.getPromotions().stream().filter(
+                    promotionGoods -> (promotionGoods.getPromotionType().equals(PromotionTypeEnum.PINTUAN.name())))
+                    .collect(Collectors.toList());
+            //拼团活动判定
+            if (currentPromotion.size() > 0) {
+                //写入拼团信息
+                cartSkuVO.setPintuanId(currentPromotion.get(0).getPromotionId());
+            } else {
+                throw new ServiceException(ResultCode.CART_PINTUAN_NOT_EXIST_ERROR);
+            }
+
+            Pintuan pintuan = pintuanService.getPintuanById(cartSkuVO.getPintuanId());
+            Integer limitNum = pintuan.getLimitNum();
+            if (limitNum != 0 && cartSkuVO.getNum() > limitNum) {
+                throw new ServiceException(ResultCode.CART_PINTUAN_LIMIT_ERROR);
+            }
+        }
     }
 }

framework/src/main/java/cn/lili/modules/order/order/aop/AfterSaleOperationLogAspect.java

@@ -5,9 +5,8 @@ import cn.lili.common.security.context.UserContext;
 import cn.lili.common.security.enums.UserEnums;
 import cn.lili.common.utils.SpelUtil;
 import cn.lili.common.utils.ThreadPoolUtil;
-import cn.lili.modules.order.trade.entity.dos.AfterSaleLog;
 import cn.lili.modules.order.order.service.AfterSaleLogService;
-import lombok.RequiredArgsConstructor;
+import cn.lili.modules.order.trade.entity.dos.AfterSaleLog;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
@@ -51,7 +50,7 @@ public class AfterSaleOperationLogAspect {
             //调用线程保存
             ThreadPoolUtil.getPool().execute(new SaveAfterSaleLogThread(afterSaleLog, afterSaleLogService));
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("售后日志错误",e);
         }
     }
 

framework/src/main/java/cn/lili/modules/order/order/aop/OrderOperationLogAspect.java

@@ -6,7 +6,7 @@ import cn.lili.common.utils.SpelUtil;
 import cn.lili.common.utils.ThreadPoolUtil;
 import cn.lili.modules.order.trade.entity.dos.OrderLog;
 import cn.lili.modules.order.trade.service.OrderLogService;
-import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.After;
 import org.aspectj.lang.annotation.Aspect;
@@ -23,6 +23,7 @@ import java.util.Map;
  * @author Chopper
  * @date: 2020/11/17 7:22 下午
  */
+@Slf4j
 @Aspect
 @Component
 public class OrderOperationLogAspect {
@@ -48,7 +49,7 @@ public class OrderOperationLogAspect {
             //调用线程保存
             ThreadPoolUtil.getPool().execute(new SaveOrderLogThread(orderLog, orderLogService));
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("订单日志错误",e);
         }
     }
 

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

@@ -14,12 +14,17 @@ import cn.lili.modules.order.order.entity.enums.PayStatusEnum;
 import cn.lili.modules.promotion.entity.dos.PromotionGoods;
 import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum;
 import cn.lili.modules.order.cart.entity.dto.TradeDTO;
+import cn.lili.modules.order.cart.entity.enums.CartTypeEnum;
+import cn.lili.modules.order.cart.entity.enums.DeliveryMethodEnum;
 import cn.lili.modules.order.cart.entity.vo.CartVO;
+import cn.lili.modules.order.order.entity.dto.PriceDetailDTO;
+import cn.lili.modules.order.order.entity.enums.*;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -38,6 +43,7 @@ import java.util.Optional;
 @Table(name = "li_order")
 @TableName("li_order")
 @ApiModel(value = "订单")
+@NoArgsConstructor
 public class Order extends BaseEntity {
 
 
@@ -177,6 +183,12 @@ public class Order extends BaseEntity {
     @ApiModelProperty(value = "订单类型")
     private String orderType;
 
+    /**
+     * @see OrderPromotionTypeEnum
+     */
+    @ApiModelProperty(value = "订单促销类型")
+    private String orderPromotionType;
+
     @Column(columnDefinition = "TEXT")
     @ApiModelProperty(value = "价格详情")
     private String priceDetail;
@@ -185,7 +197,7 @@ public class Order extends BaseEntity {
     private Boolean canReturn;
 
     @ApiModelProperty(value = "提货码")
-    private String qrCode;
+    private String verificationCode;
 
     @ApiModelProperty(value = "分销员ID")
     private String distributionId;
@@ -196,20 +208,27 @@ public class Order extends BaseEntity {
     @ApiModelProperty(value = "使用的平台会员优惠券id")
     private String usePlatformMemberCouponId;
 
-    public Order() {
-
-    }
-
+    /**
+     * 构建订单
+     *
+     * @param cartVO   购物车VO
+     * @param tradeDTO 交易DTO
+     */
     public Order(CartVO cartVO, TradeDTO tradeDTO) {
         String oldId = this.getId();
-        if (tradeDTO.getMemberAddress() != null) {
-            BeanUtil.copyProperties(tradeDTO.getMemberAddress(), this);
-        }
         BeanUtil.copyProperties(tradeDTO, this);
         BeanUtil.copyProperties(cartVO.getPriceDetailDTO(), this);
         BeanUtil.copyProperties(cartVO, this);
+        //订单类型判断--普通订单，活动订单。
+        if (tradeDTO.getCartTypeEnum().equals(CartTypeEnum.CART) || tradeDTO.getCartTypeEnum().equals(CartTypeEnum.BUY_NOW)) {
+            this.setOrderType(OrderTypeEnum.NORMAL.name());
+        } else if (tradeDTO.getCartTypeEnum().equals(CartTypeEnum.VIRTUAL)) {
+            this.setOrderType(tradeDTO.getCartTypeEnum().name());
+        } else {
+            this.setOrderType(OrderTypeEnum.NORMAL.name());
+        }
         this.setId(oldId);
-        this.setOrderType(OrderTypeEnum.NORMAL.name());
+
         //促销信息填充
         if (cartVO.getSkuList().get(0).getPromotions() != null && tradeDTO.getCartTypeEnum().equals(CartTypeEnum.PINTUAN)) {
             Optional<String> pintuanId = cartVO.getSkuList().get(0).getPromotions().stream().filter(i -> i.getPromotionType().equals(PromotionTypeEnum.PINTUAN.name())).map(PromotionGoods::getPromotionId).findFirst();
@@ -226,14 +245,15 @@ public class Order extends BaseEntity {
         this.setOrderStatus(OrderStatusEnum.UNPAID.name());
         this.setPayStatus(PayStatusEnum.UNPAID.name());
         this.setDeliverStatus(DeliverStatusEnum.UNDELIVERED.name());
-        //如果有收货地址，才记录收货地址
-        if (tradeDTO.getMemberAddress() != null) {
-            this.setConsigneeAddressIdPath(tradeDTO.getMemberAddress().getConsigneeAddressIdPath());
-            this.setConsigneeAddressPath(tradeDTO.getMemberAddress().getConsigneeAddressPath());
-            this.setConsigneeDetail(tradeDTO.getMemberAddress().getDetail());
-            this.setConsigneeMobile(tradeDTO.getMemberAddress().getMobile());
-            this.setConsigneeName(tradeDTO.getMemberAddress().getName());
-        }
+        this.setTradeSn(tradeDTO.getSn());
+        this.setRemark(cartVO.getRemark());
+        this.setFreightPrice(tradeDTO.getPriceDetailDTO().getFreightPrice());
+        //会员收件信息
+        this.setConsigneeAddressIdPath(tradeDTO.getMemberAddress().getConsigneeAddressIdPath());
+        this.setConsigneeAddressPath(tradeDTO.getMemberAddress().getConsigneeAddressPath());
+        this.setConsigneeDetail(tradeDTO.getMemberAddress().getDetail());
+        this.setConsigneeMobile(tradeDTO.getMemberAddress().getMobile());
+        this.setConsigneeName(tradeDTO.getMemberAddress().getName());
         //平台优惠券判定
         if (tradeDTO.getPlatformCoupon() != null) {
             this.setUsePlatformMemberCouponId(tradeDTO.getPlatformCoupon().getMemberCoupon().getId());
@@ -246,9 +266,6 @@ public class Order extends BaseEntity {
             }
             this.setUseStoreMemberCouponIds(storeCouponIds.toString());
         }
-        this.setTradeSn(tradeDTO.getSn());
-        this.setRemark(cartVO.getRemark());
-        this.setFreightPrice(tradeDTO.getPriceDetailDTO().getFreightPrice());
     }
 
     public PriceDetailDTO getPriceDetailDTO() {