增加损耗单价，已经开发APP货源首页

performance-api/src/main/java/com/clx/performance/param/app/OrderGoodsListPageParam.java

+package com.clx.performance.param.app;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class OrderGoodsListPageParam extends PageParam {
+
+//    @ApiModelProperty(value = "货单类型", example = "1：全部 2：专属")
+//    @NotBlank(message = "类型")
+//    private String orderGoodsType;
+
+    @ApiModelProperty(value = "车牌号", example = "1")
+//    @NotNull(message = "车牌号")
+    private Integer truckNo;
+
+    @ApiModelProperty(value = "司机用户编号", example = "1")
+//    @NotNull(message = "司机用户编号空")
+    private Long driverUserNo;
+}

performance-api/src/main/java/com/clx/performance/vo/app/OrderGoodsAPPVO.java

+package com.clx.performance.vo.app;
+
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class OrderGoodsAPPVO {
+
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+
+    @ApiModelProperty("货单编号")
+    private String orderGoodsNo;
+
+    @ApiModelProperty("货单状态")
+    private Integer orderGoodsStatus;
+
+    @ApiModelProperty("提取吨数")
+    private String extractWeight;
+
+    @ApiModelProperty("剩余拉运吨数")
+    private String residueTransportWeight;
+
+    @ApiModelProperty("已拉运吨数")
+    private String alreadyTransportWeight;
+
+    @ApiModelProperty("发货地址ID")
+    private Integer sendAddressId;
+
+    @ApiModelProperty(value = "发货地址全称")
+    private String sendAddressAll;
+
+    @ApiModelProperty("发货地址简称")
+    private String sendAddressShorter;
+
+    @ApiModelProperty("发货地址经度")
+    private BigDecimal sendLongitude;
+
+    @ApiModelProperty("发货地址纬度")
+    private BigDecimal sendLatitude;
+
+    @ApiModelProperty("收货地址ID")
+    private Integer receiveAddressId;
+
+    @ApiModelProperty(value="收货地址全称")
+    private String reveiveAddressAll;
+
+    @ApiModelProperty("收货地址简称")
+    private String receiveAddressShorter;
+
+    @ApiModelProperty("收货地址经度")
+    private BigDecimal receiveLongitude;
+
+    @ApiModelProperty("收货地址纬度")
+    private BigDecimal receiveLatitude;
+
+    @ApiModelProperty("货物ID")
+    private Integer goodsId;
+
+    @ApiModelProperty("货物名称")
+    private String goodsName;
+
+    @ApiModelProperty("挂单方式  1公开派单  2定向派单")
+    private Integer pendingOrderWay;
+
+    @ApiModelProperty("定向运单失效时间")
+    private String directionalExpireTime;
+
+    @ApiModelProperty("最晚到达货源地时间/运单的最晚装货时间")
+    private String lastArriveSendTime;
+
+    @ApiModelProperty("挂单时间")
+    private String pendingOrderTime;
+
+    @ApiModelProperty("提取方式 1提取全部 2提取部分")
+    private Integer extractWay;
+
+    @ApiModelProperty("需要车辆/辆")
+    private Integer needTruckNum;
+
+    @ApiModelProperty("高级物流经理id")
+    private Integer seniorLogisticsManagerId;
+
+    @ApiModelProperty("高级物流经理姓名")
+    private String seniorLogisticsManagerName;
+
+    @ApiModelProperty("挂单运费")
+    @MoneyOutConvert
+    private BigDecimal pendingOrderFreight;
+
+    @ApiModelProperty("创建人用户编号")
+    private Long userNo;
+
+    @ApiModelProperty("创建人姓名")
+    private String userName;
+
+    @ApiModelProperty("创建时间")
+    private String createTime;
+
+
+}
\ No newline at end of file

performance-web/pom.xml

@@ -25,7 +25,11 @@
             <groupId>com.msl</groupId>
             <artifactId>msl-common</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.24</version>
+        </dependency>
         <dependency>
             <groupId>com.clx.cy</groupId>
             <artifactId>performance-api</artifactId>

