Merge remote-tracking branch 'origin/master'

audio-analysis/pom.xml

@@ -28,11 +28,6 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-		</dependency>
-
-		<dependency>
 			<groupId>com.alibaba.cloud</groupId>
 			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
 		</dependency>

audio-analysis/src/main/java/com/yonge/audio/AudioAnalysisServerApplication.java

@@ -21,9 +21,9 @@ import com.yonge.audio.config.LocalFastJsonHttpMessageConverter;
 
 @SpringBootApplication
 @EnableDiscoveryClient
-@EnableFeignClients("com.ym.mec")
-@MapperScan("com.ym.mec.biz.dal.dao")
-@ComponentScan(basePackages = { "com.yonge.netty", "com.ym.mec", "com.yonge.log" })
+@EnableFeignClients("com.yonge.cooleshow")
+@MapperScan("com.yonge.cooleshow.biz.dal.dao")
+@ComponentScan(basePackages = {"com.yonge.netty", "com.yonge.cooleshow.auth", "com.yonge.cooleshow.biz", "com.yonge.cooleshow.common", "com.yonge.cooleshow.common.security","com.yonge.toolset.thirdparty" })
 @Configuration
 @EnableSwagger2Doc
 public class AudioAnalysisServerApplication {

audio-analysis/src/main/java/com/yonge/netty/common/message/MessageDispatcher.java

@@ -18,17 +18,10 @@ public class MessageDispatcher extends SimpleChannelInboundHandler<Message<?>> {
 	@Override
 	protected void channelRead0(ChannelHandlerContext ctx, Message<?> message) {
 		// 获得 type 对应的 MessageHandler 处理器
-		MessageHandler messageHandler = messageHandlerContainer.getMessageHandler(message.getType());
+		MessageHandler<?> messageHandler = messageHandlerContainer.getMessageHandler(message.getType());
 		// 获得 MessageHandler 处理器 的消息类
 		// Class<? extends Message> messageClass = MessageHandlerContainer.getMessageClass(messageHandler);
 		// 执行逻辑
-		executor.submit(new Runnable() {
-
-			@Override
-			public void run() {
-				messageHandler.execute(ctx.channel(), message.getData());
-			}
-
-		});
+		executor.submit(() -> messageHandler.execute(ctx.channel(), message.getData()));
 	}
 }

audio-analysis/src/main/java/com/yonge/netty/common/message/MessageHandler.java

@@ -10,7 +10,7 @@ public interface MessageHandler<T> {
 	 * @param channel 通道
 	 * @param message 消息
 	 */
-	void execute(Channel channel, T message);
+	void execute(Channel channel, Object message);
 
 	/**
 	 * @return 消息类型，即每个 Message 实现类上的 TYPE 静态字段

audio-analysis/src/main/resources/application-template.yml

@@ -1,128 +0,0 @@
-server:
-  port: 9004
-  tomcat:
-    accesslog:
-      enabled: true
-      buffered: true
-      directory: /var/logs
-      file-date-format: -yyyy-MM-dd
-      pattern: common
-      prefix: tomcat-audio
-      rename-on-rotate: false
-      request-attributes-enabled: false
-      rotate: true
-      suffix: .log
-      
-netty:
-  server:
-    port: 8090
-
-eureka:
-  client:
-    serviceUrl:
-      defaultZone: http://admin:admin123@localhost:8761/eureka/eureka/
-    instance: 
-      lease-renewal-interval-in-seconds: 5
-
-spring:
-  application:
-    name: audio-analysis-server
-    
-  datasource:
-    name: test
-    url: jdbc:mysql://47.114.1.200:3306/mec_test?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-    username: mec_dev
-    password: dayaDataOnline@2019
-    # 使用druid数据源
-    type: com.alibaba.druid.pool.DruidDataSource
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    filters: stat
-    maxActive: 20
-    initialSize: 1
-    maxWait: 60000
-    minIdle: 1
-    timeBetweenEvictionRunsMillis: 60000
-    minEvictableIdleTimeMillis: 300000
-    validationQuery: select 'x'
-    testWhileIdle: true
-    testOnBorrow: false
-    testOnReturn: false
-    poolPreparedStatements: true
-    maxOpenPreparedStatements: 20
-  
-  redis:
-    host: 47.114.1.200
-    port: 6379
-    password: dyym
-    database: 1
-    #连接超时时间（毫秒）
-    timeout: 10000
-    jedis:
-      pool:
-        #连接池最大连接数（使用负值表示没有限制）
-        max-active: 20
-        #连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-wait: 10000
-        #连接池中的最大空闲连接
-        max-idle: 10
-        #连接池中的最小空闲连接
-        min-idle: 5
-    
-
-mybatis:
-    mapperLocations: classpath:config/mybatis/*.xml
-    
-swagger:
-  base-package: com.yonge.audo.controller
-          
-##认证 
-security:
-  oauth2:
-    client:
-      client-id: app
-      client-secret: app
-    resource:
-      token-info-uri: http://localhost:8001/oauth/check_token
-  
-#spring boot admin 相关配置
-management:
-  endpoints:
-    web:
-      exposure:
-        include: "*"
-  endpoint:
-    health:
-      show-details: ALWAYS
-      
-
-ribbon:  
-    ReadTimeout: 60000  
-    ConnectTimeout: 60000
-
-message:
-  debugMode: true
-  
-##支付流水隐藏
-payment:
-  hiddenMode: false
-  #隐藏的支付方式
-  channel: YQPAY
-  
-eseal:
-  tsign:
-    projectid: 4438776254
-    projectSecret: a94cf63d6361084d232f345d71321691
-    apisUrl: http://smlitsm.tsign.cn:8080/tgmonitor/rest/app!getAPIInfo2
-
-push:
-  jiguang:
-    reqURL: https://api.jpush.cn/v3/push
-    appKey:
-      student: 0e7422e1d6e73637e678716a
-      teacher: 7e0282ca92c12c8c45a93bb3
-      system: 496fc1007dea59b1b4252d2b
-    masterSecret:
-      student: c2361016604eab56ab2db2ac
-      teacher: d47430e2f4755ef5dc050ac5
-      system: a5e51e9cdb25417463afbf7a
-    apns_production: false

audio-analysis/src/main/resources/bootstrap-dev.yml

@@ -0,0 +1,11 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        server-addr: 47.114.1.200:8848
+        namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
+        group: DEFAULT_GROUP
+        prefix: audio-analysis-dev
+        file-extension: yaml
+        enabled: true
+        refresh-enabled: true

audio-analysis/src/main/resources/bootstrap-prod.properties

@@ -1,16 +0,0 @@
-#\u6307\u5b9a\u5f00\u53d1\u73af\u5883
-#spring.profiles.active=dev
-#\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=47.96.80.97:8848
-#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=f40a7594-4bd0-4bc6-8397-9353c6d2e63a
-#\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
-spring.cloud.nacos.config.group=DEFAULT_GROUP
-#\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
-spring.cloud.nacos.config.prefix=audio-analysis
-#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
-spring.cloud.nacos.config.file-extension=yaml
-#\u662f\u5426\u52a8\u6001\u5237\u65b0
-spring.cloud.nacos.config.refresh.enabled=true
-#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
-spring.cloud.nacos.config.enabled=true

audio-analysis/src/main/resources/bootstrap-sim.properties

@@ -1,16 +0,0 @@
-#\u6307\u5b9a\u5f00\u53d1\u73af\u5883
-#spring.profiles.active=dev
-#\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=47.114.1.200:8848
-#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=763783fd-dfd1-4a44-857e-42a27448c42c
-#\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
-spring.cloud.nacos.config.group=DEFAULT_GROUP
-#\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
-spring.cloud.nacos.config.prefix=audio-analysis
-#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
-spring.cloud.nacos.config.file-extension=yaml
-#\u662f\u5426\u52a8\u6001\u5237\u65b0
-spring.cloud.nacos.config.refresh.enabled=true
-#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
-spring.cloud.nacos.config.enabled=true

audio-analysis/src/main/resources/bootstrap-test.properties

@@ -1,16 +0,0 @@
-#\u6307\u5b9a\u5f00\u53d1\u73af\u5883
-#spring.profiles.active=dev
-#\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=47.114.176.40:8848
-#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=46f06363-b9d6-46f0-9cd7-7b33dcf26bb0
-#\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
-spring.cloud.nacos.config.group=DEFAULT_GROUP
-#\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
-spring.cloud.nacos.config.prefix=audio-analysis
-#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
-spring.cloud.nacos.config.file-extension=yaml
-#\u662f\u5426\u52a8\u6001\u5237\u65b0
-spring.cloud.nacos.config.refresh.enabled=true
-#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
-spring.cloud.nacos.config.enabled=true

audio-analysis/src/main/resources/logback-spring.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="10 seconds">
+
+	<property name="LOG_HOME" value="/mdata/logs/audio-analysis-%d{yyyy-MM-dd_HH}-%i.log" />
+	<property name="CONSOLE_LOG_PATTERN"
+		value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
+
+	<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder charset="UTF-8">
+			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
+		</encoder>
+	</appender>
+
+	<appender name="file"
+		class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<FileNamePattern>${LOG_HOME}</FileNamePattern>
+			<MaxHistory>90</MaxHistory>
+			<TimeBasedFileNamingAndTriggeringPolicy
+				class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+				<MaxFileSize>20MB</MaxFileSize>
+			</TimeBasedFileNamingAndTriggeringPolicy>
+		</rollingPolicy>
+
+		<encoder>
+			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
+		</encoder>
+	</appender>
+
+	<logger name="com.yonge" level="info" />
+
+	<!--开发环境:打印控制台 -->
+	<springProfile name="dev">
+		<root level="dev">
+			<appender-ref ref="stdout" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
+	
+	<springProfile name="test">
+		<root level="info">
+			<appender-ref ref="stdout" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
+
+	<!--生产环境:输出到文件 -->
+	<springProfile name="prod">
+		<root level="WARN">
+			<appender-ref ref="stdout" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
+
+</configuration>

cooleshow-cms/src/main/resources/config/mybatis/HelpCenterContentMapper.xml

@@ -31,7 +31,8 @@
 				and content.title_ like '%' #{title} '%'
 			</if>
 			<if test="status!= null">
-				and content.status_ = #{status}
+				and ((content.status_ = #{status} and content.catalog_id_ = 1)
+					or (content.release_status_ = #{status} and content.catalog_id_ = 2))
 			</if>
 			<if test="catalogType != null and catalogType != ''">
 				and content.catalog_type_ = #{catalogType}
@@ -212,7 +213,7 @@
 	<insert id="noticeReleaseToStudent">
 		insert into sys_message
 		(
-		user_id_,type_, title_, content_,status_, receiver_, send_time_,  create_on_, modify_on_,  group_, client_id_
+		user_id_,type_, title_, content_,status_, receiver_, send_time_,  create_on_, modify_on_,  group_, client_id_,message_config_id_
 		)
 		SELECT
 		t.user_id_,
@@ -222,7 +223,7 @@
 		2,
 		su.phone_,
 		#{param.releaseTime},
-		now(),now(),'NOTICE','STUDENT'
+		now(),now(),'NOTICE','STUDENT',48
 		from student t
 		left join sys_user su on su.id_ = t.user_id_
 	</insert>

cooleshow-mall/mall-mbg/src/main/java/com/yonge/cooleshow/mbg/model/OmsOrderReturnApply.java

@@ -86,6 +86,9 @@ public class OmsOrderReturnApply implements Serializable {
     @ApiModelProperty(value = "收货备注")
     private String receiveNote;
 
+    @ApiModelProperty("退货单号")
+    private String deliverySn;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -341,4 +344,12 @@ public class OmsOrderReturnApply implements Serializable {
         sb.append("]");
         return sb.toString();
     }
+
+    public String getDeliverySn() {
+        return deliverySn;
+    }
+
+    public void setDeliverySn(String deliverySn) {
+        this.deliverySn = deliverySn;
+    }
 }

cooleshow-mall/mall-mbg/src/main/resources/config/mybatis/OmsOrderReturnApplyMapper.xml

@@ -29,6 +29,7 @@
     <result column="receive_man" jdbcType="VARCHAR" property="receiveMan" />
     <result column="receive_time" jdbcType="TIMESTAMP" property="receiveTime" />
     <result column="receive_note" jdbcType="VARCHAR" property="receiveNote" />
+    <result column="delivery_sn" jdbcType="VARCHAR" property="deliverySn" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -92,7 +93,7 @@
     id, order_id, company_address_id, product_id, order_sn, create_time, member_username, 
     return_amount, return_name, return_phone, status, handle_time, product_pic, product_name, 
     product_brand, product_attr, product_count, product_price, product_real_price, reason, 
-    description, proof_pics, handle_note, handle_man, receive_man, receive_time, receive_note
+    description, proof_pics, handle_note, handle_man, receive_man, receive_time, receive_note,delivery_sn
   </sql>
   <select id="selectByExample" parameterType="com.yonge.cooleshow.mbg.model.OmsOrderReturnApplyExample" resultMap="BaseResultMap">
     select
@@ -136,7 +137,7 @@
       product_count, product_price, product_real_price, 
       reason, description, proof_pics, 
       handle_note, handle_man, receive_man, 
-      receive_time, receive_note)
+      receive_time, receive_note,delivery_sn)
     values (#{orderId,jdbcType=BIGINT}, #{companyAddressId,jdbcType=BIGINT}, #{productId,jdbcType=BIGINT}, 
       #{orderSn,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{memberUsername,jdbcType=VARCHAR}, 
       #{returnAmount,jdbcType=DECIMAL}, #{returnName,jdbcType=VARCHAR}, #{returnPhone,jdbcType=VARCHAR}, 
@@ -145,7 +146,7 @@
       #{productCount,jdbcType=INTEGER}, #{productPrice,jdbcType=DECIMAL}, #{productRealPrice,jdbcType=DECIMAL}, 
       #{reason,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{proofPics,jdbcType=VARCHAR}, 
       #{handleNote,jdbcType=VARCHAR}, #{handleMan,jdbcType=VARCHAR}, #{receiveMan,jdbcType=VARCHAR}, 
-      #{receiveTime,jdbcType=TIMESTAMP}, #{receiveNote,jdbcType=VARCHAR})
+      #{receiveTime,jdbcType=TIMESTAMP}, #{receiveNote,jdbcType=VARCHAR},#{deliverySn})
   </insert>
   <insert id="insertSelective" parameterType="com.yonge.cooleshow.mbg.model.OmsOrderReturnApply">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
@@ -231,6 +232,9 @@
       <if test="receiveNote != null">
         receive_note,
       </if>
+      <if test="deliverySn != null">
+        delivery_sn,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="orderId != null">
@@ -311,6 +315,9 @@
       <if test="receiveNote != null">
         #{receiveNote,jdbcType=VARCHAR},
       </if>
+      <if test="deliverySn != null">
+          #{deliverySn,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.yonge.cooleshow.mbg.model.OmsOrderReturnApplyExample" resultType="java.lang.Long">
@@ -403,6 +410,9 @@
       <if test="record.receiveNote != null">
         receive_note = #{record.receiveNote,jdbcType=VARCHAR},
       </if>
+      <if test="record.deliverySn != null">
+        delivery_sn = #{record.deliverySn,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -436,7 +446,8 @@
       handle_man = #{record.handleMan,jdbcType=VARCHAR},
       receive_man = #{record.receiveMan,jdbcType=VARCHAR},
       receive_time = #{record.receiveTime,jdbcType=TIMESTAMP},
-      receive_note = #{record.receiveNote,jdbcType=VARCHAR}
+      receive_note = #{record.receiveNote,jdbcType=VARCHAR},
+      delivery_sn = #{record.deliverySn,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -522,6 +533,9 @@
       <if test="receiveNote != null">
         receive_note = #{receiveNote,jdbcType=VARCHAR},
       </if>
+      <if test="deliverySn != null">
+        delivery_sn = #{deliverySn,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -552,7 +566,8 @@
       handle_man = #{handleMan,jdbcType=VARCHAR},
       receive_man = #{receiveMan,jdbcType=VARCHAR},
       receive_time = #{receiveTime,jdbcType=TIMESTAMP},
-      receive_note = #{receiveNote,jdbcType=VARCHAR}
+      receive_note = #{receiveNote,jdbcType=VARCHAR},
+      delivery_sn = #{deliverySn,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/controller/OmsPortalOrderReturnApplyController.java

@@ -6,6 +6,7 @@ import com.yonge.cooleshow.mbg.model.OmsOrderReturnApply;
 import com.yonge.cooleshow.mbg.model.OmsOrderReturnReason;
 import com.yonge.cooleshow.portal.domain.OmsOrderReturnApplyParam;
 import com.yonge.cooleshow.portal.dto.OmsOrderReturnApplyResult;
+import com.yonge.cooleshow.portal.dto.OmsReturnApplyDto;
 import com.yonge.cooleshow.portal.dto.OmsReturnApplyQueryParam;
 import com.yonge.cooleshow.portal.service.OmsOrderReturnReasonService;
 import com.yonge.cooleshow.portal.service.OmsPortalOrderReturnApplyService;
@@ -79,4 +80,13 @@ public class OmsPortalOrderReturnApplyController {
         OmsOrderReturnApplyResult result = returnApplyService.getItem(id);
         return CommonResult.success(result);
     }
+
+
+    @ApiOperation("设置退货单号")
+    @PostMapping(value = "/deliverySn")
+    @ResponseBody
+    public CommonResult getItem(@RequestBody OmsReturnApplyDto applyDto) {
+        returnApplyService.setDeliverySn(applyDto);
+        return CommonResult.success(true);
+    }
 }

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/dto/OmsReturnApplyDto.java

@@ -0,0 +1,33 @@
+package com.yonge.cooleshow.portal.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+
+/**
+ * 订单退货申请查询参数
+ * Created by macro on 2018/10/18.
+ */
+
+public class OmsReturnApplyDto {
+    @ApiModelProperty("服务单号")
+    private Long id;
+    @ApiModelProperty(value = "快递单号")
+    private String deliverySn;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getDeliverySn() {
+        return deliverySn;
+    }
+
+    public void setDeliverySn(String deliverySn) {
+        this.deliverySn = deliverySn;
+    }
+}

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/OmsPortalOrderReturnApplyService.java

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.portal.service;
 import com.yonge.cooleshow.mbg.model.OmsOrderReturnApply;
 import com.yonge.cooleshow.portal.domain.OmsOrderReturnApplyParam;
 import com.yonge.cooleshow.portal.dto.OmsOrderReturnApplyResult;
+import com.yonge.cooleshow.portal.dto.OmsReturnApplyDto;
 import com.yonge.cooleshow.portal.dto.OmsReturnApplyQueryParam;
 
 import java.util.List;
@@ -26,4 +27,7 @@ public interface OmsPortalOrderReturnApplyService {
     OmsOrderReturnApplyResult getItem(Long id);
 
     List<OmsOrderReturnApply> list(OmsReturnApplyQueryParam queryParam, Integer pageSize, Integer pageNum);
+
+    /** 设置退货单号 */
+    void setDeliverySn(OmsReturnApplyDto applyDto);
 }

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderReturnApplyServiceImpl.java

@@ -7,6 +7,7 @@ import com.yonge.cooleshow.mbg.model.OmsOrderReturnApplyExample;
 import com.yonge.cooleshow.portal.dao.OmsOrderReturnApplyDao;
 import com.yonge.cooleshow.portal.domain.OmsOrderReturnApplyParam;
 import com.yonge.cooleshow.portal.dto.OmsOrderReturnApplyResult;
+import com.yonge.cooleshow.portal.dto.OmsReturnApplyDto;
 import com.yonge.cooleshow.portal.dto.OmsReturnApplyQueryParam;
 import com.yonge.cooleshow.portal.service.OmsPortalOrderReturnApplyService;
 import org.springframework.beans.BeanUtils;
@@ -59,4 +60,12 @@ public class OmsPortalOrderReturnApplyServiceImpl implements OmsPortalOrderRetur
         PageHelper.startPage(pageNum, pageSize);
         return returnApplyDao.getList(queryParam);
     }
+
+    @Override
+    public void setDeliverySn(OmsReturnApplyDto applyDto) {
+        OmsOrderReturnApply omsOrderReturnApply = new OmsOrderReturnApply();
+        omsOrderReturnApply.setId(applyDto.getId());
+        omsOrderReturnApply.setDeliverySn(applyDto.getDeliverySn());
+        returnApplyMapper.updateByPrimaryKey(omsOrderReturnApply);
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/Mapper.java

@@ -1,7 +1,10 @@
 package com.yonge.cooleshow.biz.dal.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+
 public class Mapper {
 
+	@ApiModelProperty("SYSTEM：系统消息  COURSE:课程信息 NOTICE:公告")
 	private Object key;
 	
 	private Object value;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/SysMessage.java

@@ -15,6 +15,13 @@ public class SysMessage extends BaseEntity {
 
 	/** 主键 */
 	private Long id;
+
+	@ApiModelProperty("消息配置表id")
+	private Long messageConfigId;
+
+	@ApiModelProperty("TEACHER_AUTH:老师认证,MUSICIAN_AUTH:音乐人认证,PRACTICE:陪练课,LIVE:直播课,VIDEO:视频课,MUSIC_SHEET:乐谱," +
+			"COURSE:课程,INCOME:收入,HOMEWORK:作业,EVALUATE:评价,GROUP_CHAT:群聊,VIP:会员,NOTICE:公告")
+	private String subType;
 	
 	/** 标题 */
 	@ApiModelProperty(value = "标题",required = false)
@@ -205,4 +212,19 @@ public class SysMessage extends BaseEntity {
 		return ToStringBuilder.reflectionToString(this);
 	}
 
+	public Long getMessageConfigId() {
+		return messageConfigId;
+	}
+
+	public void setMessageConfigId(Long messageConfigId) {
+		this.messageConfigId = messageConfigId;
+	}
+
+	public String getSubType() {
+		return subType;
+	}
+
+	public void setSubType(String subType) {
+		this.subType = subType;
+	}
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/SysMessageConfig.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
+import com.yonge.cooleshow.biz.dal.enums.MessageIconTypeEnum;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
@@ -15,6 +16,9 @@ public class SysMessageConfig {
 	/** 消息类型 */
 	private MessageTypeEnum messageType;
 
+	/** 消息二级类型  */
+	private MessageIconTypeEnum  subType;
+
 	/** 消息内容 */
 	private String content;
 
@@ -100,4 +104,11 @@ public class SysMessageConfig {
 		return ToStringBuilder.reflectionToString(this);
 	}
 
+	public MessageIconTypeEnum getSubType() {
+		return subType;
+	}
+
+	public void setSubType(MessageIconTypeEnum subType) {
+		this.subType = subType;
+	}
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/MessageIconTypeEnum.java

@@ -0,0 +1,56 @@
+package com.yonge.cooleshow.biz.dal.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.yonge.toolset.base.enums.BaseEnum;
+
+/**
+ * Description
+ *
+ * @author liujunchi
+ * @date 2022-05-09
+ */
+public enum MessageIconTypeEnum implements BaseEnum<String,MessageIconTypeEnum> {
+
+    TEACHER_AUTH("TEACHER_AUTH","老师认证"),
+    MUSICIAN_AUTH("MUSICIAN_AUTH","音乐人认证"),
+    PRACTICE("PRACTICE","陪练课"),
+    LIVE("LIVE","直播课"),
+    VIDEO("VIDEO","视频课"),
+    MUSIC_SHEET("MUSIC_SHEET","乐谱"),
+    COURSE("COURSE","课程"),
+    INCOME("INCOME","收入"),
+    HOMEWORK("HOMEWORK","作业"),
+    EVALUATE("EVALUATE","评价"),
+    GROUP_CHAT("GROUP_CHAT","群聊"),
+    VIP("VIP","会员"),
+
+    ;
+
+    MessageIconTypeEnum(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    @EnumValue
+    private String code;
+
+    private String msg;
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+
+    public String getCode() {
+        return code;
+    }
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SysMessageServiceImpl.java

@@ -112,7 +112,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	 * @return
 	 */
 	private int addMessage(Map<Long, String> receivers, String subject, String content, Date triggerTime, MessageSendMode mode, SendStatusEnum status,
-			String errorMsg, Integer readStatus, String memo, String group,String jpushType) {
+			String errorMsg, Integer readStatus, String memo, String group,String jpushType,Long messageConfigId) {
 		SysMessage message = null;
 		Date date = new Date();
 
@@ -148,6 +148,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 			message.setMemo(memo);
 			message.setGroup(group);
 			message.setClientId(jpushType);
+			message.setMessageConfigId(messageConfigId);
 			messages.add(message);
 		}
 
@@ -245,7 +246,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 			mode = MessageSendMode.EMAIL;
 		}
 		addMessage(receivers, messageConfig.getDescription(), MessageFormatter.arrayFormat(messageConfig.getContent(), args), triggerTime, mode, status, errorMsg, readStatus,
-				url, messageConfig.getGroup(),jpushType);
+				url, messageConfig.getGroup(),jpushType,messageConfig.getId());
 	}
 
 	@Override
@@ -282,7 +283,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 			}
 		}
 		addMessage(receivers, messageConfig.getDescription(), MessageFormatter.arrayFormat(messageConfig.getContent(), args), triggerTime, MessageSendMode.PUSH, status, errorMsg, readStatus,
-				url, messageConfig.getGroup(),jpushType);
+				url, messageConfig.getGroup(),jpushType,messageConfig.getId());
 	}
 
 	@Override
