From 534922c09af529424847b8d284412abcc9dea353 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 08 May 2022 22:27:14 +0800
Subject: [PATCH] fix
---
src/main/resources/mapper/modules/MallGoodsMapper.xml | 3 +
src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html | 9 +++-
src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java | 8 +--
src/main/java/cc/mrbird/febs/mall/vo/MyTeamVo.java | 25 ++++++++++++
src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java | 3 +
src/main/java/cc/mrbird/febs/mall/dto/MallGoodsQueryDto.java | 3 +
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 15 ++++++-
7 files changed, 57 insertions(+), 9 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
index 83e6992..3d5afc2 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
@@ -8,10 +8,7 @@
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.service.ICommonService;
import cc.mrbird.febs.mall.service.IMallMemberWithdrawService;
-import cc.mrbird.febs.mall.vo.MallMemberVo;
-import cc.mrbird.febs.mall.vo.MoneyFlowVo;
-import cc.mrbird.febs.mall.vo.MyCommissionVo;
-import cc.mrbird.febs.mall.vo.TeamListVo;
+import cc.mrbird.febs.mall.vo.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -73,13 +70,14 @@
@ApiOperation(value = "我的团队列表")
@ApiResponses({
- @ApiResponse(code = 200, message = "success", response = TeamListVo.class)
+ @ApiResponse(code = 200, message = "success", response = MyTeamVo.class)
})
@PostMapping(value = "/teamList")
public FebsResponse teamList(@RequestBody TeamListDto teamListDto) {
return memberService.teamList(teamListDto);
}
+
@ApiOperation(value = "资金流水列表")
@ApiResponses({
@ApiResponse(code = 200, message = "success", response = MoneyFlowVo.class)
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/MallGoodsQueryDto.java b/src/main/java/cc/mrbird/febs/mall/dto/MallGoodsQueryDto.java
index d4b6314..bf34fe4 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/MallGoodsQueryDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/MallGoodsQueryDto.java
@@ -34,4 +34,7 @@
@ApiModelProperty(value = "是否热卖", example = "1是2否")
private Integer isHot;
+
+ @ApiModelProperty(value = "是否套餐 1-普通商品 2-套餐", example = "2")
+ private Integer isNormal;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java b/src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java
index 598465d..2447af2 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java
@@ -5,6 +5,7 @@
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.entity.MallMemberPayment;
import cc.mrbird.febs.mall.vo.MyCommissionVo;
+import cc.mrbird.febs.mall.vo.MyTeamVo;
import com.baomidou.mybatisplus.extension.service.IService;
import java.math.BigDecimal;
@@ -29,6 +30,8 @@
FebsResponse teamList(TeamListDto teamListDto);
+ MyTeamVo teamListForMine(TeamListDto teamListDto);
+
FebsResponse moneyFlows(MoneyFlowDto moneyFlowDto);
void addMoneyFlow(Long memberId, BigDecimal amount, Integer type, String orderNo, String description, String remark, Long rtMemberId, Integer status, Integer flowType);
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index f10e211..c4b46eb 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -313,8 +313,19 @@
own.setCnt(this.baseMapper.selectOwnCntByInviteId(mallMember.getInviteId()));
own.setOrderCnt(this.baseMapper.selectOwnOrderCntByInviteId(mallMember.getInviteId()));
own.setId(mallMember.getId());
- list.add(0, own);
- return new FebsResponse().success().data(list);
+// list.add(0, own);
+
+ MyTeamVo myTeamVo = new MyTeamVo();
+ myTeamVo.setTeam(list);
+ myTeamVo.setMyAchieve(BigDecimal.valueOf(100));
+ myTeamVo.setMyTeamAchieve(BigDecimal.valueOf(100));
+ myTeamVo.setMyTeamCnt(100);
+ return new FebsResponse().success().data(myTeamVo);
+ }
+
+ @Override
+ public MyTeamVo teamListForMine(TeamListDto teamListDto) {
+ return null;
}
@Override
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MyTeamVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MyTeamVo.java
new file mode 100644
index 0000000..0bd7bfc
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MyTeamVo.java
@@ -0,0 +1,25 @@
+package cc.mrbird.febs.mall.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@ApiModel(value = "MyTeamVo", description = "我的团队返回参数类")
+public class MyTeamVo {
+
+ @ApiModelProperty(value = "我的业绩")
+ private BigDecimal myAchieve;
+
+ @ApiModelProperty(value = "我的团队业绩")
+ private BigDecimal myTeamAchieve;
+
+ @ApiModelProperty(value = "团队数量")
+ private int myTeamCnt;
+
+ @ApiModelProperty(value = "团队列表")
+ private List<TeamListVo> team;
+}
diff --git a/src/main/resources/mapper/modules/MallGoodsMapper.xml b/src/main/resources/mapper/modules/MallGoodsMapper.xml
index dd028ba..a436e0a 100644
--- a/src/main/resources/mapper/modules/MallGoodsMapper.xml
+++ b/src/main/resources/mapper/modules/MallGoodsMapper.xml
@@ -74,6 +74,9 @@
<if test="record.isHot != null and record.isHot != ''">
and a.is_hot = 1
</if>
+ <if test="record.isNormal != null and record.isNormal != ''">
+ and a.is_normal = #{record.isNormal}
+ </if>
<if test="record.categoryId != null and record.categoryId != ''">
and (c.id = #{record.categoryId} or c.parent_id=#{record.categoryId})
</if>
diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
index 61e0930..ab1e3a2 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
@@ -75,7 +75,7 @@
<div class="layui-form-item">
<label class="layui-form-label febs-form-item-require">商品类型</label>
<div class="layui-input-block">
- <select name="goodsType" class="goods-type" lay-filter="goods-type-select">
+ <select name="isNormal" class="goods-type" lay-filter="goods-type-select">
<option value="1">普通商品区</option>
<option value="2">套餐区</option>
</select>
@@ -306,6 +306,8 @@
for (let i = 0; i < hasData.length; i++) {
hasData[i].index = i + 1;
}
+
+ tableSkuData=hasData;
reloadTable(hasData);
}
});
@@ -364,7 +366,7 @@
var data = {};
data.styleName = attrNameVal;
- var index = addTableDate(data);
+ addTableDate(data);
});
function bindUpload(index) {
@@ -384,6 +386,8 @@
tableSkuData[i].skuImage = res.data.src;
}
}
+
+ reloadTable(tableSkuData);
}
});
}
@@ -468,6 +472,7 @@
});
form.on('submit(goods-add-form-submit)', function (data) {
+ console.log(tableSkuData);
data.field.addMallGoodsSkuDtos = tableSkuData;
$.ajax({
'url':ctx + 'admin/goods/addMallGoods',
--
Gitblit v1.9.1