#feat 订单列表查询接口

yanghui

2022-11-16 3d6d4bf23411591bdbf923dedfcc890c5675a934

#feat 订单列表查询接口

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java

@@ -4,6 +4,7 @@
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointVO;
import com.panzhihua.common.model.vos.shop.*;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
@@ -200,6 +201,7 @@

    /**
     * 保存评价
     *
     * @param comShopFlowerEvaluateDTO
     * @return
     */
@@ -211,6 +213,7 @@

    /**
     * 分页查询评价
     *
     * @param pageComShopFlowerEvaluateDTO
     * @return
     */
@@ -222,6 +225,7 @@

    /**
     * 评价详情
     *
     * @param id
     * @return
     */
@@ -233,6 +237,7 @@

    /**
     * 删除评价
     *
     * @param id
     * @return
     */
@@ -244,6 +249,7 @@

    /**
     * 取货码
     *
     * @param orderId
     * @return
     */
@@ -254,6 +260,75 @@
        return communityService.getQRCode(orderId);
    }

    /**
     * 保存配送单
     *
     * @param comShopFlowerOrderDeliveryDTO
     */
    @PostMapping("saveDelivery")
    @ApiOperation(value = "保存配送单")
    public R saveDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO) {
        return communityService.saveDelivery(comShopFlowerOrderDeliveryDTO);
    }

    /**
     * 更新配送单
     *
     * @param comShopFlowerOrderDeliveryDTO
     */
    @PostMapping("updateDelivery")
    @ApiOperation(value = "更新配送单")
    public R updateDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO) {
        return communityService.updateDelivery(comShopFlowerOrderDeliveryDTO);
    }

    /**
     * 已配送、已送达 分页查询
     *
     * @param pageComFlowerOrderDeliveryDTO
     * @return
     */
    @PostMapping("pageDelivery")
    @ApiOperation(value = "已配送、已送达 分页查询", response = ComShopFlowerOrderDeliveryVO.class)
    public R pageDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO) {
        return communityService.pageDelivery(pageComFlowerOrderDeliveryDTO);
    }

    /**
     * 未配送 分页查询
     *
     * @param pageComFlowerOrderDeliveryDTO
     * @return
     */
    @ApiOperation(value = "未配送 分页查询", response = ConvenientElevatingPointVO.class)
    @PostMapping("pageNoDelivery")
    public R pageNoDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO) {
        return communityService.pageNoDelivery(pageComFlowerOrderDeliveryDTO);
    }

    /**
     * 未配送-开始配送-订单列表
     *
     * @param pageComFlowerOrderListDTO
     * @return
     */
    @ApiOperation(value = "未配送-开始配送-订单列表", response = ComShopFlowerOrderPageVO.class)
    @PostMapping("pageNoDeliveryOrderList")
    public R pageNoDeliveryOrderList(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO) {
        return communityService.pageNoDeliveryOrderList(pageComFlowerOrderListDTO);
    }

    /**
     * 根据商家id查询商家的订单
     *
     * @param pageComFlowerOrderListDTO
     * @return
     */
    @ApiOperation(value = "根据商家id分页查询商家的订单", response = ComShopFlowerOrderStoreListVO.class)
    @PostMapping("pageOrderByStoreId")
    public R pageOrderByStoreId(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO) {
        return communityService.pageOrderByStoreId(pageComFlowerOrderListDTO);
    }


}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFlowerOrderDeliveryDTO.java

New file
@@ -0,0 +1,59 @@
package com.panzhihua.common.model.dtos.shop;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**
 * @auther lyq
 * @create 2021-04-14 15:02:14
 * @describe 购物车
 */
@Data
@ApiModel("配送单")
public class ComShopFlowerOrderDeliveryDTO {

    /**
     * id
     */
    @ApiModelProperty(value = "配送单id")
    private Long id;

    /**
     * 自提点id
     */
    @ApiModelProperty(value = "自提点id", required = true)
    private Long pointId;

    /**
     * 自提点id
     */
    @ApiModelProperty(value = "自提点名称", required = true)
    private String pointName;

    /**
     * 配送订单数量
     */
    @ApiModelProperty(value = "配送订单数量", required = true)
    private Integer deliveryOrderNum;

    /**
     * 配送商品数量
     */
    @ApiModelProperty(value = "配送商品数量", required = true)
    private Integer deliveryGoodsNum;

    /**
     * 价值
     */
    @ApiModelProperty(value = "价值", required = true)
    private BigDecimal deliveryAmount;



    @ApiModelProperty(value = "订单id集合", required = true)
    private List<Long> orderIds;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComFlowerOrderDeliveryDTO.java

New file
@@ -0,0 +1,30 @@
package com.panzhihua.common.model.dtos.shop;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @auther yh
 * @create 2022-11-08 17:25:45
 * @describe 分页查询配送单列表
 */
@Data
@ApiModel("花城分页查询配送单列表")
public class PageComFlowerOrderDeliveryDTO {

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty(value = "配送单状态(1.配送中 2.已送达)")
    private Integer deliveryStatus;