@@ -319,7 +320,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		}
 		Map<Long, String> receivers = new HashMap<Long, String>();
 		receivers.put(userId, receiver);
-		addMessage(receivers, title, content, triggerTime, mode, status, errorMsg, readStatus, url, null,jpushType);
+		addMessage(receivers, title, content, triggerTime, mode, status, errorMsg, readStatus, url, null,jpushType,null);
 	}
 
 	@Override

cooleshow-user/user-biz/src/main/resources/config/mybatis/SysMessageConfigMapper.xml

@@ -11,6 +11,7 @@
 		<result column="description_" property="description" />
 		<result column="modify_on_" property="modifyOn" />
 		<result column="url_" property="url" />
+		<result column="sub_type_" property="subType" />
 		<result column="group_" property="group" />
 		<result column="send_flag_" property="sendFlag" />
 	</resultMap>
@@ -54,8 +55,8 @@
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO sys_message_config
-		(id_,message_type_,content_,description_,modify_on_,url_,group_)
-		VALUES(#{id},#{messageType},#{content},#{description},#{modifyOn},#{url},#{group})
+		(id_,message_type_,content_,description_,modify_on_,url_,group_,sub_type_)
+		VALUES(#{id},#{messageType},#{content},#{description},#{modifyOn},#{url},#{group},#{subType})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -84,7 +85,10 @@
 				description_ = #{description},
 			</if>
 			<if test="sendFlag != null">
-				send_flag_ = #{sendFlag}
+				send_flag_ = #{sendFlag},
+			</if>
+			<if test="subType != null">
+				sub_type_ = #{subType}
 			</if>
 		</set>
 		WHERE id_ = #{id}

cooleshow-user/user-biz/src/main/resources/config/mybatis/SysMessageMapper.xml

@@ -18,6 +18,8 @@
         <result column="create_on_" property="createOn"/>
         <result column="modify_on_" property="modifyOn"/>
         <result column="user_id_" property="userId"/>
+        <result column="message_config_id_" property="messageConfigId"/>
+        <result column="sub_type_" property="subType"/>
         <result column="memo_" property="memo"/>
         <result column="read_status_" property="readStatus"/>
         <result column="group_" property="group"/>
@@ -81,9 +83,9 @@
 
 	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.SysMessage">
 		insert into sys_message (user_id_,title_, content_,type_, receiver_,
-		send_time_, error_msg_,memo_, create_on_,modify_on_,group_,client_id_)
+		send_time_, error_msg_,memo_, create_on_,modify_on_,group_,client_id_,message_config_id_)
 		values (#{userId}, #{title},#{content},#{type},
-				#{receiver},now(),#{errorMsg},#{memo},now(),now(),#{group},#{clientId})
+				#{receiver},now(),#{errorMsg},#{memo},now(),now(),#{group},#{clientId},#{messageConfigId})
 	</insert>
 
 	<insert id="batchInsert" parameterType="com.yonge.cooleshow.biz.dal.entity.SysMessage">
@@ -91,7 +93,7 @@
 		title_, content_,
 		type_, status_, receiver_,
 		send_time_, error_msg_,read_status_,memo_, create_on_,
-		modify_on_,group_,client_id_)
+		modify_on_,group_,client_id_,message_config_id_)
 		values
 		<foreach collection="list" item="item" index="index"
 			separator=",">
