Merge remote-tracking branch 'origin/master'

jiangping

2024-07-26 89c51da30386b5001805778b666043041bc155fb

Merge remote-tracking branch 'origin/master'

 server/service/src/main/java/com/doumee/core/utils/Constants.java

@@ -695,7 +695,7 @@
            Response response = client.newCall(request).execute();
            if (response.isSuccessful()) {
                InputStream inputStream = new ByteArrayInputStream(response.body().bytes());
              /* ByteArrayOutputStream baos = new ByteArrayOutputStream();
               /*ByteArrayOutputStream baos = new ByteArrayOutputStream();
                    byte[] buffer = new byte[1024];
                    int len = -1;
                    while ((len = inputStream.read(buffer)) != -1) {

 server/service/src/main/java/com/doumee/service/business/ShopService.java

@@ -93,6 +93,8 @@
     */
    PageData<Shop> findPage(PageWrap<Shop> pageWrap);

    List<Shop> getUserShopList(Long userId);

    /**
     * 条件统计
     *

 server/service/src/main/java/com/doumee/service/business/impl/BjParamServiceImpl.java

@@ -216,7 +216,7 @@
    public BjParamConfigResponse getBjParamConfig(){
        BjParamConfigResponse bjParamConfigResponse = new BjParamConfigResponse();
        List<BjParam> bjParamList =  bjParamMapper.selectList(new QueryWrapper<BjParam>()
               .lambda().eq(BjParam::getIsdeleted,Constants.ZERO));
               .lambda().eq(BjParam::getIsdeleted,Constants.ZERO).orderByAsc(BjParam::getSortnum));
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(bjParamList)){
            List<BjParam> roughList = bjParamList.stream().filter(i->i.getType().equals(Constants.ZERO+"")&& StringUtils.isEmpty(i.getParentId())).collect(Collectors.toList());
            if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(roughList)){

 server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java

@@ -338,6 +338,11 @@
        ztContentListRequest.setId(id);
        ZTCaseInfoResponse response = zbomZhongTaiService.getWholecaseInfo(ztContentListRequest);
        if(Objects.nonNull(response)){
//            if(StringUtils.isNotBlank(response.getPanorama())){
//                response.setPanorama(
//                        response.getPanorama().replace("https://720.","https://720-3.").replace("https://720-2.","https://720-3.")
//                );
//            }
            //查询导购信息 进行信息绑定与返回
            if(StringUtils.isNotBlank(salesId)){
                Users users = usersMapper.selectById(salesId);

 server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java

@@ -1032,4 +1032,44 @@
        );
    }

    @Override
    public List<Shop> getUserShopList(Long userId) {
        Users users = usersMapper.selectById(userId);
        if(Objects.isNull(users)){
            return new ArrayList<>();
        }
        Shop userShop = shopMapper.selectById(users.getDepartmentId());
        if(Objects.isNull(userShop)){
            return new ArrayList<>();
        }
        List<Shop> shopList = shopMapper.selectList(new QueryWrapper<Shop>()
                .lambda()
                .eq(Shop::getScode,userShop.getScode())
                .eq(Shop::getType,Constants.TWO)
                .eq(Shop::getSecondType,Constants.THREE)
        );
        //查询经营范围信息
        List<CategorySeg> categorySegAllList = categorySegMapper.selectList(new QueryWrapper<CategorySeg>().lambda()
                .isNotNull(CategorySeg::getOrgId)
                .eq(CategorySeg::getIsdeleted,Constants.ZERO));
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(categorySegAllList)){
            for (Shop shop:shopList) {
                if(StringUtils.isBlank(shop.getOrgId())){
                    continue;
                }
                List<CategorySeg> categorySegList = categorySegAllList.stream().filter(i->i.getOrgId().equals(shop.getOrgId())).collect(Collectors.toList());
                List<UnitCodeVo> unitCodeVoList =systemDictDataBiz.getUnitList();
                List<String> seqNameList = new ArrayList<>();
                for(CategorySeg model : categorySegList){
                    String seqName = systemDictDataBiz.getUnitName(model.getUnitCode(),unitCodeVoList);
                    if(Objects.nonNull(seqName)){
                        seqNameList.add(seqName);
                    }
                }
                shop.setSeqNameList(seqNameList);
            }
        }
        return shopList;
    }

}

 server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java

@@ -441,7 +441,7 @@
        } catch (Exception e) {
            e.printStackTrace();
        }
        throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"更新手机号失败");
        throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"获取手机号失败");
    }



 server/web/src/main/java/com/doumee/api/web/PersonnelApi.java

@@ -151,6 +151,16 @@
    }

    @UserLoginRequired
    @ApiOperation(value = "获取员工管理门店列表", notes = "员工端小程序")
    @GetMapping("/userShopList")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse<List<Shop>> userShopList () {
        return ApiResponse.success(shopService.getUserShopList(getMemberId()));
    }

    @UserLoginRequired
    @ApiOperation(value = "门店详情", notes = "员工端小程序")
    @GetMapping("/shopDetail")
    @ApiImplicitParams({

 wechat_jiaxuan/pages/index/index.js

@@ -276,7 +276,7 @@
        url: '/pages/webView/index',
        success: function (res) {
          res.eventChannel.emit('data', {
            link: item.content
            link: item.openContent || item.content
          });
        }
      })

 wechat_jiaxuan/pages/store/staff.less

@@ -32,7 +32,7 @@
      overflow : hidden;
      text-overflow: ellipsis;
      display: -webkit-box;
      -webkit-line-clamp: 2;
      -webkit-line-clamp: 1;
      -webkit-box-orient: vertical;
    }
    .icon{
@@ -58,7 +58,8 @@
  .left {
    flex: 1;
    display: flex;
    align-items: flex-end;
    align-items: center;
    margin-top: 12rpx;

    .name {
      font-weight: 600;

 wechat_staff/components/detailFooter/index.js

@@ -29,6 +29,24 @@
    })
  },
  methods: {
    handleShare() {
      let map = [
        '/pages/detailDis/product',
        '/pages/detailDis/case',
        '/pages/detailDis/realpic',
        '/pages/consult/detail',
      ]
      const { info,  path} = this.data
      wx.navigateToMiniProgram({
        appId: 'wx208dd1edc0be24ee',
        path: map[path],
        envVersion: 'trial',
        extraData: {
          id: info.id,
          origin: 'b'
        }
      })
    },
    handleEnjoy() {
      const {
        info

 wechat_staff/components/detailFooter/index.wxml

@@ -23,7 +23,7 @@
  <!--  -->
  <view wx:if="{{ showShare }}" class="shade_modal" style="padding-bottom: {{bottomLift}}px;">
    <view class="btns">
      <button open-type="share" class="item" bindtap="handleShare">
      <button class="item" bindtap="handleShare">
        <image src="../../static/icon/wechat.png"></image>
        <view>小程序分享</view>
      </button>

 wechat_staff/pages/consult/detail.js

@@ -23,8 +23,14 @@
    this.getDetail(options.id)
  },
  handleDesign() {
    wx.navigateTo({
      url: '/pages/design/design',
    wx.navigateToMiniProgram({
      appId: 'wx208dd1edc0be24ee',
      path: '/pages/consult/detail',
      envVersion: 'trial',
      extraData: {
        id: this.data.info.id,
        origin: 'b'
      }
    })
  },
  getDetail(id) {

 wechat_staff/pages/consult/detail.wxml

@@ -15,13 +15,9 @@
        <image class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
        <view class="name">收藏</view>
      </view> -->
      <!-- <button open-type="share" class="item" bindtap="handleShare">
        <image class="icon" src="../../static/icon/detail_nav_share.png" mode="widthFix"></image>
        <view class="name">分享</view>
      </button> -->
      <button class="sub_btn" open-type="share" bindtap="handleShare"> 
      <view class="sub_btn" bindtap="handleDesign">
        <view>分享</view>
      </button>
      </view>
    </view>
  </view>
  <!--  -->

 wechat_staff/pages/store/staff.less

@@ -1,4 +1,3 @@

.bg_wrap {
  width: 750rpx;
  height: 400rpx;
@@ -6,20 +5,17 @@
  position: fixed;
  top: 0;
  left: 0;
  z-index: 1;
  z-index: -1;
}

.container {
  padding: 26rpx 40rpx;
  background-color: #fff;
  .avatar {
    margin-top: 260rpx;
    width: 140rpx;
    height: 140rpx;
    border-radius: 50%;
    border: 4rpx solid #FFFFFF;
    position: relative;
    z-index: 2;
  }
  .desc {
    display: flex;
@@ -31,6 +27,14 @@
    margin-bottom: 40rpx;
    color: #333333;
    position: relative;
    .text{
      width: 100%;
      overflow : hidden;
      text-overflow: ellipsis;
      display: -webkit-box;
      -webkit-line-clamp: 1;
      -webkit-box-orient: vertical;
    }
    .icon{
      position: absolute;
      background: #F7F7F7;
@@ -42,6 +46,7 @@
    }
    image {
      width: 32rpx;
      height: 32rpx;
      margin-right: 20rpx;
    }
  }
@@ -54,8 +59,8 @@
  .left {
    flex: 1;
    display: flex;
    align-items: flex-end;

    align-items: center;
    margin-top: 12rpx;
    .name {
      font-weight: 600;
      font-size: 36rpx;
@@ -82,16 +87,23 @@
  display: flex;
  justify-content: space-between;
  margin-bottom: 60rpx;

  .card {
    width: 320rpx;
    height: 156rpx;
    padding: 28rpx 40rpx;
    background-color: #f7f7f7;
    border-radius: 8rpx;
    font-size: 26rpx;
    color: #333333;
    position: relative;
    .bg{
      width: 100%;
      height: 100%;
      position: absolute;
      z-index: -1;
      top: 0;
      left: 0;

    }
    .num {
      color: var(--themeColor);
      margin-top: 8rpx;
@@ -111,16 +123,17 @@

  .line {
    display: flex;
    align-items: flex-start;
    font-size: 30rpx;
    margin-bottom: 40rpx;
    margin-bottom: 42rpx;
    .icon {
      width: 30rpx;
      margin-top: 6rpx;
    }
    .label {
      color: #777777;
      margin-left: 24rpx;
      margin-right: 44rpx;
      width: 140rpx;
    }
    .val{
      flex: 1;
@@ -148,7 +161,7 @@
    border-radius: 8rpx;
    flex: 1;
    image{
      width: 36rpx;
      width: 32rpx;
      margin-right: 12rpx;
    }
  }
@@ -184,41 +197,5 @@
    font-size: 26rpx;
    color: #999999;
    text-align: center;
  }
}
.card_wrap{
  position: fixed;
  border-radius: 8rpx;
  top: 50%;
  left: 75rpx;
  transform: translate(0, -50%);
  width: 600rpx;
  background-color: rgba(0, 0, 0, .2);
  z-index: 999;
  .img1{
    image{
      width: 600rpx;
      border-radius: 8rpx ;
    }
  }
  .btns{
    margin-top: 30rpx;
    display: flex;
    justify-content: space-between;
    width: 100%;
    .btn{
      width: 290rpx;
      height: 88rpx;
      border-radius: 8rpx;
      border: 2rpx solid #FFFFFF;
      display: flex;
      justify-content: center;
      align-items: center;
      color: #fff;
    }
    .save{
      border: none;
      background: linear-gradient( 180deg, #E0B49C 0%, #B68B74 100%);
    }
  }
}

 wechat_staff/pages/store/staff.wxml

@@ -9,21 +9,24 @@
        <view class="tag">导购</view>
        <!-- <view class="tag">5年经验</view> -->
      </view>
      <image bind:tap="showQrcode" class="qrcode" src="../../static/icon/mingpian_erweima@2x.png" mode="widthFix"></image>
      <image wx:if="{{ userInfo.qrcodeImgFull }}" bind:tap="showQrcode" class="qrcode" src="../../static/icon/mingpian_erweima@2x.png" mode="widthFix"></image>
    </view>
    <view class="desc">
      <image src="../../static/icon/mingpian_ic_edit@2x.png" mode="widthFix"></image>
      <view>{{userInfo.slogans}}</view>
      <view class="text">{{userInfo.slogans}}</view>
      <view class="icon"></view>
    </view>
    <view class="static">
      <view class="card">
        <image src="../../static/images/mingpian_bg_nianxian.png" class="bg"></image>
        <view>从业年限</view>
        <view class="num">{{userInfo.jobDate||'0'}}</view>
        <view class="num">{{ info.jobDate || '5' }}</view>
      </view>
      <view class="card">
      <image src="../../static/images/mingpian_bg_kehu.png" class="bg"></image>
        <view>服务客户</view>
        <view class="num">{{userInfo.costomerNum||'0'}}</view>
        <view class="num" wx:if="{{ info.costomerNum || info.costomerNum == 0 }}">{{ info.costomerNum || '--' }}+</view>
        <view wx:else class="num">--</view>
      </view>
    </view>
    <view class="guide">
@@ -59,7 +62,7 @@
        <image class="avatar" src="{{userInfo.imgurlFull ? userInfo.imgurlFull : '../../static/images/default_avatar.png'}}"></image>
        <view class="content">
          <view class="name">{{userInfo.name}}</view>
          <view class="desc">导购 ｜ {{userInfo.jobDate ||'0'}}年经验</view>
          <view class="desc">导购 ｜ {{userInfo.jobDate ||'5'}}年经验</view>
        </view>
      </view>
      <image class="qrcode" src="{{userInfo.qrcodeImgFull}}"></image>

 wechat_staff/pages/store/staff.wxss

@@ -5,11 +5,10 @@
  position: fixed;
  top: 0;
  left: 0;
  z-index: 1;
  z-index: -1;
}
.container {
  padding: 26rpx 40rpx;
  background-color: #fff;
}
.container .avatar {
  margin-top: 260rpx;
@@ -17,8 +16,6 @@
  height: 140rpx;
  border-radius: 50%;
  border: 4rpx solid #FFFFFF;
  position: relative;
  z-index: 2;
}
.container .desc {
  display: flex;
@@ -31,6 +28,14 @@
  color: #333333;
  position: relative;
}
.container .desc .text {
  width: 100%;
  overflow: hidden;
  text-overflow: ellipsis;
  display: -webkit-box;
  -webkit-line-clamp: 1;
  -webkit-box-orient: vertical;
}
.container .desc .icon {
  position: absolute;
  background: #F7F7F7;
@@ -42,6 +47,7 @@
}
.container .desc image {
  width: 32rpx;
  height: 32rpx;
  margin-right: 20rpx;
}
.name_wrap {
@@ -51,7 +57,8 @@
.name_wrap .left {
  flex: 1;
  display: flex;
  align-items: flex-end;
  align-items: center;
  margin-top: 12rpx;
}
.name_wrap .left .name {
  font-weight: 600;
@@ -78,10 +85,18 @@
  width: 320rpx;
  height: 156rpx;
  padding: 28rpx 40rpx;
  background-color: #f7f7f7;
  border-radius: 8rpx;
  font-size: 26rpx;
  color: #333333;
  position: relative;
}
.static .card .bg {
  width: 100%;
  height: 100%;
  position: absolute;
  z-index: -1;
  top: 0;
  left: 0;
}
.static .card .num {
  color: var(--themeColor);
@@ -97,17 +112,18 @@
}
.guide .line {
  display: flex;
  align-items: flex-start;
  font-size: 30rpx;
  margin-bottom: 40rpx;
  margin-bottom: 42rpx;
}
.guide .line .icon {
  width: 30rpx;
  margin-top: 6rpx;
}
.guide .line .label {
  color: #777777;
  margin-left: 24rpx;
  margin-right: 44rpx;
  width: 140rpx;
}
.guide .line .val {
  flex: 1;
@@ -135,7 +151,7 @@
  flex: 1;
}
.footer .btn image {
  width: 36rpx;
  width: 32rpx;
  margin-right: 12rpx;
}
.modal {
@@ -170,38 +186,4 @@
  font-size: 26rpx;
  color: #999999;
  text-align: center;
}
.card_wrap {
  position: fixed;
  border-radius: 8rpx;
  top: 50%;
  left: 75rpx;
  transform: translate(0, -50%);
  width: 600rpx;
  background-color: rgba(0, 0, 0, 0.2);
  z-index: 999;
}
.card_wrap .img1 image {
  width: 600rpx;
  border-radius: 8rpx ;
}
.card_wrap .btns {
  margin-top: 30rpx;
  display: flex;
  justify-content: space-between;
  width: 100%;
}
.card_wrap .btns .btn {
  width: 290rpx;
  height: 88rpx;
  border-radius: 8rpx;
  border: 2rpx solid #FFFFFF;
  display: flex;
  justify-content: center;
  align-items: center;
  color: #fff;
}
.card_wrap .btns .save {
  border: none;
  background: linear-gradient(180deg, #E0B49C 0%, #B68B74 100%);
}

 wechat_staff/project.private.config.json

@@ -49,6 +49,13 @@
          "query": "",
          "launchMode": "default",
          "scene": null
        },
        {
          "name": "",
          "pathName": "pages/consult/detail",
          "query": "id=1813577799402684418",
          "launchMode": "default",
          "scene": null
        }
      ]
    }

 wechat_staff/static/images/mingpian_bg_kehu.png

 wechat_staff/static/images/mingpian_bg_nianxian.png