Merge remote-tracking branch 'origin/develop' into develop

computility-module-mall/computility-module-product/src/main/java/com/luhu/computility/module/product/controller/admin/spu/vo/ProductSpuSaveReqVO.java

@@ -20,15 +20,15 @@ public class ProductSpuSaveReqVO {
     private String name;
     private String name;
 
 
     @Schema(description = "关键字", requiredMode = Schema.RequiredMode.REQUIRED, example = "清凉丝滑不出汗")
     @Schema(description = "关键字", requiredMode = Schema.RequiredMode.REQUIRED, example = "清凉丝滑不出汗")
-    @NotEmpty(message = "商品关键字不能为空")
+    //@NotEmpty(message = "商品关键字不能为空")
     private String keyword;
     private String keyword;
 
 
     @Schema(description = "商品简介", requiredMode = Schema.RequiredMode.REQUIRED, example = "清凉小短袖简介")
     @Schema(description = "商品简介", requiredMode = Schema.RequiredMode.REQUIRED, example = "清凉小短袖简介")
-    @NotEmpty(message = "商品简介不能为空")
+    //@NotEmpty(message = "商品简介不能为空")
     private String introduction;
     private String introduction;
 
 
     @Schema(description = "商品详情", requiredMode = Schema.RequiredMode.REQUIRED, example = "清凉小短袖详情")
     @Schema(description = "商品详情", requiredMode = Schema.RequiredMode.REQUIRED, example = "清凉小短袖详情")
-    @NotEmpty(message = "商品详情不能为空")
+    //@NotEmpty(message = "商品详情不能为空")
     private String description;
     private String description;
 
 
     @Schema(description = "商品分类编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @Schema(description = "商品分类编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@@ -36,11 +36,11 @@ public class ProductSpuSaveReqVO {
     private Long categoryId;
     private Long categoryId;
 
 
     @Schema(description = "商品品牌编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @Schema(description = "商品品牌编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "商品品牌不能为空")
+    //@NotNull(message = "商品品牌不能为空")
     private Long brandId;
     private Long brandId;
 
 
     @Schema(description = "商品封面图", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/xx.png")
     @Schema(description = "商品封面图", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/xx.png")
-    @NotEmpty(message = "商品封面图不能为空")
+    //@NotEmpty(message = "商品封面图不能为空")
     private String picUrl;
     private String picUrl;
 
 
     @Schema(description = "商品轮播图", requiredMode = Schema.RequiredMode.REQUIRED,
     @Schema(description = "商品轮播图", requiredMode = Schema.RequiredMode.REQUIRED,
@@ -69,11 +69,11 @@ public class ProductSpuSaveReqVO {
     // ========== 营销相关字段 =========
     // ========== 营销相关字段 =========
 
 
     @Schema(description = "赠送积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "111")
     @Schema(description = "赠送积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "111")
-    @NotNull(message = "商品赠送积分不能为空")
+    //@NotNull(message = "商品赠送积分不能为空")
     private Integer giveIntegral;
     private Integer giveIntegral;
 
 
     @Schema(description = "分销类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
     @Schema(description = "分销类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
-    @NotNull(message = "商品分销类型不能为空")
+    //@NotNull(message = "商品分销类型不能为空")
     private Boolean subCommissionType;
     private Boolean subCommissionType;
 
 
     // ========== 统计相关字段 =========
     // ========== 统计相关字段 =========

computility-module-member/src/main/java/com/luhu/computility/module/member/controller/app/user/AppMemberUserController.java

@@ -52,7 +52,7 @@ public class AppMemberUserController {
     @Operation(summary = "获得基本信息")
     @Operation(summary = "获得基本信息")
     public CommonResult<AppEnterpriseUserInfoRespVO> getUserAndEnterpriseInfo() {
     public CommonResult<AppEnterpriseUserInfoRespVO> getUserAndEnterpriseInfo() {
         MemberUserDO user = userService.getUser(getLoginUserId());
         MemberUserDO user = userService.getUser(getLoginUserId());
-        EnterpriseDO enterprise = enterpriseService.getEnterprise(getLoginUserId());
+        EnterpriseDO enterprise = enterpriseService.getEnterpriseByUserId(getLoginUserId());
         AppEnterpriseUserInfoRespVO appEnterpriseUserInfoRespVO
         AppEnterpriseUserInfoRespVO appEnterpriseUserInfoRespVO
                 = BeanUtils.toBean(user, AppEnterpriseUserInfoRespVO.class);
                 = BeanUtils.toBean(user, AppEnterpriseUserInfoRespVO.class);
         if (!ObjectUtil.isEmpty(enterprise)) {
         if (!ObjectUtil.isEmpty(enterprise)) {

computility-module-member/src/main/java/com/luhu/computility/module/member/service/enterprise/EnterpriseService.java

@@ -60,10 +60,10 @@ public interface EnterpriseService {
     /**
     /**
      * 获得客户企业
      * 获得客户企业
      *
      *
-     * @param id 编号
+     * @param userId 编号
      * @return 客户企业
      * @return 客户企业
      */
      */
-    EnterpriseDO getEnterprise(Long id);
+    EnterpriseDO getEnterprise(Long userId);
 
 
     /**
     /**
      * 获得客户企业分页
      * 获得客户企业分页

computility-server/src/main/resources/application-dev.yaml

@@ -158,6 +158,8 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta
 
 
 # 芋道配置项，设置当前项目所有自定义的配置
 # 芋道配置项，设置当前项目所有自定义的配置
 computility:
 computility:
+  captcha:
+    enable: false # 本地环境，暂时关闭图片验证码，方便登录等接口的测试；
   pay:
   pay:
     order-notify-url: https://phsl.lijinqi.com/admin-api/pay/notify/order # 支付渠道的【支付】回调地址
     order-notify-url: https://phsl.lijinqi.com/admin-api/pay/notify/order # 支付渠道的【支付】回调地址
     refund-notify-url: https://phsl.lijinqi.com/admin-api/pay/notify/refund # 支付渠道的【退款】回调地址
     refund-notify-url: https://phsl.lijinqi.com/admin-api/pay/notify/refund # 支付渠道的【退款】回调地址