    @ApiModelProperty(value = "配送单号")
    private String deliveryNo;

    @ApiModelProperty(value = "商家id")
    private Long storeId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComFlowerOrderListDTO.java

@@ -21,6 +21,12 @@
    @ApiModelProperty(value = "订单状态(1.等待配送 2.配送中 3.待收货 4.待评价 5.已完成 6.已取消 7.已退款)")
    private Integer status;

    @ApiModelProperty(value = "自提点id")
    private Integer pointId;

    @ApiModelProperty(value = "商户id")
    private Long storeId;

    @ApiModelProperty(value = "用户id", hidden = true)
    private Long userId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientElevatingPointVO.java

@@ -92,4 +92,16 @@
     */
    @ApiModelProperty("距离手机定位距离")
    private Double distance;

    /**
     * 配送订单数量
     */
    @ApiModelProperty(value = "配送订单数量")
    private Integer deliveryOrderNum;

    /**
     * 配送商品数量
     */
    @ApiModelProperty(value = "配送商品数量")
    private Integer deliveryGoodsNum;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderDeliveryVO.java

New file
@@ -0,0 +1,121 @@
package com.panzhihua.common.model.vos.shop;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;

/**
 * @ClassName: ComShopFlowerOrderDelivery
 * @Author: yh
 * @Date: 2022/11/15 14:36
 * @Description: 花城订单配送表
 */
@Data
@ApiModel("订单配送表")
public class ComShopFlowerOrderDeliveryVO {

    /**
     * 配送单id
     */
    @ApiModelProperty(value = "配送单id")
    private Long id;

    /**
     * 店铺id
     */
    @ApiModelProperty(value = "店铺id")
    private Long storeId;

    /**
     * 配送单号
     */
    @ApiModelProperty(value = "配送单号")
    private String deliveryNo;

    /**
     * 配送单状态(1.配送中 2.已送达)
     */
    @ApiModelProperty(value = "配送单状态(1.配送中 2.已送达)")
    private Integer deliveryStatus;

    /**
     * 删除状态(1.未删除 2.已删除)
     */
    @ApiModelProperty(value = "删除状态(1.未删除 2.已删除)")
    private Integer deleteStatus;

    /**
     * 配送时间
     */
    @ApiModelProperty(value = "配送时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date deliveryTime;

    /**
     * 送达时间
     */
    @ApiModelProperty(value = "送达时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date serviceTime;

    /**
     * 配送方式（1.自提  2.快递）
     */
    @ApiModelProperty(value = " 配送方式（1.自提  2.快递）")
    private Integer deliveryType;

    /**
     * 自提点id
     */
    @ApiModelProperty(value = "自提点id")
    private Long pointId;

    /**
     * 自提点名称
     */
    @ApiModelProperty(value = "自提点名称")
    private Long pointName;

    /**
     * 配送订单数量
     */
    @ApiModelProperty(value = "配送订单数量")
    private Integer deliveryOrderNum;

    /**
     * 配送商品数量
     */
    @ApiModelProperty(value = "配送商品数量")
    private Integer deliveryGoodsNum;

    /**
     * 价值
     */
    @ApiModelProperty(value = "价值")
    private BigDecimal deliveryAmount;

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    /**
     * 修改时间
     */
    @ApiModelProperty(value = "修改时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateAt;

    @ApiModelProperty(value = "自提点信息")
    private ConvenientElevatingPointVO convenientElevatingPointVO;


}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderPageVO.java

@@ -97,4 +97,10 @@
    @ApiModelProperty(value = "评价")
    private ComShopFlowerEvaluateVO comShopFlowerEvaluateVO;

    @ApiModelProperty(value = "配送单id")
    private Long deliveryId;

    @ApiModelProperty(value = "配送单号")
    private String deliveryNo;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderStoreListVO.java

New file
@@ -0,0 +1,62 @@
package com.panzhihua.common.model.vos.shop;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

@Data
@ApiModel("商家订单列表VO")
public class ComShopFlowerOrderStoreListVO {

    @ApiModelProperty(value = "订单id")
    private Long orderId;

    @ApiModelProperty(value = "订单号")
    private String orderNo;

    @ApiModelProperty(value = "订单状态(1.等待配送 2.配送中 3.待收货 4.待评价 5.已完成 6.已取消 7.已退款)")
    private Integer status;

    @ApiModelProperty(value = "配送方式")
    private Integer deliveryType;

    @ApiModelProperty(value = "商品名称")
    private String goodsName;

    @ApiModelProperty(value = "规格名称")
    private String goodsAttrName;

    @ApiModelProperty(value = "购买数量")
    private Integer amount;

    @ApiModelProperty(value = "商品规格价格")
    private BigDecimal goodsAttrPrice;

    @ApiModelProperty(value = "商品规格图")
    private String goodsAttrPic;

    @ApiModelProperty(value = "订单金额")
    private BigDecimal totalAmount;


    @ApiModelProperty(value = "收货人名称")
    private String name;

    @ApiModelProperty(value = "发货时间")
    private String phone;

    @ApiModelProperty(value = "收货人省份名称")
    private String provinceName;

    @ApiModelProperty(value = "收货人城市名称")
    private String cityName;

    @ApiModelProperty(value = "收货人区县名称")
    private String districtName;

    @ApiModelProperty(value = "收货人详细地址")
    private String detailAddress;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -10900,4 +10900,50 @@
    @ApiOperation(value = "取货码")
    @GetMapping("/shopFlower/getQRCode")
    R getQRCode(@RequestParam("id") Long id);

    /**
     * 保存配送单
     * @param comShopFlowerOrderDeliveryDTO
     */
    @PostMapping("/shopFlower/saveDelivery")
    R saveDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO);

    /**
     * 更新配送单
     * @param comShopFlowerOrderDeliveryDTO
     */
    @PostMapping("/shopFlower/updateDelivery")
    R updateDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO);

    /**
     * 已配送、已送达 分页查询
     * @param pageComFlowerOrderDeliveryDTO
     * @return
     */
    @PostMapping("/shopFlower/pageDelivery")
    R pageDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO);

