经销商管理

doum

13 小时以前 5d3b86a4d0032836c782e5e1319179eced5e5647

经销商管理

 admin/src/components/business/OperaGoodsLabelsWindow.vue

@@ -10,23 +10,15 @@
      <el-form-item label="分类名称" prop="name">
        <el-input v-model="form.name" placeholder="请输入分类名称" v-trim/>
      </el-form-item>
<!--      <el-form-item label="所属板块" prop="module">
        <el-select
          v-model="form.module"
          placeholder="请选择所属板块"
        >
          <el-option
            :key="0"
            :value="0"
            label="平台商城"
          ></el-option>
          <el-option
            :key="1"
            :value="1"
            label="咖豆商城"
          ></el-option>
        </el-select>
      </el-form-item>-->
      <el-form-item label="图标" prop="imgurlfull">
        <UploadAvatarImage
            :uploadData="{folder:'labels'}"
            :file="{ 'imgurlfull': form.imgurlfull, 'imgurl': form.imgurl }"
            @uploadSuccess="uploadAvatarSuccess"
            @uploadEnd="isUploading=false"
            @uploadBegin="isUploading = true"
        />
      </el-form-item>
      <el-form-item label="排序码(升序)" prop="sortnum">
        <el-input v-model="form.sortnum" type="number"  placeholder="请输入排序码" v-trim/>
      </el-form-item>
@@ -38,18 +30,22 @@
<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalAlertWindow from '@/components/common/GlobalAlertWindow'
import UploadAvatarImage from '@/components/common/UploadAvatarImage'
export default {
  name: 'OperaProductLabelWindow',
  extends: BaseOpera,
  components: { GlobalAlertWindow },
  components: { GlobalAlertWindow,UploadAvatarImage },
  data () {
    return {
      // 表单数据
      isUploading: false,
      form: {
        id: null,
        name: '',
        module: 0,
        type: '0',
        imgurl:null,
        imgurlfull:null,
        sortnum: ''
      },
      // 验证规则
@@ -68,7 +64,14 @@
      api: '/business/labels',
      'field.id': 'id'
    })
  }
  },
  methods: {
    // 上传图片
    uploadAvatarSuccess(file) {
      this.form.imgurl = file.imgurl;
      this.form.imgurlfull = file.imgurlfull;
    },
  },
}
</script>


 admin/src/views/business/goodsLabels.vue

@@ -24,6 +24,11 @@
        @selection-change="handleSelectionChange"
      >
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="imgurlfull" label="图标" align="center" min-width="80px">
          <template slot-scope="{row}">
            <el-image style="width: 50px;height: 50px;" v-if="row.imgurlfull && row.imgurlfull!=''" :src="row.imgurlfull" :preview-src-list="[row.imgurlfull]"></el-image>
          </template>
        </el-table-column>
        <el-table-column prop="name" label="商品分类" min-width="100px"></el-table-column>
        <el-table-column prop="sortnum" label="排序码(升序)" min-width="100px"></el-table-column>
        <el-table-column prop="createDate" label="创建时间" min-width="100px"></el-table-column>

 server/dmmall_admin/src/main/java/com/doumee/api/business/GoodsorderController.java

@@ -95,6 +95,7 @@
    @PostMapping("/page")
    @RequiresPermissions("business:goodsorder:query")
    public ApiResponse<PageData<Goodsorder>> findPage (@RequestBody PageWrap<Goodsorder> pageWrap) {
        pageWrap.getModel().setNeedCount(true);
        return ApiResponse.success(goodsorderService.findPage(pageWrap));
    }

@@ -108,15 +109,9 @@
    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @RequiresPermissions("business:goodsorder:exportExcel")
    public void exportExcel (@RequestBody Goodsorder pageWrap, HttpServletResponse response) {
        List<Goodsorder> list=goodsorderService.exportExcel(pageWrap);
       for(Goodsorder model:list){
           if(model.getStatus()!=null){
               model.setStatusStr(Constants.OrderStatus.getInfo(model.getStatus()));
               model.setGoodsPrice(model.getGoodsPrice()+"  "+model.getGoodsNum());
           }
       }
        ExcelExporter.build(Goodsorder.class).export(list, "商品订单信息表", response);
    public void exportExcel (@RequestBody PageWrap<Goodsorder> pageWrap, HttpServletResponse response) {
        List<GoodsorderExport> list=goodsorderService.exportExcel(pageWrap);
        ExcelExporter.build(GoodsorderExport.class).export(list, "商品订单信息表", response);
    }

    @ApiOperation("根据ID查询")

 server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java

@@ -304,5 +304,8 @@
    @ApiModelProperty(value = "经销商名称 ")
    @TableField(exist = false)
    private String shopName;
    @ApiModelProperty(value = "是否需要统计 ")
    @TableField(exist = false)
    private Boolean needCount;

}

 server/dmmall_service/src/main/java/com/doumee/dao/business/model/GoodsorderExport.java

@@ -23,30 +23,39 @@
public class GoodsorderExport {