performance-web/src/main/java/com/clx/performance/controller/app/AppGoodsOrderController.java

 package com.clx.performance.controller.app;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.OrderGoodsMapper;
+import com.clx.performance.param.app.OrderGoodsListPageParam;
 import com.clx.performance.service.OrderGoodsService;
+import com.clx.performance.vo.app.OrderGoodsAPPVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
+import com.msl.common.base.PageData;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
@@ -37,8 +41,24 @@ public class AppGoodsOrderController {
     @ApiOperation(value = "查看货单详情", notes = "<br>By:胡宇帆")
     @GetMapping("/getOrderGoodsInfo")
     @UnitCovert(param = false)
-    public Result<OrderGoodsVO> getOrderGoodsInfo(@RequestParam String orderGoodsNo) {
+    public Result<OrderGoodsVO> getOrderGoodsInfo(@Validated @RequestParam String orderGoodsNo) {
         return Result.ok(orderGoodsService.getOrderGoodsInfoByOrderGoodsNoForAPP(orderGoodsNo));
     }
 
+    @ApiOperation(value = "公开货单", notes = "<br>By:胡宇帆")
+    @PostMapping("/openOrderGoodsList")
+    @UnitCovert(param = false)
+    public Result<PageData<OrderGoodsAPPVO>> openOrderGoodsList(@RequestBody OrderGoodsListPageParam orderGoodsListPageParam) {
+        IPage<OrderGoodsAPPVO> page = orderGoodsService.openOrderPageGoodsList(orderGoodsListPageParam);
+
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+
+    }
+
+//    @ApiOperation(value = "专属货单", notes = "<br>By:胡宇帆")
+//    @PostMapping("/exclusiveOrderGoodsList")
+//    @UnitCovert(param = false)
+//    public Result<List<OrderGoodsVO>> exclusiveOrderGoodsList(@Validated @RequestBody OrderGoodsListParam orderGoodsListParam) {
+//        return Result.ok(orderGoodsService.openOrderPageGoodsList(orderGoodsListParam));
+//    }
 }

performance-web/src/main/java/com/clx/performance/controller/pc/GoodsOrderController.java

@@ -125,6 +125,8 @@ public class GoodsOrderController {
                     //提取吨数
                     orderGoods.setExtractWeight(child.getExtractWeight());
                     orderGoods.setResidueTransportWeight(child.getExtractWeight());
+                    orderGoods.setLossPrice(orderInfo.getLossPrice());
+
                     //提取方式 1提取全部 2提取部分
                     Integer extractWay = child.getExtractWay();
                     orderGoods.setExtractWay(extractWay);
@@ -189,6 +191,7 @@ public class GoodsOrderController {
                     //提取吨数
                     orderGoods.setExtractWeight(child.getExtractWeight());
                     orderGoods.setResidueTransportWeight(child.getExtractWeight());
+                    orderGoods.setLossPrice(orderInfo.getLossPrice());
                     //提取方式 1提取全部 2提取部分
                     Integer extractWay = child.getExtractWay();
                     if (extractWay.equals(2)) {

performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDao.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.order.params.PageOrderGoodsListParam;
 import com.clx.performance.mapper.OrderGoodsMapper;
 import com.clx.performance.model.OrderGoods;
+import com.clx.performance.param.app.OrderGoodsListPageParam;
+import com.clx.performance.vo.app.OrderGoodsAPPVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
 import com.msl.common.base.Optional;
 import com.msl.common.dao.BaseDao;
@@ -32,4 +34,5 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
 
     void updateOrderGoodsReduceWeightAndStatus(Integer id, BigDecimal orderChildWeight);
 
+    IPage<OrderGoodsAPPVO> openOrderPageGoodsList(OrderGoodsListPageParam orderGoodsListPageParam);
 }

performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java

@@ -7,6 +7,8 @@ import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.enums.OrderGoodsStatusEnum;
 import com.clx.performance.mapper.OrderGoodsMapper;
 import com.clx.performance.model.OrderGoods;
+import com.clx.performance.param.app.OrderGoodsListPageParam;
+import com.clx.performance.vo.app.OrderGoodsAPPVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
 import com.msl.common.base.Optional;
 import com.msl.common.dao.impl.BaseDaoImpl;
@@ -71,6 +73,11 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
         baseMapper.updateOrderGoodsWeightAndStatus(id, orderChildWeight, OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode());
     }
 
+    @Override
+    public IPage<OrderGoodsAPPVO> openOrderPageGoodsList(OrderGoodsListPageParam param) {
+        Page<OrderGoodsAPPVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.openOrderPageGoodsList(page);
+    }
 
 
 }

performance-web/src/main/java/com/clx/performance/mapper/OrderGoodsMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.order.params.PageOrderGoodsListParam;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.sqlProvider.OrderGoodsSqlProvider;
+import com.clx.performance.vo.app.OrderGoodsAPPVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.SelectProvider;
@@ -37,4 +38,7 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
             "order_goods_status = #{orderGoodsStatus}" +
             " where id = #{id}")
     void updateOrderGoodsWeightAndStatus(@Param("id") Integer id, @Param("weight") BigDecimal orderChildWeight, @Param("orderGoodsStatus") Integer orderGoodsStatus);