    /**
     * 未配送 分页查询
     * @param pageComFlowerOrderDeliveryDTO
     * @return
     */
    @PostMapping("/shopFlower/pageNoDelivery")
    R pageNoDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO);

    /**
     * 未配送-开始配送-订单列表
     * @param pageComFlowerOrderListDTO
     * @return
     */
    @PostMapping("/shopFlower/pageNoDeliveryOrderList")
    R pageNoDeliveryOrderList(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO);

    /**
     * 根据商家id查询商家的订单
     * @param pageComFlowerOrderListDTO
     * @return
     */
    @PostMapping("/shopFlower/pageOrderByStoreId")
    R pageOrderByStoreId(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO)
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/OrderNoUtils.java

@@ -8,7 +8,8 @@
    private static int sn = 0;

    // 防止创建类的实例
    private OrderNoUtils() {}
    private OrderNoUtils() {
    }

    public static String NextOrderNo(Long userId) {
        if (sn == 999)
@@ -20,6 +21,16 @@
            + getRandomNumber();
    }

    public static String nextDeliveryNo() {
        if (sn == 999)
            sn = 0;
        else
            sn++;
        DateFormat df = new SimpleDateFormat("MMddHHmmss");
        return "PS" + df.format(new Date()) + padRight(String.valueOf(sn), 3, '0')
                + getRandomNumber();
    }