    private Integer id;

    @ExcelColumn(name="商品名称" ,index =1 )
    private String goodsName;
    @ExcelColumn(name="规格" ,index =2 )
    private String skuName;
    @ExcelColumn(name="价格" ,index =3 )
    private String price;
    @ExcelColumn(name="平台备注" ,index =4 )
    private String sysInfo;
    @ExcelColumn(name="用户备注" ,index =5 )
    private String memberInfo;
    @ExcelColumn(name="联系人" ,index =6 )
    private String linkeName;
    @ExcelColumn(name="联系电话" ,index =7 )
    private String linkePhone;
    @ExcelColumn(name="联系地址" ,index =8 )
    @ExcelColumn(name="订单编号" ,index =1,width = 10)
    private Long code;
    @ExcelColumn(name="商品总数量" ,index =2 ,width = 8)
    private Integer totalNum;
    @ExcelColumn(name="订单总价（元）" ,index =3 ,width = 8)
    private BigDecimal totalPrice;
    @ExcelColumn(name="积分抵扣（元）" ,index =4 ,width =8)
    private BigDecimal integralPrice;
    @ExcelColumn(name="优惠券优惠（元）" ,index =5 ,width = 8)
    private BigDecimal couponPrice;
    @ExcelColumn(name="运费（元）" ,index =6 ,width = 8)
    private BigDecimal mailPrice;
    @ExcelColumn(name="实付价格（元）" ,index =7 ,width = 8)
    private BigDecimal price;
    @ExcelColumn(name="所属经销商" ,index =8 ,width = 10)
    private String shopName;
    @ExcelColumn(name="经销商结算（元）" ,index =9 ,width = 8)
    private BigDecimal shopSettlement;
    @ExcelColumn(name="配送方式" ,index =10,width = 10 ,valueMapping = "0=快递配送;1=门店自提")
    private Integer receiveType;
    @ExcelColumn(name="收货人姓名" ,index =11 ,width = 10)
    private String linkname;
    @ExcelColumn(name="收货人电话" ,index =12 ,width = 10)
    private String linkphone;
    @ExcelColumn(name="收货地址" ,index =13,width = 18 )
    private String addr;
    @ExcelColumn(name="订单价格" ,index =9 )
    private String allprice;
    @ExcelColumn(name="状态" ,index =10 )
    private String status;



    @ExcelColumn(name="快递信息" ,index =14,width = 10 )
    private String kdInfo;
    @ExcelColumn(name="状态" ,index =15,width = 6,valueMapping = "0=待支付;1=待发货/待自提;2=待收货;3=交易完成;4=已取消;5=部分发货;6=已退款")
    private Integer status;
    @ExcelColumn(name="订单时间" ,index =16,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
    private Date createDate;
    @ExcelColumn(name="商品名称/重量(单价*数量)" ,index =17 ,width = 60)
    private String goodsName;

}

 server/dmmall_service/src/main/java/com/doumee/dao/business/model/Labels.java

@@ -105,6 +105,9 @@
    private String imgFullurl;


    @ApiModelProperty(value = "图标")
    @TableField(exist = false)
    private String imgurlfull;
    @ApiModelProperty(value = "父类名称")
    @TableField(exist = false)
    private String parentName;

 server/dmmall_service/src/main/java/com/doumee/service/business/GoodsorderService.java

@@ -4,6 +4,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Goodsorder;
import com.doumee.dao.business.model.GoodsorderExport;
import com.doumee.dao.business.model.Shop;
import com.doumee.dao.web.request.*;
import com.doumee.dao.web.request.goods.DealOrderRequest;
@@ -110,7 +111,7 @@
    PageData<Goodsorder> findPage(PageWrap<Goodsorder> pageWrap);
    PageData<Goodsorder> findPageShop(PageWrap<Goodsorder> pageWrap);

    List<Goodsorder> exportExcel(Goodsorder goodsorder);
    List<GoodsorderExport> exportExcel(PageWrap<Goodsorder> goodsorder);

