fix

wzy

2022-05-08 534922c09af529424847b8d284412abcc9dea353

fix

 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)

 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;
}

 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);

 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

 src/main/java/cc/mrbird/febs/mall/vo/MyTeamVo.java

New file
@@ -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;
}

 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>

 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',