    public static String padLeft(String src, int len, char ch) {
        int diff = len - src.length();
        if (diff <= 0) {

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java

@@ -1,10 +1,8 @@
package com.panzhihua.service_community.api;

import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.AddShopFlowerGoodsVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.service.*;
import com.panzhihua.service_community.util.QRCodeUtil;
import io.swagger.annotations.ApiOperation;
@@ -24,7 +22,7 @@
    //    @Resource
//    private ComShopOperLogService comShopOperLogService;
    @Resource
    private ComShopFlowerOrderService comShopOrderService;
    private ComShopFlowerOrderService comShopFlowerOrderService;
    //    @Resource
//    private ComShopCartService comShopCartService;
    @Resource
@@ -34,6 +32,8 @@
    private ConvenientMerchantService convenientMerchantService;
    @Resource
    private ComShopFlowerEvaluateService comShopFlowerEvaluateService;
    @Resource
    private ComShopFlowerOrderDeliveryService comShopFlowerOrderDeliveryService;


    /**
@@ -167,7 +167,7 @@
     */
    @PostMapping("orderPreview")
    public R orderPreviewFlower(@RequestBody ComShopOrderPreviewDTO orderPreviewDTO) {
        return comShopOrderService.orderPreview(orderPreviewDTO);
        return comShopFlowerOrderService.orderPreview(orderPreviewDTO);
    }

    /**
@@ -178,7 +178,7 @@
     */
    @PostMapping("orderCreate")
    public R orderCreateFlower(@RequestBody ComShopOrderCreateDTO orderCreateDTO) {
        return comShopOrderService.orderCreate(orderCreateDTO);
        return comShopFlowerOrderService.orderCreate(orderCreateDTO);
    }

    /**
@@ -189,7 +189,7 @@
     */
    @PostMapping("pageOrderList")
    public R pageOrderListFlower(@RequestBody PageComFlowerOrderListDTO comOrderListDTO) {
        return comShopOrderService.pageOrderList(comOrderListDTO);
        return comShopFlowerOrderService.pageOrderList(comOrderListDTO);
    }

    /**
@@ -200,7 +200,7 @@
     */
    @PostMapping("orderDetail")
    public R orderDetailFlower(@RequestParam("orderId") Long orderId) {
        return comShopOrderService.orderDetail(orderId);
        return comShopFlowerOrderService.orderDetail(orderId);
    }

    /**
@@ -211,7 +211,7 @@
     */
    @PostMapping("orderCancel")
    public R orderCancelFlower(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
        return comShopOrderService.orderCancel(comShopOrderQueryDTO);
        return comShopFlowerOrderService.orderCancel(comShopOrderQueryDTO);
    }

    /**
@@ -222,7 +222,7 @@
     */
    @PostMapping("orderDelete")
    public R orderDeleteFlower(@RequestParam("orderId") Long orderId) {
        return comShopOrderService.orderDelete(orderId);
        return comShopFlowerOrderService.orderDelete(orderId);
    }

    /**
@@ -233,7 +233,7 @@
     */
    @PostMapping("orderConfirm")
    public R orderConfirmFlower(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
        return comShopOrderService.orderConfirm(comShopOrderQueryDTO.getOrderId(), comShopOrderQueryDTO.getPhone());
        return comShopFlowerOrderService.orderConfirm(comShopOrderQueryDTO.getOrderId(), comShopOrderQueryDTO.getPhone());
    }

    /**
@@ -244,7 +244,7 @@
     */
    @PostMapping("/order/page")
    public R pageShopOrderFlower(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO) {
        return comShopOrderService.pageShopOrder(pageComShopOrderSearchDTO);
        return comShopFlowerOrderService.pageShopOrder(pageComShopOrderSearchDTO);
    }

    /**
@@ -255,7 +255,7 @@
     */
    @PostMapping("/shipOrder")
    public R shipOrderFlower(@RequestBody ComShopOrderShipDTO orderShipDTO) {
        return comShopOrderService.shipOrder(orderShipDTO);
        return comShopFlowerOrderService.shipOrder(orderShipDTO);
    }

    /**
@@ -266,7 +266,7 @@
     */
    @PostMapping("/deliverOrder")
    public R deliverOrderFlower(@RequestBody ComShopOrderDeliverDTO deliverDTO) {
        return comShopOrderService.deliverOrder(deliverDTO);
        return comShopFlowerOrderService.deliverOrder(deliverDTO);
    }

    /**
@@ -277,12 +277,13 @@
     */
    @PostMapping("/finishDeliverOrder")
    public  R finishDeliverOrderFlower(@RequestBody ComShopOrderDeliverDTO deliverDTO) {
        return comShopOrderService.finishDeliverOrder(deliverDTO);
        return comShopFlowerOrderService.finishDeliverOrder(deliverDTO);
    }


    /**
     * 保存评价
     *
     * @param comShopFlowerEvaluateDTO
     * @return
     */
@@ -293,6 +294,7 @@

    /**
     * 分页查询评价
     *
     * @param pageComShopFlowerEvaluateDTO
     * @return
     */
@@ -303,6 +305,7 @@

    /**
     * 评价详情
     *
     * @param id
     * @return
     */
@@ -313,6 +316,7 @@

    /**
     * 删除评价
     *
     * @param id
     * @return
     */
@@ -323,6 +327,7 @@

    /**
     * 取货码
     *
     * @param id
     * @return
     */
@@ -330,6 +335,71 @@
    @GetMapping("getQRCode")
    public R getQRCode(@RequestParam("id") Long id){
        return R.ok(QRCodeUtil.getBase64QRCode(id.toString()));
    }


    /**
     * 保存配送单
     *
     * @param comShopFlowerOrderDeliveryDTO
     */
    @PostMapping("saveDelivery")
    public R saveDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO) {
        return comShopFlowerOrderDeliveryService.saveDelivery(comShopFlowerOrderDeliveryDTO);
    }

    /**
     * 更新配送单
     *
     * @param comShopFlowerOrderDeliveryDTO
     */
    @PostMapping("updateDelivery")
    public R updateDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO) {
        return comShopFlowerOrderDeliveryService.updateDelivery(comShopFlowerOrderDeliveryDTO);
    }

    /**
     * 已配送、已送达 分页查询
     *
     * @param pageComFlowerOrderDeliveryDTO
     * @return
     */
    @PostMapping("pageDelivery")
    public R pageDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO) {
        return comShopFlowerOrderDeliveryService.pageDelivery(pageComFlowerOrderDeliveryDTO);
    }