    /**
     * 条件统计

 server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java

@@ -483,7 +483,7 @@
            dealOrderDetailsBiz(idList,result);//查询订单明细
        }
        PageData<Goodsorder> rr =  PageData.from(result);
        if(pageWrap.getPage() == 1){
        if(pageWrap.getPage() == 1  && pageWrap.getModel().getNeedCount()!=null&& pageWrap.getModel().getNeedCount()){
            //如果查询第一页，做数据统计
            rr.setCountData(dealCountOrderNum(pageWrap));
        }
@@ -660,41 +660,42 @@


    @Override
    public List<Goodsorder> exportExcel(Goodsorder pageWrap) {

        MPJLambdaWrapper<Goodsorder> queryWrapper = new MPJLambdaWrapper<>();


        queryWrapper.selectAll(Goodsorder.class);
        queryWrapper.selectAs(GoodsorderDetail::getName,Goodsorder::getGoodsName);
        queryWrapper.selectAs(GoodsorderDetail::getSkuName,Goodsorder::getSkuName);
        queryWrapper.selectAs(GoodsorderDetail::getGoodsNum,Goodsorder::getGoodsNum);
        queryWrapper.selectAs(GoodsorderDetail::getPrice,Goodsorder::getGoodsPrice);
        queryWrapper.selectAs(Member::getNickname,Goodsorder::getNickName);
        queryWrapper.selectAs(Member::getPhone,Goodsorder::getPhone);
        queryWrapper.selectAs(Addr::getAddr,Goodsorder::getAddr);
        queryWrapper.select("(select CREATE_DATE  from order_urge where ORDER_ID=t.id and ISDELETED=0 ORDER BY CREATE_DATE desc limit 1) as urgeCreateDate ");
        queryWrapper.leftJoin(Member.class,Member::getId,Goodsorder::getMemberId);
        queryWrapper.leftJoin(Addr.class,Addr::getMemberId,Member::getId);
        queryWrapper.leftJoin(GoodsorderDetail.class,GoodsorderDetail::getOrderId,Goodsorder::getId);
        queryWrapper.eq(GoodsorderDetail::getIsdeleted,Constants.ZERO);
        queryWrapper.eq(Addr::getIsDefault,Constants.ONE);

        queryWrapper.eq(pageWrap.getCode()!=null,Goodsorder::getCode,pageWrap.getCode());
        queryWrapper.and(StringUtils.isNotBlank(pageWrap.getNickName()),ms->ms.like(Goodsorder::getLinkname,pageWrap.getNickName())
                .or().like(Goodsorder::getLinkphone,pageWrap.getNickName())
        );
        queryWrapper.ge(pageWrap.getStarttime()!=null,Goodsorder::getCreateDate,pageWrap.getStarttime());
        queryWrapper.le(pageWrap.getEndtime()!=null,Goodsorder::getCreateDate, pageWrap.getEndtime());

        queryWrapper.eq(pageWrap.getStatus()!=null,Goodsorder::getStatus,pageWrap.getStatus());
        queryWrapper.eq(pageWrap.getIsdeleted()==null,Goodsorder::getIsdeleted,Constants.ZERO);
        queryWrapper.eq(pageWrap.getIsdeleted()!=null,Goodsorder::getIsdeleted,pageWrap.getIsdeleted());
        queryWrapper.orderByDesc(Goodsorder::getCreateDate);

        List<Goodsorder> result = goodsorderJoinMapper.selectJoinList(Goodsorder.class, queryWrapper);


    public List<GoodsorderExport> exportExcel(PageWrap<Goodsorder> pageWrap) {
        pageWrap.getModel().setNeedCount(false);
        PageData<Goodsorder> list = findPage(pageWrap);
        List<GoodsorderExport> result = new ArrayList<>();
        if(list!=null && list.getRecords()!=null){
            for(Goodsorder order: list.getRecords()){
                GoodsorderExport param = new GoodsorderExport();
                param.setCode(order.getCode());
                String goodsInfo = "";
                int goodsNum= 0;
                if(order.getGoodsorderDetailList()!=null && order.getGoodsorderDetailList().size()>0){
                    for(GoodsorderDetail detail:order.getGoodsorderDetailList()){
                        goodsNum += Constants.formatIntegerNum(detail.getGoodsNum());
                        goodsInfo+= StringUtils.defaultString(detail.getName(),"")+"/"+Constants.formatBigdecimal(detail.getGoodsWeight())+"kg"
                                +"("+Constants.formatBigdecimal(detail.getPrice())+"  x  "+Constants.formatIntegerNum(detail.getGoodsNum())+")；\n";
                    }
                }
                param.setTotalNum(goodsNum);
                param.setGoodsName(goodsInfo);
                param.setTotalPrice(order.getTotalPrice());
                param.setIntegralPrice(order.getIntegral());
                param.setCouponPrice(order.getCouponPrice());
                param.setMailPrice(order.getMailPrice());
                param.setPrice(order.getPrice());
                param.setShopName(order.getShopName());
                param.setShopSettlement(order.getShopSettlement());
                param.setReceiveType(order.getReceiveType());
                param.setLinkname(order.getLinkname());
                param.setLinkphone(order.getLinkphone());
                param.setAddr(order.getLinkaddr());
                param.setKdInfo(StringUtils.defaultString(order.getKdName(),"")+StringUtils.defaultString(order.getKdCode(),""));
                param.setStatus(order.getStatus());
                param.setCreateDate(order.getCreateDate());
                result.add(param);
            }
        }
        return result;
    }


 server/dmmall_service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java

@@ -358,6 +358,7 @@
               }
               if(StringUtils.isNotBlank(model.getImgurl())){
                   model.setImgFullurl(path + model.getImgurl());
                   model.setImgurlfull(path + model.getImgurl());
               }
               if(Constants.equalsInteger(model.getType(),Constants.LabelsType.BIG_AREA.getKey())
                        || Constants.equalsInteger(model.getType(),Constants.LabelsType.YUN_FEE.getKey())){