+
+    @SelectProvider(type = OrderGoodsSqlProvider.class, method = "openOrderPageGoodsList")
+    IPage<OrderGoodsAPPVO> openOrderPageGoodsList(Page<OrderGoodsAPPVO> page);
 }

performance-web/src/main/java/com/clx/performance/model/OrderGoods.java

@@ -39,6 +39,10 @@ public class OrderGoods implements HasKey<Integer> {
     @ApiModelProperty("货单状态")
     private Integer orderGoodsStatus;
 
+    @TableField("loss_price")
+    @ApiModelProperty("损耗单价(分)")
+    private BigDecimal lossPrice;
+
     @TableField("extract_weight")
     @ApiModelProperty("提取吨数")
     private BigDecimal extractWeight;

performance-web/src/main/java/com/clx/performance/service/OrderGoodsService.java

@@ -3,6 +3,8 @@ package com.clx.performance.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.order.params.PageOrderGoodsListParam;
+import com.clx.performance.param.app.OrderGoodsListPageParam;
+import com.clx.performance.vo.app.OrderGoodsAPPVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
 
 import java.math.BigDecimal;
@@ -21,4 +23,5 @@ public interface OrderGoodsService {
 
     void updateOrderGoodsReduceWeightAndStatus(Integer id, BigDecimal orderChildWeight);
 
+    IPage<OrderGoodsAPPVO> openOrderPageGoodsList(OrderGoodsListPageParam orderGoodsListParam);
 }

performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java

@@ -5,11 +5,11 @@ import com.clx.order.feign.OrderFeign;
 import com.clx.order.params.PageOrderGoodsListParam;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.dao.OrderGoodsDao;
+import com.clx.performance.param.app.OrderGoodsListPageParam;
 import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.struct.OrderGoodsStruct;
+import com.clx.performance.vo.app.OrderGoodsAPPVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
-import com.msl.common.base.PageData;
-import com.msl.common.result.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -62,4 +62,9 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         orderGoodsDao.updateOrderGoodsReduceWeightAndStatus(id, orderChildWeight);
     }
 
+    @Override
+    public IPage<OrderGoodsAPPVO> openOrderPageGoodsList(OrderGoodsListPageParam orderGoodsListParam) {
+        return orderGoodsDao.openOrderPageGoodsList(orderGoodsListParam);
+    }
+
 }

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsSqlProvider.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.order.params.PageOrderGoodsListParam;
 import com.clx.order.vo.feign.FeignPageOrderVO;
 import com.clx.performance.enums.OrderGoodsStatusEnum;
+import com.clx.performance.vo.app.OrderGoodsAPPVO;
+import com.clx.performance.vo.pc.OrderGoodsVO;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.jdbc.SQL;
@@ -71,4 +73,65 @@ public class OrderGoodsSqlProvider {
         }}.toString();
         return sql;
     }