@@ -102,7 +104,7 @@
 			#{item.status}, #{item.receiver,jdbcType=VARCHAR},
 			#{item.sendTime},#{item.errorMsg,jdbcType=VARCHAR},#{item.readStatus},#{item.memo},
 			#{item.createOn},
-			#{item.modifyOn},#{item.group},#{item.clientId})
+			#{item.modifyOn},#{item.group},#{item.clientId},#{item.messageConfigId})
 		</foreach>
 	</insert>
 
@@ -148,6 +150,9 @@
 			<if test="group != null">
 				group_ = #{group},
 			</if>
+			<if test="messageConfigId != null">
+				message_config_id_ = #{messageConfigId},
+			</if>
 		</set>
 		where id_ = #{id,jdbcType=BIGINT}
 	</update>
@@ -168,7 +173,10 @@
 	</select>
 
 	<select id="queryPage" parameterType="map" resultMap="message">
-		select m.* from sys_message m
+		select m.*,
+		smc.sub_type_
+		from sys_message m
+		left join sys_message_config smc on m.message_config_id_ = smc.id_
 		<include refid="queryCondition" />
 		order by m.create_on_ desc
 		<include refid="global.limit" />
@@ -190,7 +198,7 @@
 	<select id="queryCountOfUnread" resultMap="Mapper" parameterType="map">
 		SELECT group_ key_,COUNT(*) value_ FROM sys_message
 		WHERE user_id_ = #{userId} AND read_status_ = 0 and status_ = 2
-		AND (client_id_ = #{jpushType} OR client_id_ IS NULL)  and send_time_ &gt;= now()
+		AND (client_id_ = #{jpushType} OR client_id_ IS NULL)  and send_time_ &lt;= now()
 		<if test="type != null">
 		and type_ = #{type}
 		</if>