20220902

xiaoyong931011

2022-09-23 19ab08f041d6773f22594ed393105c623e09f543

20220902

 src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java

@@ -349,7 +349,7 @@
            orderStateDto.setGoodsName(StrUtil.sub(productNames,0,15)+"...");
            String takeUniqueCode = mallOrderInfo.getTakeUniqueCode();
            MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(takeUniqueCode);
            orderStateDto.setAddressArea(StrUtil.sub(mallTeamLeader.getAddressArea(),0,20)+"...");
            orderStateDto.setAddressArea(mallTeamLeader.getAddressArea());
            orderStateDto.setDetailAddress(StrUtil.sub(mallTeamLeader.getDetailAddress(),0,20)+"...");
            orderStateDto.setRemark("果蔬等生鲜,请尽快取货");
            orderStateDto.setLeaderPhone(mallTeamLeader.getPhone());

 src/main/java/cc/mrbird/febs/mall/entity/MallLeaderDefault.java

@@ -1,5 +1,7 @@
package cc.mrbird.febs.mall.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

@@ -7,7 +9,7 @@
@Data
@TableName("mall_leader_default")
public class MallLeaderDefault {

    @TableId(value = "id",type = IdType.AUTO)
    private Long id;

    private Long memberId;

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java

@@ -295,7 +295,7 @@
            if(ObjectUtil.isNotEmpty(mallLeaderDefault)){
                mallTeamLeader = this.baseMapper.selectLeaderByUniqueCode(mallLeaderDefault.getUniqueCode());
            }
        }
        }else{
        //特征码扫码
        if(StrUtil.isNotEmpty(uniqueCode)){
            mallTeamLeader = this.baseMapper.selectLeaderByUniqueCode(uniqueCode);
@@ -310,6 +310,8 @@
                mallTeamLeader = mallTeamLeaderList.get(0);
            }
        }
        }

        if(ObjectUtil.isNotEmpty(mallTeamLeader)){
            apiLeaderInfoVo.setId(mallTeamLeader.getId());
            apiLeaderInfoVo.setName(mallTeamLeader.getName());