From 69ef58b01fd739e1d5a746c0a0cfab7a7f630eda Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 11 Nov 2022 15:46:32 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java | 2 +
src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java | 6 +++
src/main/java/cc/mrbird/febs/dapp/entity/DappMessageEntity.java | 15 +++++++
src/main/java/cc/mrbird/febs/dapp/mapper/DappMessageDao.java | 7 +++
src/main/java/cc/mrbird/febs/dapp/dto/AddMessageDto.java | 14 +++++++
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 18 ++++++++
src/main/resources/templates/febs/views/dapp/money-change-flow.html | 3 +
7 files changed, 63 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
index 1b637ab..4750433 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
@@ -228,4 +228,10 @@
public FebsResponse addAddress(@RequestBody ApiAddAddressDto apiAddAddressDto) {
return dappMemberService.addAddress(apiAddAddressDto);
}
+
+ @ApiOperation(value = "IGT发送客服消息", notes = "发送客服消息")
+ @PostMapping(value = "/addMessage")
+ public FebsResponse addMessage(@RequestBody AddMessageDto addMessageDto) {
+ return dappMemberService.addMessage(addMessageDto);
+ }
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/dto/AddMessageDto.java b/src/main/java/cc/mrbird/febs/dapp/dto/AddMessageDto.java
new file mode 100644
index 0000000..4c2e977
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/dapp/dto/AddMessageDto.java
@@ -0,0 +1,14 @@
+package cc.mrbird.febs.dapp.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "AddMessageDto", description = "参数接收类")
+public class AddMessageDto {
+
+ @ApiModelProperty(value = "消息")
+ private String message;
+
+}
diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/DappMessageEntity.java b/src/main/java/cc/mrbird/febs/dapp/entity/DappMessageEntity.java
new file mode 100644
index 0000000..c9cee18
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/DappMessageEntity.java
@@ -0,0 +1,15 @@
+package cc.mrbird.febs.dapp.entity;
+
+import cc.mrbird.febs.common.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("dapp_message")
+public class DappMessageEntity extends BaseEntity {
+
+ private Long memberId;
+
+ private String message;
+
+}
diff --git a/src/main/java/cc/mrbird/febs/dapp/mapper/DappMessageDao.java b/src/main/java/cc/mrbird/febs/dapp/mapper/DappMessageDao.java
new file mode 100644
index 0000000..ebf051b
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/dapp/mapper/DappMessageDao.java
@@ -0,0 +1,7 @@
+package cc.mrbird.febs.dapp.mapper;
+
+import cc.mrbird.febs.dapp.entity.DappMessageEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface DappMessageDao extends BaseMapper<DappMessageEntity> {
+}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java b/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java
index 30201f6..c1a6e82 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java
@@ -104,4 +104,6 @@
FebsResponse identitySet(DappMemberEntity memberEntity);
FebsResponse amountFlowBack(Long id);
+
+ FebsResponse addMessage(AddMessageDto addMessageDto);
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index 8acc069..762c2ce 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -68,6 +68,7 @@
private final DappMemberAddressDao dappMemberAddressDao;
private final IgtOnHookPlanOrderDao igtOnHookPlanOrderDao;
private final AppVersionMapper appVersionMapper;
+ private final DappMessageDao dappMessageDao;
private final RedisTemplate<String, Object> redisTemplate;
@@ -998,9 +999,11 @@
if(ObjectUtil.isEmpty(dappWalletCoinEntity)){
return new FebsResponse().fail().message("会员账户不存在");
}
+ BigDecimal availableAmount = dappWalletCoinEntity.getAvailableAmount();
dappWalletCoinDao.addTotalAndaddAvailableById(dappWalletCoinEntity.getId(),coinNumber);
- DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberEntity.getId(), coinNumber, "充值", 10);
+ DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberEntity.getId(),
+ availableAmount,coinNumber,availableAmount.add(coinNumber) ,"充值", 10);
dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
return new FebsResponse().success().message("操作成功");
}
@@ -1052,6 +1055,19 @@
}
}
+ @Override
+ public FebsResponse addMessage(AddMessageDto addMessageDto) {
+ DappMemberEntity member = LoginUserUtil.getAppUser();
+ if(ObjectUtil.isEmpty(member)){
+ return new FebsResponse().success();
+ }
+ DappMessageEntity dappMessageEntity = new DappMessageEntity();
+ dappMessageEntity.setMemberId(member.getId());
+ dappMessageEntity.setMessage(addMessageDto.getMessage());
+ dappMessageDao.insert(dappMessageEntity);
+ return new FebsResponse().success();
+ }
+
public String generateAsaToken(String token) {
RSA rsa = new RSA(null, AppContants.PUBLIC_KEY);
return rsa.encryptBase64(token + "_" + System.currentTimeMillis(), KeyType.PublicKey);
diff --git a/src/main/resources/templates/febs/views/dapp/money-change-flow.html b/src/main/resources/templates/febs/views/dapp/money-change-flow.html
index 6721b5e..ae6d17d 100644
--- a/src/main/resources/templates/febs/views/dapp/money-change-flow.html
+++ b/src/main/resources/templates/febs/views/dapp/money-change-flow.html
@@ -27,6 +27,7 @@
<option value="7">流水佣金</option>
<option value="8">盈利分成</option>
<option value="9">系统</option>
+ <option value="10">充值</option>
</select>
</div>
</div>
@@ -149,7 +150,7 @@
{field: 'createTime', title: '创建时间', minWidth: 180},
{title: '流水记录',
templet: function (d) {
- if(d.orderId != null || d.orderId != ""){
+ if(d.orderId > 0){
return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="amountFlow" shiro:hasPermission="user:update">流水记录</button>'
}else{
return ''
--
Gitblit v1.9.1