所有呵呵名称改为颜选美学

README.md

@@ -1,3 +1,3 @@
 # caimei365-hehe
 
-呵呵商城
+颜选美学商城

src/main/java/com/caimei/components/WeChatService.java

@@ -123,10 +123,10 @@ public class WeChatService {
         returnMap.put("referer", referer);
         String requestUrl = "https://api.weixin.qq.com/sns/jscode2session";
         Map<String, String> requestUrlParam = new HashMap<String, String>(4);
-        // 呵呵商城小程序appId
+        // 颜选美学商城小程序appId
         requestUrlParam.put("appid", heHeAppId);
-        log.info("呵呵商城appId: ---" + heHeAppId);
-        // 呵呵商城小程序appSecret
+        log.info("颜选美学商城appId: ---" + heHeAppId);
+        // 颜选美学商城小程序appSecret
         requestUrlParam.put("secret", heHeAppSecret);
         // 小程序端返回的code
         requestUrlParam.put("js_code", code);

src/main/java/com/caimei/config/SwaggerConfig.java

@@ -39,9 +39,9 @@ public class SwaggerConfig {
     private ApiInfo apiInfo() {
         return new ApiInfoBuilder().
                 // 标题
-                        title("呵呵商城小程序spi")
+                        title("颜选美学商城小程序spi")
                 // 描述
-                .description("呵呵商城小程序spi")
+                .description("颜选美学商城小程序spi")
                 // 服务地址
                 .termsOfServiceUrl("https://mall2c.caimei365.com")
                 // 版本号

src/main/java/com/caimei/controller/HeHeApi.java

@@ -29,12 +29,12 @@ import java.net.URI;
 import java.util.Map;
 
 /**
- * 呵呵商城用户API
+ * 颜选美学商城用户API
  *
  * @author : plf
  * @date : 2021/4/21
  */
-@Api(tags = "呵呵商城用户API")
+@Api(tags = "颜选美学商城用户API")
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/user/he")

src/main/java/com/caimei/mapper/ShoppingCartMapper.java

@@ -22,7 +22,7 @@ public interface ShoppingCartMapper {
      *
      * @param userId   机构id
      * @param skuId    skuId
-     * @param heUserId 呵呵分销者id
+     * @param heUserId 颜选美学分销者id
      * @return
      */
     CmCartPo findCartProduct(@Param("userId") Integer userId, @Param("skuId") Integer skuId, @Param("heUserId") Integer heUserId);

src/main/java/com/caimei/model/dto/CartDto.java

@@ -36,8 +36,8 @@ public class CartDto implements Serializable {
     private Integer productCount;
 
     /**
-     * 呵呵分销者userId
+     * 颜选美学分销者userId
      */
-    @ApiModelProperty("呵呵分销者userId")
+    @ApiModelProperty("颜选美学分销者userId")
     private Integer heUserId;
 }

src/main/java/com/caimei/model/po/CmCartPo.java

@@ -27,9 +27,9 @@ public class CmCartPo implements Serializable {
     private String reBuyFlag;
 
     /**
-     * 呵呵分销者userId
+     * 颜选美学分销者userId
      */
     private Integer heUserId;
 
     private static final long serialVersionUID = 1L;
-}
+}

src/main/java/com/caimei/model/po/CmHeheCollageProductPo.java

@@ -16,7 +16,7 @@ public class CmHeheCollageProductPo implements Serializable {
 
     private Integer skuId;
     /**
-     * 呵呵商城商品id
+     * 颜选美学商城商品id
      */
     private Integer productId;
 

src/main/java/com/caimei/model/po/CmOrderPo.java

@@ -45,7 +45,7 @@ public class CmOrderPo implements Serializable {
     private Integer orderSubmitType;
 
     /**
-     * 订单类型 0协销订单、 1普通订单、 2呵呵订单
+     * 订单类型 0协销订单、 1普通订单、 2颜选美学订单
      */
     private Integer orderType;
 
@@ -301,4 +301,4 @@ public class CmOrderPo implements Serializable {
     private BigDecimal reductionAmount;
 
     private static final long serialVersionUID = 1L;
-}
+}

src/main/java/com/caimei/model/po/CmOrderProductPo.java

@@ -305,7 +305,7 @@ public class CmOrderProductPo implements Serializable {
     private Integer cancelNum;
 
     /**
-     * 分销者id(呵呵商城订单使用)
+     * 分销者id(颜选美学商城订单使用)
      */
     private Integer heUserId;
 

src/main/java/com/caimei/model/vo/CmHeHeImageVo.java

@@ -5,7 +5,7 @@ import lombok.Data;
 import java.io.Serializable;
 
 /**
- * cm_hehe_image:呵呵商城轮播图
+ * cm_hehe_image:颜选美学商城轮播图
  *
  * @author
  */
@@ -38,4 +38,4 @@ public class CmHeHeImageVo implements Serializable {
     private String jumpImage;
 
     private static final long serialVersionUID = 1L;
-}
+}

src/main/java/com/caimei/model/vo/OrderProductVo.java

@@ -231,7 +231,7 @@ public class OrderProductVo implements Serializable {
     private Integer cancelNum;
 
     /**
-     * 分销者id(呵呵商城订单使用)
+     * 分销者id(颜选美学商城订单使用)
      */
     private Integer heUserId;
 

src/main/java/com/caimei/service/impl/HeliPayServiceImpl.java

@@ -222,14 +222,14 @@ public class HeliPayServiceImpl implements HeliPayService {
                     BigDecimal couponAmount = couponMapper.getCouponAmount(couponId);
                     HashMap<String, Object> map = new HashMap<>();
                     String mobile = couponMapper.getUserMobile(couponShare.getShareUserId());
-                    String content = "恭喜您邀请的好友已成功消费一笔订单，现赠送" + couponAmount + "元优惠券到您的领券中心，请赶紧登录呵呵商城小程序领取下单吧。退订回T";
+                    String content = "恭喜您邀请的好友已成功消费一笔订单，现赠送" + couponAmount + "元优惠券到您的领券中心，请赶紧登录颜选美学商城小程序领取下单吧。退订回T";
                     map.put("type", 3);
                     map.put("mobile", mobile);
                     map.put("content", content);
                     String url = cloudApi + "/tools/sms/send";
                     try {
                         String result = HttpRequest.sendPost(url, map);
-                        log.info("【呵呵好友消费券派送】mobile:" + mobile + ",result:" + result);
+                        log.info("【颜选美学好友消费券派送】mobile:" + mobile + ",result:" + result);
                         // 保存短信发送条数+count
                         couponMapper.updateSmsSendCount(19, 1);
                     } catch (Exception e) {
@@ -267,7 +267,7 @@ public class HeliPayServiceImpl implements HeliPayService {
                         String mobile = collageMapper.getUserMobileByOrderId(orderId);
                         List<String> mobileList = collageMapper.getMobilesByCollageId(collage.getId());
                         mobileList.add(mobile);
-                        String content = "您的商品已拼团成功，请赶紧登录呵呵商城小程序查看订单吧。";
+                        String content = "您的商品已拼团成功，请赶紧登录颜选美学商城小程序查看订单吧。";
                         map.put("type", 1);
                         map.put("content", content);
                         String url = cloudApi + "/tools/sms/send";
@@ -275,7 +275,7 @@ public class HeliPayServiceImpl implements HeliPayService {
                             for (String userMobile : mobileList) {
                                 map.put("mobile", userMobile);
                                 String result = HttpRequest.sendPost(url, map);
-                                log.info("【呵呵拼团成功短信派送】mobile:" + mobile + ",result:" + result);
+                                log.info("【颜选美学拼团成功短信派送】mobile:" + mobile + ",result:" + result);
                             }
                         } catch (Exception e) {
                             e.printStackTrace();

src/main/java/com/caimei/service/impl/PayOrderServiceImpl.java

@@ -239,7 +239,7 @@ public class PayOrderServiceImpl implements PayOrderService {
                     String url = cloudApi + "/tools/sms/send";
                     try {
                         String result = HttpRequest.sendPost(url, map);
-                        log.info("【呵呵好友消费券派送】mobile:" + mobile + ",result:" + result);
+                        log.info("【颜选美学好友消费券派送】mobile:" + mobile + ",result:" + result);
                         // 保存短信发送条数+count
                         couponMapper.updateSmsSendCount(19, 1);
                     } catch (Exception e) {
@@ -285,7 +285,7 @@ public class PayOrderServiceImpl implements PayOrderService {
                             for (String userMobile : mobileList) {
                                 map.put("mobile", userMobile);
                                 String result = HttpRequest.sendPost(url, map);
-                                log.info("【呵呵拼团成功短信派送】mobile:" + mobile + ",result:" + result);
+                                log.info("【颜选美学拼团成功短信派送】mobile:" + mobile + ",result:" + result);
                             }
                         } catch (Exception e) {
                             e.printStackTrace();

src/main/resources/backup.sql

@@ -10,7 +10,7 @@ CREATE TABLE `cm_hehe_user`(
   `addTime` DATETIME COMMENT '添加时间',
   PRIMARY KEY (`id`)
 ) ENGINE=INNODB CHARSET=utf8mb4
-COMMENT='呵呵商城用户表';
+COMMENT='颜选美学商城用户表';
 
 CREATE TABLE `cm_hehe_product`(
   `id` INT NOT NULL AUTO_INCREMENT,
@@ -26,7 +26,7 @@ CREATE TABLE `cm_hehe_product`(
   `addTime` DATETIME COMMENT '添加时间',
   PRIMARY KEY (`id`)
 ) ENGINE=INNODB CHARSET=utf8mb4
-COMMENT='呵呵商城商品表';
+COMMENT='颜选美学商城商品表';
 
 CREATE TABLE `cm_hehe_image`(
   `id` INT NOT NULL AUTO_INCREMENT,
@@ -37,7 +37,7 @@ CREATE TABLE `cm_hehe_image`(
   `addTime` DATETIME COMMENT '添加时间',
   PRIMARY KEY (`id`)
 ) ENGINE=INNODB CHARSET=utf8mb4
-COMMENT='呵呵商城轮播图表';
+COMMENT='颜选美学商城轮播图表';
 
 CREATE TABLE `cm_hehe_activity`(
   `id` INT NOT NULL AUTO_INCREMENT,
@@ -51,17 +51,17 @@ CREATE TABLE `cm_hehe_activity`(
   `delFlag` CHAR(1) COMMENT '删除标识：0未删除，1已删除',
   PRIMARY KEY (`id`)
 ) ENGINE=INNODB CHARSET=utf8mb4
-COMMENT='呵呵商城活动表';
+COMMENT='颜选美学商城活动表';
 
 CREATE TABLE `cm_hehe_activity_product`(
   `id` INT NOT NULL AUTO_INCREMENT,
-  `activityId` INT COMMENT '呵呵活动id',
+  `activityId` INT COMMENT '颜选美学活动id',
   `productId` INT COMMENT '对应采美商品id',
   `addTime` DATETIME COMMENT '添加时间',
   `delFlag` CHAR(1) COMMENT '删除标识：0未删除，1已删除',
   PRIMARY KEY (`id`)
 ) ENGINE=INNODB CHARSET=utf8mb4
-COMMENT='呵呵商城活动商品表';
+COMMENT='颜选美学商城活动商品表';
 
 CREATE TABLE `cm_hehe_activity_ladder`(
   `id` INT NOT NULL AUTO_INCREMENT,
@@ -73,12 +73,12 @@ CREATE TABLE `cm_hehe_activity_ladder`(
   `createDate` DATETIME COMMENT '创建时间',
   PRIMARY KEY (`id`)
 ) ENGINE=INNODB CHARSET=utf8mb4
-COMMENT='呵呵商城活动阶梯表';
+COMMENT='颜选美学商城活动阶梯表';
 
 ALTER TABLE `user`
-  CHANGE `userPermission` `userPermission` INT DEFAULT 0  NULL   COMMENT '用户权限 0游客 1 普通用户 2 会员机构 3 供应商 4 协销 5 普通机构 6 呵呵商城用户【V6.2.0版本后0和1不存在】',
-  CHANGE `userIdentity` `userIdentity` INT DEFAULT 0  NULL   COMMENT '用户身份 0、个人 1、协销 2、会员机构 3、供应商 4.普通机构 6、呵呵商城用户【V6.2.0版本后0不存在】',
-  CHANGE `registerUserTypeID` `registerUserTypeID` INT NULL   COMMENT '见枚举UserType(1供应商,2协销经理,32协销,3会员机构,4普通机构,6呵呵商城)';
+  CHANGE `userPermission` `userPermission` INT DEFAULT 0  NULL   COMMENT '用户权限 0游客 1 普通用户 2 会员机构 3 供应商 4 协销 5 普通机构 6 颜选美学商城用户【V6.2.0版本后0和1不存在】',
+  CHANGE `userIdentity` `userIdentity` INT DEFAULT 0  NULL   COMMENT '用户身份 0、个人 1、协销 2、会员机构 3、供应商 4.普通机构 6、颜选美学商城用户【V6.2.0版本后0不存在】',
+  CHANGE `registerUserTypeID` `registerUserTypeID` INT NULL   COMMENT '见枚举UserType(1供应商,2协销经理,32协销,3会员机构,4普通机构,6颜选美学商城)';
 
 CREATE TABLE `cm_hehe_user_activity`(
   `id` INT NOT NULL AUTO_INCREMENT,
@@ -89,16 +89,16 @@ CREATE TABLE `cm_hehe_user_activity`(
   `addTime` DATETIME NULL COMMENT '添加时间',
   PRIMARY KEY (`id`)
 ) ENGINE=INNODB CHARSET=utf8mb4
-COMMENT='呵呵分销用户活动商品表';
+COMMENT='颜选美学分销用户活动商品表';
 
 ALTER TABLE `cm_order`
-  CHANGE `orderType` `orderType` INT NULL   COMMENT '订单类型 0协销订单、 1普通订单、 2呵呵订单';
+  CHANGE `orderType` `orderType` INT NULL   COMMENT '订单类型 0协销订单、 1普通订单、 2颜选美学订单';
 
 ALTER TABLE `cm_cart`
-  ADD COLUMN `heUserId` INT NULL  COMMENT '呵呵分销者userId' AFTER `reBuyFlag`;
+  ADD COLUMN `heUserId` INT NULL  COMMENT '颜选美学分销者userId' AFTER `reBuyFlag`;
 
 ALTER TABLE `cm_order_product`
-  ADD COLUMN `heUserId` INT NULL   COMMENT '分销者id(呵呵商城订单使用)' AFTER `cancelNum`;
+  ADD COLUMN `heUserId` INT NULL   COMMENT '分销者id(颜选美学商城订单使用)' AFTER `cancelNum`;
 # -------------------------------------------商品楼层优化start---------------------------------------------------
 # 创建首页楼层表
 CREATE TABLE `cm_hehe_floor` (
@@ -112,7 +112,7 @@ CREATE TABLE `cm_hehe_floor` (
     ENGINE = InnoDB
     DEFAULT CHARACTER SET = utf8
     COLLATE = utf8_bin
-    COMMENT = '呵呵商城首页楼层';
+    COMMENT = '颜选美学商城首页楼层';
 
 # 删除字段
 ALTER TABLE `caimei`.`cm_hehe_product`
@@ -132,5 +132,5 @@ CREATE TABLE `cm_hehe_floor_product` (
     ENGINE = InnoDB
     DEFAULT CHARACTER SET = utf8
     COLLATE = utf8_bin
-    COMMENT = '呵呵商品楼层商品表';
-# -------------------------------------------商品楼层优化end------------------------------------------------
+    COMMENT = '颜选美学商品楼层商品表';
+# -------------------------------------------商品楼层优化end------------------------------------------------