消息通知

mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/SysMessageController.java

@@ -1,9 +1,12 @@
 package com.zscat.mallplus.ums.controller;
 
 
+import com.zscat.mallplus.ums.service.ISysMessageService;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+
 /**
  * <p>
  * 站内信 前端控制器
@@ -16,5 +19,8 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/ums/sysMessage")
 public class SysMessageController {
 
+    @Resource
+    private ISysMessageService messageService;
+
 }
 

mallplus-admin/src/main/resources/application-dev.properties

@@ -18,11 +18,11 @@ spring.redis.pool.min-idle=0
 # \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
 spring.redis.timeout=0
 #===redis end===
-#spring.datasource.url=jdbc:mysql://localhost:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://8.130.39.13:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8
+#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8
 spring.datasource.username=root
 #spring.datasource.password=root
-spring.datasource.password=root
+spring.datasource.password=1LAiGz$t1*Iw
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.druid.initialSize=5

mallplusui-web-admin/src/api/ums/sysMessage.js

@@ -0,0 +1,81 @@
+import request from '@/utils/request'
+export function fetchList(params) {
+  return request({
+    url:'/ums/UmsMember/list',
+    method:'get',
+    params:params
+  })
+}
+export function createMember(data) {
+  return request({
+    url:'/ums/UmsMember/create',
+    method:'post',
+    data:data
+  })
+}
+export function updateShowStatus(data) {
+  return request({
+    url:'/ums/UmsMember/update/showStatus',
+    method:'post',
+    data:data
+  })
+}
+
+export function updateFactoryStatus(data) {
+  return request({
+    url:'/ums/UmsMember/update/factoryStatus',
+    method:'post',
+    data:data
+  })
+}
+
+export function deleteMember(id) {
+  return request({
+    url:'/ums/UmsMember/delete/'+id,
+    method:'get',
+  })
+}
+
+export function getMember(id) {
+  return request({
+    url:'/ums/UmsMember/'+id,
+    method:'get',
+  })
+}
+
+export function updateMember(data) {
+  return request({
+    url:'/ums/UmsMember/update',
+    method:'post',
+    data:data
+  })
+}
+export function updateMemberOrderInfo() {
+  return request({
+    url:'/ums/UmsMember/updateMemberOrderInfo',
+    method:'post'
+  })
+}
+
+export function fetchBlanceList(id) {
+  return request({
+    url:'/ums/UmsMember/fetchBlanceList/'+id,
+    method:'get',
+  })
+}
+
+export function handleEditBlance(data) {
+  return request({
+    url:'/ums/UmsMember/handleEditBlance',
+    method:'post',
+    data:data
+  })
+}
+
+export function handleEditIntegration(data) {
+  return request({
+    url:'/ums/UmsMember/handleEditIntegration',
+    method:'post',
+    data:data
+  })
+}

mallplusui-web-admin/src/views/pms/product/components/ProductAttrDetail.vue

@@ -141,7 +141,8 @@
             <tinymce :width="595" :height="300" v-model="value.detailHtml"></tinymce>
           </el-tab-pane> -->
           <el-tab-pane label="移动端详情" name="mobile">
-            <tinymce :width="595" :height="300" v-model="value.detailMobileHtml"></tinymce>
+            <!-- <tinymce :width="595" :height="300" v-model="value.detailMobileHtml"></tinymce> -->
+            <tinymce :width="595" :height="300" v-model="value.detailHtml"></tinymce>
           </el-tab-pane>
         </el-tabs>
       </el-form-item>

mallplusui-web-admin/src/views/ums/member/index.vue

@@ -16,6 +16,18 @@
 		<el-card class="operate-container" shadow="never">
 			<i class="el-icon-tickets"></i>
 			<span>数据列表</span>
+<!-- 			<el-button
+							class="btn-add"
+							@click="addSubject()"
+							size="mini">
+					发送全员信息
+			</el-button>
+			<el-button
+							class="btn-add"
+							@click="addSubject()"
+							size="mini">
+					向选择全员发送信息
+			</el-button> -->
 		</el-card>
 		<div class="table-container">
 			<el-table ref="brandTable" :data="list" style="width: 100%" @selection-change="handleSelectionChange" v-loading="listLoading" border>
@@ -79,6 +91,7 @@
 				</el-table-column>
 				<el-table-column label="操作" width="250" align="center">
 					<template slot-scope="scope">
+						<el-button size="mini" type="danger" @click="sendMessageToOne(scope.$index, scope.row)">发送信息</el-button>
 						<el-button size="mini" type="danger" @click="addBlacne(scope.$index, scope.row)">余额充值</el-button>
 						<!-- <el-button size="mini" type="danger" @click="addIntegration(scope.$index, scope.row)">积分充值</el-button> -->
 						<el-button size="mini" type="danger" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
@@ -188,6 +201,22 @@
 				</el-form-item>
 			</el-form>
 		</el-dialog>
+
+		<el-dialog title="向指定会员发送信息" :visible.sync="dialogVisibleMessOne" width="40%">
+			<el-form :model="msgOne" ref="msgOneFrom" label-width="150px">
+				<el-form-item label="消息类型：" prop="code">
+					<el-select v-model="msgOne.code" placeholder="请选择">
+						<el-option  v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="充值积分：" prop="detail"><el-input v-model="integration.integration"></el-input></el-form-item>
+
+				<el-form-item>
+					<el-button @click="integration.dialogVisible = false">取 消</el-button>
+					<el-button type="primary" @click="handleEditIntegration">确 定</el-button>
+				</el-form-item>
+			</el-form>
+		</el-dialog>
 	</div>
 </template>
 <script>
@@ -200,6 +229,22 @@ export default {
 	name: 'memberList',
 	data() {
 		return {
+			messageCodeOptions: [{
+			          value: '云链助手',
+			          label: '云链助手'
+			        },{
+			          value: '交易物流',
+			          label: '交易物流'
+			        } ],
+			dialogVisibleMessOne: false,
+			msgOne:{
+				userId:null,
+				code:'',
+				params:'',
+				content:''
+			},
+			dialogVisibleMessSelect: false,
+			dialogVisibleMessAll: false,
 			dialogVisible: false,
 			dialogVisible1: false,
 			blanceList: null,
@@ -296,6 +341,9 @@ export default {
 		}
 	},
 	methods: {
+		sendMessageToOne(index,row){
+			
+		},
 		addBlacne(index, row) {
 			this.blance.dialogVisible = true
 			this.blance.id = row.id