Merge branch 'future/strokeList' into 'master'

Future/stroke list

See merge request hewei/Jumeirah!70

api-merchant/src/main/java/com/jumeirah/api/merchant/controller/CharterIntroductionForMerController.java

@@ -60,7 +60,7 @@ public class CharterIntroductionForMerController extends BaseController {
      * 修改包机介绍
      * 修改包机介绍
      */
      */
     @PostMapping("/update")
     @PostMapping("/update")
-    @OperationLog(name = "修改包机介绍", type = OperationLogType.UPDATE)
+//    @OperationLog(name = "修改包机介绍", type = OperationLogType.UPDATE)
     @ApiOperation(value = "修改包机介绍")
     @ApiOperation(value = "修改包机介绍")
     @RequiresPermissions("merchant:aircraft:management:edit")
     @RequiresPermissions("merchant:aircraft:management:edit")
     public ApiResult<Boolean> updateCharterIntroduction(@Validated(Update.class) @RequestBody CharterIntroductionUpdateParam charterIntroductionUpdateParam) throws Exception {
     public ApiResult<Boolean> updateCharterIntroduction(@Validated(Update.class) @RequestBody CharterIntroductionUpdateParam charterIntroductionUpdateParam) throws Exception {

common/pom.xml

@@ -49,6 +49,14 @@
         </dependency>
         </dependency>
         <!--        极光 end -->
         <!--        极光 end -->
 
 
+        <!-- wecloud短信 start-->
+<!--        <dependency>-->
+<!--            <groupId>cn.wecloud</groupId>-->
+<!--            <artifactId>we-cloud-sdk-sms</artifactId>-->
+<!--            <version>0.0.1</version>-->
+<!--        </dependency>-->
+        <!-- wecloud短信 end-->
+
     </dependencies>
     </dependencies>
 
 
 </project>
 </project>
\ No newline at end of file

common/src/main/java/com/jumeirah/common/param/CharterIntroductionUpdateParam.java

@@ -24,10 +24,10 @@ public class CharterIntroductionUpdateParam extends BaseEntity {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     @ApiModelProperty("id")
     @ApiModelProperty("id")
-    private Integer id;
+    private Long id;
 
 
     @ApiModelProperty("包机图片url")
     @ApiModelProperty("包机图片url")
-    private List<ImgJson> imgUrl;
+    private List<ImgJson> imgList;
 
 
     @ApiModelProperty(value = "包机文字")
     @ApiModelProperty(value = "包机文字")
     private String text;
     private String text;

common/src/main/java/com/jumeirah/common/service/impl/CharterIntroductionServiceImpl.java

@@ -60,8 +60,9 @@ public class CharterIntroductionServiceImpl extends BaseServiceImpl<CharterIntro
 
 
         CharterIntroduction charterIntroduction = new CharterIntroduction();
         CharterIntroduction charterIntroduction = new CharterIntroduction();
         BeanUtils.copyProperties(charterIntroductionUpdateParam, charterIntroduction);
         BeanUtils.copyProperties(charterIntroductionUpdateParam, charterIntroduction);
-        if (charterIntroductionUpdateParam.getImgUrl() != null) {
-            charterIntroduction.setImgUrl(Jackson.toJsonString(charterIntroductionUpdateParam.getImgUrl()));
+
+        if (charterIntroductionUpdateParam.getImgList() != null) {
+            charterIntroduction.setImgUrl(Jackson.toJsonString(charterIntroductionUpdateParam.getImgList()));
         }
         }
         return super.updateById(charterIntroduction);
         return super.updateById(charterIntroduction);
     }
     }

common/src/main/java/com/jumeirah/common/vo/BusinessPlainQueryForAppVo.java

@@ -45,6 +45,9 @@ public class BusinessPlainQueryForAppVo implements Serializable {
     @ApiModelProperty("商家头像")
     @ApiModelProperty("商家头像")
     private String mcHead;
     private String mcHead;
 
 
+    @ApiModelProperty("推荐:  0不推荐  1推荐")
+    private Integer recommend;
+
     @TableField(typeHandler = FastjsonTypeHandler.class)
     @TableField(typeHandler = FastjsonTypeHandler.class)
     @ApiModelProperty("图片相关数据json (包括：路径，宽和高)")
     @ApiModelProperty("图片相关数据json (包括：路径，宽和高)")
     private List<ImgJson> imgList;
     private List<ImgJson> imgList;

common/src/main/resources/mapper/BusinessPlainMapper.xml

@@ -14,7 +14,8 @@
         wechat,
         wechat,
         status,
         status,
         create_time,
         create_time,
-        update_time
+        update_time,
+        recommend
     </sql>
     </sql>
 
 
     <sql id="Base_Column_ListForApp">
     <sql id="Base_Column_ListForApp">
@@ -24,7 +25,8 @@
         bp.name,
         bp.name,
         bp.phone,
         bp.phone,
         bp.wechat,
         bp.wechat,
-        m.`name` AS mcName
+        m.`name` AS mcName,
+        bp.recommend
     </sql>
     </sql>
 
 
     <select id="getBusinessPlainById" resultType="com.jumeirah.common.vo.BusinessPlainQueryVo">
     <select id="getBusinessPlainById" resultType="com.jumeirah.common.vo.BusinessPlainQueryVo">
@@ -56,6 +58,7 @@
         where bp.business_type = #{param.type}
         where bp.business_type = #{param.type}
             AND m.state = 1
             AND m.state = 1
             and m.audit_register_status = 1
             and m.audit_register_status = 1
+        ORDER BY bp.recommend DESC
     </select>
     </select>
 
 
     <resultMap id="pageListMapForApp" type="com.jumeirah.common.vo.BusinessPlainQueryForAppVo">
     <resultMap id="pageListMapForApp" type="com.jumeirah.common.vo.BusinessPlainQueryForAppVo">

config/src/main/resources/config/application-dev.yml

@@ -14,9 +14,9 @@ spring-boot-plus:
 
 
 spring:
 spring:
   datasource:
   datasource:
-    url: jdbc:mysql://47.99.47.225:3306/Jumeirah?serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
-    username: root
-    password: temple123456
+    url: jdbc:mysql://122.9.51.93:3306/jumeirah?serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
+    username: web
+    password: wBT7bC9BeUkE
 
 
   # Redis配置
   # Redis配置
   redis:
   redis:

config/src/main/resources/config/application-test.yml

@@ -15,15 +15,15 @@ spring-boot-plus:
 
 
 spring:
 spring:
   datasource:
   datasource:
-    url: jdbc:mysql://47.99.47.225:3306/Jumeirah?serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
-    username: root
-    password: temple123456
+    url: jdbc:mysql://122.9.51.93:3306/jumeirah?serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
+    username: web
+    password: wBT7bC9BeUkE
 
 
   # Redis配置
   # Redis配置
   redis:
   redis:
     database: 0
     database: 0
     host: 127.0.0.1
     host: 127.0.0.1
-    password: temple123456
+    password: LSlX0JKkD34U3oY3hwI5
     port: 6379
     port: 6379
 
 
 # 打印SQL语句和结果集，本地开发环境可开启，线上注释掉
 # 打印SQL语句和结果集，本地开发环境可开启，线上注释掉