add jhyOrderDetails

Helius

2021-06-28 3ccbf5989183a6a9d79f501c7d68af9d132d31b0

add jhyOrderDetails

 gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java

@@ -7,6 +7,7 @@
import com.xzx.gc.order.dto.AddJhyOrderDto;
import com.xzx.gc.order.dto.JhyOrderListDto;
import com.xzx.gc.order.service.JhyOrderService;
import com.xzx.gc.order.vo.JhyOrderDetailsVo;
import com.xzx.gc.order.vo.JhyOrderListVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -14,6 +15,7 @@
import io.swagger.annotations.ApiResponses;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
@@ -47,5 +49,13 @@
        return JsonResult.success(result);
    }

    @ApiOperation("订单明细信息")
    @ApiResponses(
            @ApiResponse(code = 200, message = "success", response = JhyOrderDetailsVo.class)
    )
    @PostMapping(value = "/jhy/order/details/{orderId}")
    public JsonResult<Object> orderDetail(@PathVariable("orderId") Long orderId, HttpServletRequest request) {
        return JsonResult.success(jhyOrderService.orderDetails(orderId, getUserId(request)));
    }

}

 gc-order/src/main/java/com/xzx/gc/order/mapper/JhyOrderItemsMapper.java

@@ -2,6 +2,11 @@

import com.xzx.gc.entity.JhyOrderItems;
import com.xzx.gc.util.GcMapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

public interface JhyOrderItemsMapper extends GcMapper<JhyOrderItems> {

    List<JhyOrderItems> selectOrderItems(@Param("orderId") Long orderId);
}

 gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java

@@ -1,5 +1,6 @@
package com.xzx.gc.order.service;

import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
@@ -15,6 +16,7 @@
import com.xzx.gc.order.mapper.JhyOrderItemsMapper;
import com.xzx.gc.order.mapper.JhyOrderMapper;
import com.xzx.gc.order.mapper.SysEnvironmentalInfoMapper;
import com.xzx.gc.order.vo.JhyOrderDetailsVo;
import com.xzx.gc.order.vo.JhyOrderListVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -98,4 +100,22 @@
        List<JhyOrderListVo> data = jhyOrderMapper.selectJhyOrderList(orderListDto);
        return new PageInfo<>(data);
    }

    public JhyOrderDetailsVo orderDetails(Long orderId, String userId) {
        JhyOrder order = jhyOrderMapper.selectByPrimaryKey(orderId);
        List<JhyOrderItems> items = jhyOrderItemsMapper.selectOrderItems(orderId);

        BigDecimal total = BigDecimal.ZERO;
        for (JhyOrderItems item : items) {
            total = total.add(StrUtil.isNotBlank(item.getScore()) ? new BigDecimal(item.getScore()) : BigDecimal.ZERO);
        }

        JhyOrderDetailsVo detailsVo = new JhyOrderDetailsVo();
        BeanUtil.copyProperties(order, detailsVo);

        detailsVo.setAddress(order.getArea() + order.getAddress());
        detailsVo.setTotalPrice(total);
        detailsVo.setItems(items);
        return detailsVo;
    }
}

 gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderDetailItemsVo.java

New file
@@ -0,0 +1,30 @@
package com.xzx.gc.order.vo;

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

import java.math.BigDecimal;

@Data
@ApiModel(value = "JhyOrderDetailItemsVo", description = "集物员订单详情返回参数类")
public class JhyOrderDetailItemsVo {

    @ApiModelProperty("id")
    private Long id;

    @ApiModelProperty("明细标题")
    private String title;

    @ApiModelProperty("单价")
    private BigDecimal price;

    @ApiModelProperty("图片")
    private String picture;

    @ApiModelProperty(value = "重量")
    private String weight;

    @ApiModelProperty(value = "积分")
    private String score;
}

 gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderDetailsVo.java

New file
@@ -0,0 +1,33 @@
package com.xzx.gc.order.vo;

import com.xzx.gc.entity.JhyOrderItems;
import com.xzx.gc.entity.OrderItemInfo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

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

@Data
@ApiModel(value = "JhyOrderDetailsVo", description = "订单详情返回参数类")
public class JhyOrderDetailsVo {

    @ApiModelProperty(value = "地址")
    private String address;

    @ApiModelProperty(value = "姓名")
    private String username;

    @ApiModelProperty(value = "手机号")
    private String phone;

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

    @ApiModelProperty(value = "总积分")
    private BigDecimal totalPrice;

    @ApiModelProperty(value = "明细")
    private List<JhyOrderItems> items;
}

 gc-order/src/main/resources/mapper/order/JhyOrderItemsMapper.xml

@@ -2,4 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xzx.gc.order.mapper.JhyOrderItemsMapper">

    <select id="selectOrderItems" resultType="com.xzx.gc.entity.JhyOrderItems">
        select * from xzx_jhy_order_items where order_id=#{orderId}
    </select>
</mapper>