+
+
+    public String openOrderPageGoodsList(@Param("page") Page<OrderGoodsAPPVO> page) {
+        String sql = new SQL() {{
+            SELECT("a.id, a.order_no," +
+                    " a.order_goods_no, a.order_goods_status, a.extract_weight, " +
+                    " a.residue_transport_weight,a.already_transport_weight, a.send_address_id, a.send_address_shorter,a.send_longitude," +
+                    " a.send_latitude,a.receive_address_id, a.receive_address_shorter,a.receive_longitude,a.receive_latitude," +
+                    "a.goods_id, a.goods_name, a.pending_order_way," +
+                    " date_format(a.directional_expire_time, '%Y-%m-%d %H:%i:%s') as directional_expire_time ," +
+                    " date_format(a.last_arrive_send_time, '%Y-%m-%d %H:%i:%s') as last_arrive_send_time ," +
+                    " date_format(a.pending_order_time, '%Y-%m-%d %H:%i:%s') as pending_order_time," +
+                    " date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time," +
+                    " date_format(a.modified_time, '%Y-%m-%d %H:%i:%s') as modified_time," +
+                    "a.extract_way,a.need_truck_num,a.senior_logistics_manager_id,a.senior_logistics_manager_name,a.pending_order_freight," +
+                    "a.user_no,a.user_name");
+            FROM("order_goods a");
+
+            WHERE("a.pending_order_way = 1");
+            WHERE("a.last_arrive_send_time >= now()");
+            WHERE("(a.order_goods_status = 20 or a.order_goods_status = 30)");
+            WHERE("a.residue_transport_weight >0");
+
+//            if (StringUtils.isNotBlank(param.getBeginTime()) && StringUtils.isNotBlank(param.getEndTime())) {
+//                WHERE("a.create_time >= #{param.beginTime}");
+//                WHERE("a.create_time <= #{param.endTime}");
+//            }
+
+//            if (Objects.nonNull(param.getTruckDemand())) {
+//                if (1 == param.getTruckDemand()) {
+//                    WHERE("a.truck_demand = #{param.truckDemand}");
+//                } else if (2 == param.getTruckDemand()) {
+//                    WHERE("a.truck_demand = #{param.truckDemand}");
+//                } else if (3 == param.getTruckDemand()) {
+//                    WHERE("a.truck_demand = #{param.truckDemand}");
+//                }
+//            }
+//            if (Objects.nonNull(param.getOrderGoodsStatus())) {
+//                if (OrderGoodsStatusEnum.Status.CREATED.getCode().equals(param.getOrderGoodsStatus())) {
+//                    WHERE("a.order_goods_status = #{param.orderGoodsStatus}");
+//                } else if (OrderGoodsStatusEnum.Status.PAYING.getCode().equals(param.getOrderGoodsStatus())) {
+//                    WHERE("a.order_goods_status = #{param.orderGoodsStatus}");
+//                } else if (OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode().equals(param.getOrderGoodsStatus())) {
+//                    WHERE("a.order_goods_status = #{param.orderGoodsStatus}");
+//                } else if (OrderGoodsStatusEnum.Status.ARRIVE_SEND.getCode().equals(param.getOrderGoodsStatus())) {
+//                    WHERE("a.order_goods_status = #{param.orderGoodsStatus}");
+//                } else if (OrderGoodsStatusEnum.Status.CANCEL.getCode().equals(param.getOrderGoodsStatus())) {
+//                    WHERE("a.order_goods_status = #{param.orderGoodsStatus}");
+//                }
+//            }
+//
+//            if (StringUtils.isNotBlank(param.getOrderNo())) {
+//                WHERE("a.order_no = #{param.orderNo}");
+//            }
+//            if (StringUtils.isNotBlank(param.getOrderGoodsNo())) {
+//                WHERE("a.order_goods_no = #{param.orderGoodsNo}");
+//            }
+            ORDER_BY("a.create_time desc");
+        }}.toString();
+        return sql;
+    }
 }