    /**
     * 未配送 分页查询
     *
     * @param pageComFlowerOrderDeliveryDTO
     * @return
     */
    @PostMapping("pageNoDelivery")
    public R pageNoDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO) {
        return comShopFlowerOrderDeliveryService.pageNoDelivery(pageComFlowerOrderDeliveryDTO);
    }

    /**
     * 未配送-开始配送-订单列表
     *
     * @param pageComFlowerOrderListDTO
     * @return
     */
    @PostMapping("pageNoDeliveryOrderList")
    public R pageNoDeliveryOrderList(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO) {
        return comShopFlowerOrderDeliveryService.pageNoDeliveryOrderList(pageComFlowerOrderListDTO);
    }

    /**
     * 根据商家id查询商家的订单
     *
     * @param pageComFlowerOrderListDTO
     * @return
     */
    @PostMapping("pageOrderByStoreId")
    public R pageOrderByStoreId(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO) {
        return comShopFlowerOrderService.pageOrderByStoreId(pageComFlowerOrderListDTO);
    }

    /**
@@ -510,11 +580,4 @@
    }*/


    /**
     * 保存评价
     * @return
     */
    public R saveEvaluate(){
        return R.ok();
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderDAO.java

@@ -6,11 +6,14 @@
import com.panzhihua.common.model.dtos.shop.PageComFlowerOrderListDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
import com.panzhihua.common.model.vos.shop.ComShopFlowerOrderPageVO;
import com.panzhihua.common.model.vos.shop.ComShopFlowerOrderStoreListVO;
import com.panzhihua.common.model.vos.shop.ComShopOrderSearchVO;
import com.panzhihua.service_community.model.dos.ComShopFlowerOrderDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

import java.util.Date;
import java.util.List;

/**
 * @ClassName: ComShopFlowerOrderMapper
@@ -25,6 +28,34 @@
    IPage<ComShopFlowerOrderPageVO> pageOrderList(@Param("page") Page page, @Param("comOrderListDTO") PageComFlowerOrderListDTO comOrderListDTO);


    IPage<ComShopFlowerOrderPageVO> pageOrderListNoDelivery(@Param("page") Page page, @Param("comOrderListDTO") PageComFlowerOrderListDTO comOrderListDTO);


    IPage<ComShopOrderSearchVO> pageOrderBy(@Param("page") Page page,
                                            @Param("pageComShopOrderSearchDTO") PageComShopOrderSearchDTO pageComShopOrderSearchDTO);

    /**
     * 修改配送中状态
     *
     * @param orderIds
     * @param deliveryId
     * @param status
     * @param deliveryTime
     */
    void updateOrder(@Param("orderIds") List<Long> orderIds,
                     @Param("deliveryId") Long deliveryId,
                     @Param("deliveryNo") String deliveryNo,
                     @Param("status") int status,
                     @Param("deliveryTime") Date deliveryTime);

    /**
     * 自提送达后修改配送状态和时间
     *
     * @param deliveryId
     * @param serviceTime
     * @param status
     */
    void updateOrderStatus(@Param("deliveryId") Long deliveryId, @Param("serviceTime") Date serviceTime, @Param("status") int status);

    IPage<ComShopFlowerOrderStoreListVO> pageOrderByStoreId(@Param("page") Page page,@Param("comOrderListDTO") PageComFlowerOrderListDTO comOrderListDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderDeliveryDAO.java

@@ -1,8 +1,14 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.shop.PageComFlowerOrderDeliveryDTO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointVO;
import com.panzhihua.common.model.vos.shop.ComShopFlowerOrderDeliveryVO;
import com.panzhihua.service_community.model.dos.ComShopFlowerOrderDeliveryDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * @ClassName: ComShopFlowerOrderDeliveryMapper
@@ -12,4 +18,14 @@
 */
@Mapper
public interface ComShopFlowerOrderDeliveryDAO extends BaseMapper<ComShopFlowerOrderDeliveryDO> {
    /**
     * 分页查询配送单
     *
     * @param page
     * @param pageComFlowerOrderDeliveryDTO
     * @return
     */
    IPage<ComShopFlowerOrderDeliveryVO> pageDelivery(@Param("page") Page page, @Param("pageComFlowerOrderDeliveryDTO") PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO);


}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientElevatingPointDAO.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.convenient.PageConvenientElevatingPointDTO;
import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.shop.PageComFlowerOrderDeliveryDTO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.service_community.model.dos.ConvenientElevatingPointDO;
@@ -37,4 +38,12 @@
     * @return
     */
    int deletePointById(@Param("pointId") Long pointId, @Param("operator") Long operator);

    /**
     * 分页查询未配送的自提点
     * @param page
     * @param pageComFlowerOrderDeliveryDTO
     * @return
     */
    IPage<ConvenientElevatingPointVO> pageNoDelivery(@Param("page") Page page, @Param("pageComFlowerOrderDeliveryDTO") PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderDO.java

@@ -179,6 +179,16 @@
     */
    private Long pointId;

    /**
     * 配送单id
     */
    private Long deliveryId;

    /**
     * 配送单号
     */
    private String deliveryNo;


    /**
     * 订单状态(0.待付款 1.等待配送 2.配送中 3.待收货 4.待评价 5.已完成 6.已取消 7.已退款)

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderDeliveryDO.java

@@ -39,13 +39,13 @@
     * 配送单状态(1.配送中 2.已送达)
     */
    @TableField(value = "delivery_status")
    private Byte deliveryStatus;
    private Integer deliveryStatus;

    /**
     * 删除状态(1.未删除 2.已删除)
     */
    @TableField(value = "delete_status")
    private Byte deleteStatus;
    private Integer deleteStatus;

    /**
     * 配送时间
@@ -63,7 +63,7 @@
     * 配送方式（1.自提  2.快递）
     */
    @TableField(value = "delivery_type")
    private Byte deliveryType;
    private Integer deliveryType;

    /**
     * 自提点id
@@ -107,5 +107,19 @@
    @TableField(value = "update_at", fill = FieldFill.UPDATE)
    private Date updateAt;

    /**
     * 配送单状态(1.配送中 2.已送达)
     */
    public interface deliveryStatus {
        int psz = 1;
        int ysd = 2;
    }

    /**
     * 删除状态(1.未删除 2.已删除)
     */
    public interface deleteStatus {
        int wsc = 1;
        int ysc = 2;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopFlowerOrderDeliveryService.java

@@ -1,6 +1,10 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.shop.ComShopFlowerOrderDeliveryDTO;
import com.panzhihua.common.model.dtos.shop.PageComFlowerOrderDeliveryDTO;
import com.panzhihua.common.model.dtos.shop.PageComFlowerOrderListDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComShopFlowerOrderDeliveryDO;

/**
@@ -10,4 +14,37 @@
 */
public interface ComShopFlowerOrderDeliveryService extends IService<ComShopFlowerOrderDeliveryDO> {


    /**
     * 保存配送单
     * @param comShopFlowerOrderDeliveryDTO
     */
    R saveDelivery(ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO);

    /**
     * 保存配送单
     * @param comShopFlowerOrderDeliveryDTO
     */
    R updateDelivery(ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO);

    /**
     * 已配送、已送达 分页查询
     * @param pageComFlowerOrderDeliveryDTO
     * @return
     */
    R pageDelivery(PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO);

    /**
     * 未配送 分页查询
     * @param pageComFlowerOrderDeliveryDTO
     * @return
     */
    R pageNoDelivery(PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO);

    /**
     * 未配送-开始配送-订单列表
     * @param pageComFlowerOrderListDTO
     * @return
     */
    R pageNoDeliveryOrderList(PageComFlowerOrderListDTO pageComFlowerOrderListDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopFlowerOrderService.java

@@ -184,4 +184,11 @@
     * @return 返回支付对象
     */
    R wxPay(OrderPayDTO orderPayDTO);

    /**
     * 商户分页查询快递订单
     * @param pageComFlowerOrderListDTO
     * @return
     */
    R pageOrderByStoreId(PageComFlowerOrderListDTO pageComFlowerOrderListDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderDeliveryServiceImpl.java

@@ -1,11 +1,35 @@
package com.panzhihua.service_community.service.impl;

import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.shop.ComShopFlowerOrderDeliveryDTO;
import com.panzhihua.common.model.dtos.shop.PageComFlowerOrderDeliveryDTO;
import com.panzhihua.common.model.dtos.shop.PageComFlowerOrderListDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointVO;
import com.panzhihua.common.model.vos.shop.ComShopFlowerOrderDeliveryVO;
import com.panzhihua.common.model.vos.shop.ComShopFlowerOrderPageVO;
import com.panzhihua.common.utlis.OrderNoUtils;
import com.panzhihua.service_community.dao.ComShopFlowerOrderDAO;
import com.panzhihua.service_community.dao.ComShopFlowerOrderDeliveryDAO;
import com.panzhihua.service_community.dao.ConvenientElevatingPointDAO;
import com.panzhihua.service_community.model.dos.ComShopFlowerOrderDO;
import com.panzhihua.service_community.model.dos.ComShopFlowerOrderDeliveryDO;
import com.panzhihua.service_community.model.dos.ConvenientElevatingPointDO;
import com.panzhihua.service_community.service.ComShopFlowerOrderDeliveryService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.Objects;

import static java.util.Objects.nonNull;

/**
 * @auther yh
@@ -17,4 +41,80 @@
public class ComShopFlowerOrderDeliveryServiceImpl extends ServiceImpl<ComShopFlowerOrderDeliveryDAO, ComShopFlowerOrderDeliveryDO>
        implements ComShopFlowerOrderDeliveryService {

    @Resource
    private ComShopFlowerOrderDAO comShopFlowerOrderDAO;
    @Resource
    private ConvenientElevatingPointDAO convenientElevatingPointDAO;


    @Override
    public R saveDelivery(ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO) {
        ComShopFlowerOrderDeliveryDO comShopFlowerOrderDeliveryDO = new ComShopFlowerOrderDeliveryDO();
        BeanUtils.copyProperties(comShopFlowerOrderDeliveryDTO,comShopFlowerOrderDeliveryDO);
        //创建配送单号
        String deliveryNo = OrderNoUtils.nextDeliveryNo();
        comShopFlowerOrderDeliveryDO.setDeliveryNo(deliveryNo);
        comShopFlowerOrderDeliveryDO.setDeliveryTime(new Date());
        comShopFlowerOrderDeliveryDO.setDeleteStatus(ComShopFlowerOrderDeliveryDO.deliveryStatus.psz);
        comShopFlowerOrderDeliveryDO.setDeleteStatus(ComShopFlowerOrderDeliveryDO.deleteStatus.wsc);
        int insert = this.baseMapper.insert(comShopFlowerOrderDeliveryDO);
        if (insert > 0){
            Long deliveryId = comShopFlowerOrderDeliveryDO.getId();
            List<Long> orderIds = comShopFlowerOrderDeliveryDTO.getOrderIds();
            if (CollUtil.isNotEmpty(orderIds)){
                comShopFlowerOrderDAO.updateOrder(orderIds,deliveryId,comShopFlowerOrderDeliveryDO.getDeliveryNo(), ComShopFlowerOrderDO.status.psz,comShopFlowerOrderDeliveryDO.getDeliveryTime());
            }
        }
        return R.ok();
    }

    @Override
    public R updateDelivery(ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO) {
        Long id = comShopFlowerOrderDeliveryDTO.getId();
        if (null == id){
            return R.fail("配送单id不能为空");
        }
        ComShopFlowerOrderDeliveryDO comShopFlowerOrderDeliveryDO = this.baseMapper.selectById(id);
        if (Objects.isNull(comShopFlowerOrderDeliveryDO)){
            return R.fail("不存在该配送单");
        }
        comShopFlowerOrderDeliveryDO.setServiceTime(new Date());
        comShopFlowerOrderDeliveryDO.setDeleteStatus(ComShopFlowerOrderDeliveryDO.deliveryStatus.ysd);
        int update = this.baseMapper.updateById(comShopFlowerOrderDeliveryDO);
        if (update > 0){
            comShopFlowerOrderDAO.updateOrderStatus(comShopFlowerOrderDeliveryDO.getId(),comShopFlowerOrderDeliveryDO.getServiceTime(),ComShopFlowerOrderDO.status.dsh);
        }
        return  R.ok();
    }

    @Override
    public R pageDelivery(PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO) {
        Page page = new Page<>(pageComFlowerOrderDeliveryDTO.getPageNum(),pageComFlowerOrderDeliveryDTO.getPageSize());
        IPage<ComShopFlowerOrderDeliveryVO> page1 = this.baseMapper.pageDelivery(page, pageComFlowerOrderDeliveryDTO);
        for (ComShopFlowerOrderDeliveryVO record : page1.getRecords()) {
            Long pointId = record.getPointId();
            ConvenientElevatingPointDO convenientElevatingPointDO = convenientElevatingPointDAO.selectById(pointId);
            ConvenientElevatingPointVO convenientElevatingPointVO = new ConvenientElevatingPointVO();
            BeanUtils.copyProperties(convenientElevatingPointDO,convenientElevatingPointVO);
            record.setConvenientElevatingPointVO(convenientElevatingPointVO);
        }

        return R.ok(page1);
    }

    @Override
    public R pageNoDelivery(PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO) {
        Page page = new Page<>(pageComFlowerOrderDeliveryDTO.getPageNum(),pageComFlowerOrderDeliveryDTO.getPageSize());
        IPage<ConvenientElevatingPointVO> page1 = convenientElevatingPointDAO.pageNoDelivery(page, pageComFlowerOrderDeliveryDTO);
        return R.ok(page1);
    }

    @Override
    public R pageNoDeliveryOrderList(PageComFlowerOrderListDTO pageComFlowerOrderListDTO) {
        Page page = new Page<>(pageComFlowerOrderListDTO.getPageNum(),pageComFlowerOrderListDTO.getPageSize());
        IPage<ComShopFlowerOrderPageVO> iPage = comShopFlowerOrderDAO.pageOrderListNoDelivery(page, pageComFlowerOrderListDTO);
        return R.ok(iPage);
    }


}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java

@@ -949,4 +949,13 @@
        shopOrderVO.setOrderTotal(orderDO.getTotalAmount());
        return R.ok(shopOrderVO);
    }

    @Override
    public R pageOrderByStoreId(PageComFlowerOrderListDTO pageComFlowerOrderListDTO) {

        Page page = new Page(pageComFlowerOrderListDTO.getPageNum(),pageComFlowerOrderListDTO.getPageSize());

        IPage<ComShopFlowerOrderStoreListVO> ipage = this.baseMapper.pageOrderByStoreId(page, pageComFlowerOrderListDTO);
        return R.ok(ipage);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComConvenientElevatingPointMapper.xml

@@ -51,4 +51,19 @@
    <update id="deletePointById">
        UPDATE com_convenient_elevating_point SET is_del = 1, updated_by = #{operator} WHERE id = #{pointId}
    </update>

    <select id="pageNoDelivery"
            resultType="com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointVO">
        SELECT ccep.*,count(csfo.id) delivery_order_num ,sum(og.amount) delivery_goods_num
        FROM com_convenient_elevating_point ccep
        LEFT JOIN com_shop_flower_order ON ccep.id = csfo.point_id
        LEFT JOIN com_shop_flower_order_goods og ON og.order_id = csfo.id
        WHERE
        csfo.`status` = 1
        <if test="pageComFlowerOrderDeliveryDTO.storeId != null">
            and csfo.store_id = #{pageComFlowerOrderDeliveryDTO.storeId}
        </if>
        GROUP BY ccep.id

    </select>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderDAO.xml

@@ -30,13 +30,15 @@
        <result column="service_time" jdbcType="TIMESTAMP" property="serviceTime"/>
        <result column="receiving_time" jdbcType="TIMESTAMP" property="receivingTime"/>
        <result column="refund_time" jdbcType="TIMESTAMP" property="refundTime"/>
        <result column="delivery_id" jdbcType="TIMESTAMP" property="deliveryId"/>
        <result column="delivery_no" jdbcType="TIMESTAMP" property="deliveryNo"/>
    </resultMap>
    <sql id="Base_Column_List">
        <!--@mbg.generated-->
        id, store_id, user_id, order_no, pay_no, wx_tarde_no, `status`, pay_status, receiver_id,
        delete_status, total_amount, discount_amount, pay_amount, pay_type, pay_time, delivery_type,
        delivery_status, remark, logistics_company, logistics_no, create_at, update_at, delivery_time,
        service_time, receiving_time, refund_time
        service_time, receiving_time, refund_time,point_id,delivery_id,delivery_no
    </sql>

    <select id="pageOrderList" resultType="com.panzhihua.common.model.vos.shop.ComShopFlowerOrderPageVO">
@@ -46,6 +48,15 @@
        and cso.user_id = #{comOrderListDTO.userId} <if test='comOrderListDTO.status != null'>AND cso.status =
        #{comOrderListDTO.status}
    </if>   order by create_at desc
    </select>

    <select id="pageOrderListNoDelivery" resultType="com.panzhihua.common.model.vos.shop.ComShopFlowerOrderPageVO">
        select id as orderId,order_no,store_id,`status`,pay_status,receiver_id,total_amount as
        orderTotal,pay_amount,delivery_type,remark,create_at from com_shop_flower_order as cso where 1=1 and
        cso.delete_status = 1 and cso.status = 1 and cso.delivery_type = 1
        <if test='comOrderListDTO.pointId != null'>AND cso.point_id = #{comOrderListDTO.pointId}
        </if>
        order by create_at desc
    </select>

    <select id="pageOrderBy" resultType="com.panzhihua.common.model.vos.shop.ComShopOrderSearchVO">
@@ -100,4 +111,44 @@
        </if>
        GROUP BY sr.id ORDER BY sr.create_at DESC
    </select>
    <update id="updateOrder">
        update com_shop_flower_order set delivery_time = #{deliveryTime},status = #{status},delivery_id =
        #{deliveryId},delivery_no = #{deliveryNo}
        where id in
        <foreach item='id' index='index' collection='orderIds' open='(' separator=',' close=')'>
            #{id}
        </foreach>
    </update>
    <update id="updateOrderStatus">
         update com_shop_flower_order set service_time = #{serviceTime},status = #{status} where delivery_id =#{deliveryId}
    </update>
    <select id="pageOrderByStoreId" resultType="com.panzhihua.common.model.vos.shop.ComShopFlowerOrderStoreListVO">
        SELECT
            o.id order_id,
            o.order_no,
            o.delivery_type,
            o.`status`,
            g.goods_name,
            g.goods_attr_name,
            g.amount,
            g.goods_attr_price,
            g.goods_attr_pic,
            o.total_amount,
            a.`name`,
            a.phone,
            a.province_name,
            a.city_name,
            a.district_name,
            a.detail_address
            FROM
                com_shop_flower_order o
                LEFT JOIN com_shop_flower_order_goods g ON o.id = g.order_id
                LEFT JOIN com_shop_flower_user_address a ON a.id = o.receiver_id
            WHERE 1=1 and o.delivery_type = 2
        <if test="comOrderListDTO.storeId != null">
            and o.store_id = #{comOrderListDTO.storeId}
        </if>

    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderDeliveryMapper.xml

@@ -26,4 +26,16 @@
        delivery_type, point_id, point_name, delivery_order_num, delivery_goods_num, delivery_amount,
        create_at, update_at
    </sql>
    <select id="pageDelivery" resultType="com.panzhihua.common.model.vos.shop.ComShopFlowerOrderDeliveryVO">
        select * from com_shop_flower_order_delivery where 1=1
        <if test="pageComFlowerOrderDeliveryDTO.deliveryNo != null and pageComFlowerOrderDeliveryDTO.deliveryNo != ''">
            and delivery_no like concat(#{pageComFlowerOrderDeliveryDTO.deliveryNo}, '%' )
        </if>
        <if test="pageComFlowerOrderDeliveryDTO.deliveryStatus != null">
            and delivery_status = #{pageComFlowerOrderDeliveryDTO.deliveryStatus}
        </if>
        order by update_at desc
    </select>


</mapper>