Merge remote-tracking branch 'origin/feature/asyncOrder' into feature/asyncOrder

# Conflicts:
#	sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrder.java
#	sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrderMapper.xml

sp-service/level-one-server/src/main/java/com/pj/tb_order/MethodOrderService.java

@@ -102,39 +102,4 @@ public class MethodOrderService {
         }
     }
 
-    public OrderVo setOrderVoProperties(TbOrder tbOrder,OrderVo orderVo){
-        //获取商家手机号
-        TbEnterprise enterprise = tbEnterpriseMapper.selectById(tbOrder.getEnterpriseId());
-        if(enterprise == null)throw new ServiceException("商家信息异常!");
-        orderVo.setConcat(enterprise.getOwnerTel());
-        //获取过审商品名称 计价单位 净重 毛重 商品发布时间
-        TbGoodsTransit goodsTransit = tbGoodsTransitMapper.selectById(tbOrder.getGoodsId());
-        if(goodsTransit == null)
-            throw new ServiceException("过审商品信息异常!");
-        orderVo.setOrderId(tbOrder.getId());
-        orderVo.setGoodsTransitName(goodsTransit.getGoodsName());
-        orderVo.setGoodsUnit(goodsTransit.getGoodsUnits());
-        orderVo.setNetWeight(goodsTransit.getNetWeight());
-        orderVo.setGrossWeight(goodsTransit.getGrossWeight());
-        orderVo.setGoodsTransitCreateTime(goodsTransit.getCreateTime());
-        //相关的所有边民
-//        List<TbOrderPeopleConfirm> peopleList = tbOrderPeopleConfirmMapper.selectList
-//                (new LambdaQueryWrapper<TbOrderPeopleConfirm>().eq(TbOrderPeopleConfirm::getGroupId, tbOrder.getGroupId()).eq(TbOrderPeopleConfirm::getOrderId, tbOrder.getId()));
-//        orderVo.setPeopleList(peopleList);
-        //订单创建时间
-        orderVo.setOrderCreateTime(tbOrder.getCreateTime());
-        //购买的互市组名称
-        orderVo.setGroupName(tbGroupMapper.selectById(tbOrder.getGroupId()).getOrgName());
-        //商户确认时间
-        orderVo.setEnterpriseConfirmTime(tbOrder.getCreateTime());
-        //todo: orderVo进境时间
-        orderVo.setEntrantTime(new Date());
-        //todo: orderVo进口时间
-        orderVo.setImportTime(new Date());
-        //todo: orderVo出互市区时间
-        orderVo.setOutFrontierTradeTime(new Date());
-
-        return orderVo;
-    }
-
 }

sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrder.java

@@ -1,19 +1,20 @@
 package com.pj.tb_order;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.*;
+import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 
-import java.io.Serializable;
-import java.util.Date;
+import lombok.Data;
+import lombok.experimental.Accessors;
 
 /**
  * Model: tb_order -- 订单表
- * @author yzs 
+ * @author loovi
  */
 @Data
 @Accessors(chain = true)
@@ -23,15 +24,15 @@ public class TbOrder extends Model<TbOrder> implements Serializable {
 
 	// ---------- 模块常量 ----------
 	/**
-	 * 序列化版本id 
+	 * 序列化版本id
 	 */
-	private static final long serialVersionUID = 1L;	
+	private static final long serialVersionUID = 1L;
 	/**
-	 * 此模块对应的表名 
+	 * 此模块对应的表名
 	 */
-	public static final String TABLE_NAME = "tb_order";	
+	public static final String TABLE_NAME = "tb_order";
 	/**
-	 * 此模块对应的权限码 
+	 * 此模块对应的权限码
 	 */
 	public static final String PERMISSION_CODE = "tb-order";
 	public static final String PERMISSION_CODE_ADD = "tb-order-add";
@@ -43,417 +44,320 @@ public class TbOrder extends Model<TbOrder> implements Serializable {
 
 	// ---------- 表中字段 ----------
 	/**
-	 * 主键 
+	 * 主键
 	 */
 	@TableId(type = IdType.AUTO)
-	private Long id;	
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Long id;
 
 	/**
-	 * 订单号 
+	 *
 	 */
-	private String tradeNo;	
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Long tradeAreaId;
 
 	/**
-	 * 交易地区ID 
+	 *
 	 */
-	private Long tradeAreaId;	
+	private String tradeAreaName;
 
 	/**
-	 * 交易地区名称 
+	 *
 	 */
-	private String tradeAreaName;	
+	private String addressIds;
 
 	/**
-	 * 地区ID集合 
+	 *
 	 */
-	private String addressIds;	
-
+	private Long saleMainId;
 	/**
-	 * 过审商品id 
+	 *
 	 */
-	private Long goodsId;	
+	private Long groupId;
 
 	/**
-	 * 卖家ID 
+	 *  过审商品id[goodstransitid]
 	 */
-	private Long saleMainId;	
+	private Long goodsId;
 
 	/**
-	 * 购买的互市组ID 
+	 * 订单号
 	 */
-	private Long groupId;	
+	private String tradeNo;
 
 	/**
-	 * 买家ID 
+	 * 买家ID
 	 */
-	private Long buyUserId;	
+	private Long buyUserId;
 
 	/**
-	 * 买家 
+	 * 买家
 	 */
-	private String buyUserName;	
+	private String buyUserName;
 
 	/**
-	 * 购买用户类型(3=边民,2=组长) 
+	 * 购买用户类型(3=边民,2=组长)
 	 */
-	private String buyUserType;	
+	private String buyUserType;
 
 	/**
-	 * 商家ID 
+	 * 商家ID
 	 */
-	private Long enterpriseId;	
+	private Long enterpriseId;
 
 	/**
-	 * 商家名称 
+	 * 商家名称
 	 */
-	private String enterpriseName;	
+	private String enterpriseName;
 
 	/**
-	 * 总重量 
+	 * 总重量
 	 */
-	private Double totalWeight;	
+	private Double totalWeight;
 
 	/**
-	 * 总金额 
+	 * 总金额
 	 */
-	private Double totalPrice;	
+	private Double totalPrice;
 
 	/**
-	 * 交易时间 
+	 * 交易时间
 	 */
-	private Date tradeTime;	
+	private Date tradeTime;
 
 	/**
-	 * 交易状态(0=未支付,1=已支付) 
+	 * 交易状态(0=未支付,1=已支付)
 	 */
 	private Integer tradeStatus;
 
 	/**
-	 * 支付方式(0=金融互助,1=现金刷卡) 
+	 * 边民或组长取消订单(0=未取消,1=已取消)
 	 */
-	private Integer payType;
+	private Integer cancelPeople;
 
 	/**
-	 * 结算时间 
+	 * 支付方式(0=金融互助,1=现金刷卡)
 	 */
-	private Date settleTime;
+	private Integer payType;
 
 	/**
-	 * 当前结算金额 
+	 * 结算时间
 	 */
-	private Double realPrice;	
+	private String settleTime;
 
 	/**
-	 * 应结金额 
+	 * 当前结算金额
 	 */
-	private Double shouldPrice;	
+	private Double realPrice;
 
 	/**
-	 * 对账人 
+	 * 应结金额
 	 */
-	private Long settleUserId;	
+	private Double shouldPrice;
 
 	/**
-	 * 对账人员 
+	 * 对账人
 	 */
-	private Long recordUserId;	
+	private Long settleUserId;
 
 	/**
-	 * 对账时间 
+	 * 对账人员
 	 */
-	private String recordTime;	
+	private Long recordUserId;
+
+
 
 	/**
-	 * 是否对账(0=否,) 
+	 * 对账时间
 	 */
-	private String record;	
+	private String recordTime;
 
 	/**
-	 * 退款原因 
+	 * 是否对账(0=否,)
 	 */
-	private String refundReason;	
+	private String record;
 
 	/**
-	 * 退款时间 
+	 * 退款原因
 	 */
-	private Date refundTime;
+	private String refundReason;
 
 	/**
-	 * 收货人名称 
+	 * 退款时间
 	 */
-	private String receiveName;	
+	private String refundTime;
 
 	/**
-	 * 收货人电话 
+	 *
 	 */
-	private String receivePhone;	
+	private String receiveName;
 
 	/**
-	 * 收货地址 
+	 *
 	 */
-	private String receiveAddress;	
+	private String receivePhone;
 
 	/**
-	 * 出互市区时间 
+	 *
 	 */
-	private Date outTime;
+	private String receiveAddress;
 
 	/**
-	 * 商品名称字符串 
+	 * 出互市区时间
 	 */
-	private String goodsNames;	
+	private String outTime;
 
 	/**
-	 * 商品图片 
+	 * 商品名称字符串
 	 */
-	private String goodsImg;	
+	private String goodsNames;
 
 	/**
-	 * 申报 
+	 * 是否申报
 	 */
 	private Integer apply;
 
 	/**
-	 * 申报时间 
+	 * 申报时间
 	 */
 	private Date applyTime;
 
 	/**
-	 * 申报结果 
+	 * 申报结果
 	 */
-	private String applyResult;	
+	private String applyResult;
 
 	/**
-	 * 申报单号 
+	 *
 	 */
-	private Long applyNo;	
+	private String applyFailReason;
 
 	/**
-	 * 申报失败理由 
+	 * 分配方式(0=均分,1=自选数量)
 	 */
-	private String applyFailReason;	
+	private String distribution;
 
 	/**
-	 * 分配方式(0=均分,1=自选数量) 
+	 * 一级市场边民确认状态(0=待确认,1=是)
 	 */
-	private String distribution;	
-
+	private Integer peopleConfirmStatus;
 	/**
-	 * 边民确认 
+	 * 一级市场边民确认类型(1=刷脸,2=指纹)
 	 */
-	private Integer peopleConfirmStatus;
-
+	private Integer peopleConfirmType;
 	/**
-	 * 边民确认类型 
+	 * 一级市场边民确认时间
 	 */
-	private String peopleConfirmType;	
+	private Date peopleConfirmTime;
 
 	/**
-	 * 边民确认时间 
+	 * 边民进口申报确认状态(0=待确认,1=是)
+	 */
+	private Integer applyConfirmStatus;
+	/**
+	 * 边民进口申报确认时间
 	 */
-	private String peopleConfirmTime;	
+	private Date applyConfirmTime;
 
 	/**
-	 * 一级市场商户确认(0=待确认,1=是,2=否) 
+	 * 一级市场商户确认(0=待确认,1=是)[j]
 	 */
 	private Integer enterpriseConfirm;
 
 	/**
-	 * 是否接单 
+	 * 是否接单
 	 */
-	private String pick;	
+	private String pick;
 
 	/**
-	 * 接单时间 
+	 * 接单时间
 	 */
 	private Date pickTime;
 
 	/**
-	 * 商铺ID 
+	 *
 	 */
-	private Long shopId;	
+	private Long shopId;
 
 	/**
-	 * 商铺名称 
+	 *
 	 */
-	private String shopName;	
+	private String shopName;
 
 	/**
-	 * 是否发货 
+	 * 是否发货
 	 */
 	private Integer send;
 
 	/**
-	 * 发货时间 
+	 * 发货时间
 	 */
-	private Date sendTime;
+	private String sendTime;
 
 	/**
-	 * 对应合作社的拼单订单ID 
+	 * 对应合作社的拼单订单ID
 	 */
-	private Long collageOrdersId;	
+	private Long collageOrdersId;
 
 	/**
-	 * 创建时间 
+	 * 创建时间
 	 */
 	private Date createTime;
 
 	/**
-	 * 创建人编号 
+	 * 创建人编号
 	 */
-	private Long
-			createBy;
+	private Long createBy;
 
 	/**
-	 * 创建人名称 
+	 * 创建人名称
 	 */
-	private String createName;	
+	private String createName;
 
 	/**
-	 * 更新时间 
+	 * 更新时间
 	 */
 	private Date updateTime;
 
 	/**
-	 * 更新人编号 
+	 * 更新人编号
 	 */
 	private Long updateBy;
 
 	/**
-	 * 更新人名称 
+	 * 更新人名称
 	 */
-	private String updateName;	
+	private String updateName;
 
 	/**
-	 * 删除状态(0=禁用,1=启用) 
+	 * 删除状态(0=禁用,1=启用)
 	 */
 	private Integer deleteStatus;
 
 	/**
-	 * 是否转售(0=未转售,1=已转售,2=转售中) 
-	 */
-	private Integer resaleStatus;
-
-	/**
-	 * 订单完成状态(0=未完成,1=已完成) 
+	 * 订单状态(0=未完成,1=已完成)
 	 */
 	private Integer finishStatus;
 
 	/**
-	 * 边民或组长取消订单(0=未取消,1=已取消) 
-	 */
-	private Integer cancelPeople;	
-
-	/**
-	 * 商品单位 
+	 * 申报单号
 	 */
-	private String goodsUnit;	
+	private Long applyNo;
 
 	/**
-	 * 叫车状态 
+	 * 是否转售(0=未转售,1=已转售)
 	 */
-	private Integer callCarStatus;	
-
-	/**
-	 * 互助委托申报确认状态 
-	 */
-	private String cooperEntrustStatus;	
-
-	/**
-	 * 互助委托申报确认时间 
-	 */
-	private Date cooperEntrustTime;
-
-	/**
-	 * 边民进口申报确认状态 
-	 */
-	private String applyConfirmStatus;	
-
-	/**
-	 * 边民进口申报确认时间 
-	 */
-	private Date applyConfirmTime;
-
-	/**
-	 * 车牌号 
-	 */
-	private String veNo;	
-
-	/**
-	 * 车航次(班)号 
-	 */
-	private String voyageNo;	
-
-	/**
-	 *  
-	 */
-	private String preNo;	
-
-	/**
-	 * 预申报编号 
-	 */
-	private String platSeqNo;	
-
-	/**
-	 * 边民姓名 
-	 */
-	private String borderName;	
-
-	/**
-	 * 身份证号 
-	 */
-	private String idno;	
-
-	/**
-	 * 边民备案编号 
-	 */
-	private String borderPutrecNo;	
-
-	/**
-	 * 结算单号 
-	 */
-	private String settleBillNo;	
-
-	/**
-	 * 申报金额 
-	 */
-	private Double buyAmount;	
-
-	/**
-	 * 净重 
-	 */
-	private Double netWt;	
-
-	/**
-	 * 毛重 
-	 */
-	private Double grossWt;	
-
-	/**
-	 * 申报数量 
-	 */
-	private Double buyQty;	
+	private Integer resaleStatus;
 
 	/**
-	 * 第一数量 
+	 * 叫车状态[默认是0=待叫车,1=已叫车,2=完成叫车]
 	 */
-	private Double buyQty1;	
+	private Integer callCarStatus;
 
-	/**
-	 * 第二数量 
-	 */
-	private Double buyQty2;	
 
 	/**
-	 * 进出口预申报单号 
+	 * 商品单位
 	 */
-	private String preIeportNo;	
-
-
-
-
-
-	
-
+	private String goodsUnit;
 
 }

sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrderAppController.java

@@ -4,7 +4,6 @@ import com.pj.api.dto.OrderDto;
 import com.pj.project4sp.SP;
 import com.pj.tb_order.vo.OrderVo;
 import com.pj.tb_order.vo.PeopleConfirmVo;
-import com.pj.tb_people.TbPeople;
 import com.pj.utils.sg.AjaxJson;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -100,8 +99,8 @@ public class TbOrderAppController {
 	 * @param orderId
 	 * @return
 	 */
-	@GetMapping("orderDetail")
-	public AjaxJson orderDetail(Long orderId){
+	@RequestMapping("orderDetail")
+	public AjaxJson orderDetail(@RequestParam("orderId")Long orderId){
 		return AjaxJson.getSuccessData(tbOrderService.orderDetail(orderId));
 	}
 
@@ -122,15 +121,36 @@ public class TbOrderAppController {
 		return AjaxJson.getPageData(Long.valueOf(list.size()), list);
 	}
 
-	@RequestMapping("confirmOrder")
-	public AjaxJson confirmOrder(@RequestParam("orderId")Long orderId, @RequestParam("confirmType")Integer confirmType) {
-		return AjaxJson.toAjax(tbOrderService.confirmOrder(orderId, confirmType));
+
+
+	/** app首页获取边民未确认订单 */
+	@RequestMapping("getNoConfirmOrder")
+	public AjaxJson getNoConfirmOrder() {
+		return AjaxJson.getSuccessData(tbOrderService.getNoConfirmOrder());
+	}
+
+	/** 获取一级市场边民订单的所有确认状态 */
+	@RequestMapping("getConfirmStatus")
+	public AjaxJson getConfirmStatus(@RequestParam("orderId")Long orderId) {
+		return AjaxJson.getSuccessData(tbOrderService.getConfirmStatus(orderId));
 	}
 
+	/** 边民订单确认 */
+	@RequestMapping("confirmOrder")
+	public AjaxJson confirmOrder(@RequestParam("orderId")Long orderId) {
+		return AjaxJson.toAjax(tbOrderService.confirmOrder(orderId));
+	}
+	/** 边民进口申报确认 */
 	@RequestMapping("applyOrder")
 	public AjaxJson applyOrder(@RequestParam("orderId")Long orderId) {
 		return AjaxJson.toAjax(tbOrderService.applyOrder(orderId));
 	}
+	/** 互助委托申报确认 */
+	@RequestMapping("cooperOrder")
+	public AjaxJson cooperOrder(@RequestParam("orderId")Long orderId) {
+		return AjaxJson.toAjax(tbOrderService.cooperOrder(orderId));
+	}
+
 
 	/*-----           正常业务逻辑👆👆    rpc远程调用👇👇 -----*/
 

sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrderMapper.java

@@ -2,6 +2,7 @@ package com.pj.tb_order;
 
 import java.util.List;
 
+import com.pj.tb_order.vo.ConfirmVo;
 import org.apache.ibatis.annotations.Mapper;
 
 import com.pj.utils.so.*;
@@ -10,7 +11,7 @@ import org.springframework.stereotype.Repository;
 
 /**
  * Mapper: tb_order -- 订单表
- * @author loovi 
+ * @author loovi
  */
 
 @Mapper
@@ -21,10 +22,11 @@ public interface TbOrderMapper extends BaseMapper <TbOrder> {
 
 	/**
 	 * 查集合 - 根据条件（参数为空时代表忽略指定条件）
-	 * @param so 参数集合 
-	 * @return 数据列表 
+	 * @param so 参数集合
+	 * @return 数据列表
 	 */
 	List<TbOrder> getList(SoMap so);
 
+	ConfirmVo getConfirmStatus(Long orderId);
 
 }

sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrderMapper.xml

@@ -6,30 +6,37 @@
 
 
 	<!-- ================================== 查询相关 ================================== -->
-	<!-- select id, trade_no, trade_area_id, trade_area_name, address_ids, goods_id, sale_main_id, group_id, buy_user_id, buy_user_name, buy_user_type, enterprise_id, enterprise_name, total_weight, total_price, trade_time, trade_status, pay_type, settle_time, real_price, should_price, settle_user_id, record_user_id, record_time, record, refund_reason, refund_time, receive_name, receive_phone, receive_address, out_time, goods_names, goods_img, apply, apply_time, apply_result, apply_no, apply_fail_reason, distribution, people_confirm_status, people_confirm_type, people_confirm_time, enterprise_confirm, pick, pick_time, shop_id, shop_name, send, send_time, collage_orders_id, create_time, create_by, create_name, update_time, update_by, update_name, delete_status, resale_status, finish_status, cancel_people, goods_unit, call_car_status, cooper_entrust_status, cooper_entrust_time, apply_confirm_status, apply_confirm_time, ve_no, voyage_no, pre_no, plat_seq_no, border_name, idno, border_putrec_no, settle_bill_no, buy_amount, net_wt, gross_wt, buy_qty, buy_qty1, buy_qty2, pre_ieport_no from tb_order  -->
-	
+	<!-- select id, trade_area_id, trade_area_name, address_ids, sale_main_id, trade_no, buy_user_id, buy_user_name, buy_user_type, enterprise_id, enterprise_name, total_weight, total_price, trade_time, trade_status, pay_type, settle_time, real_price, should_price, settle_user_id, record_user_id, record_time, record, refund_reason, refund_time, receive_name, receive_phone, receive_address, out_time, goods_names, apply, apply_time, apply_result, apply_fail_reason, distribution, confirm, pick, pick_time, shop_id, shop_name, send, send_time, level_two_order_id, create_time, create_by, create_name, update_time, update_by, update_name, delete_status from tb_order  -->
+
 	<!-- 通用映射：自动模式 -->
 	<resultMap id="model" autoMapping="true" type="com.pj.tb_order.TbOrder"></resultMap>
-	
+
+<!-- id,trade_area_id,trade_no,trade_area_name,buy_user_name,buy_user_type,enterprise_name,total_weight,total_price,
+			   trade_time, trade_status, real_price,pay_type,should_price,goods_names,apply,confirm,pick,pick_time,
+			   send,send_time,level_two_order_id,goods_id,buy_user_id -->
+
+
 	<!-- 公共查询sql片段 -->
 	<sql id="select_sql">
-		select * 
-		from tb_order 
+		select *
+		from tb_order
 	</sql>
 
-	
+
 	<!-- 查集合 - 根据条件（参数为空时代表忽略指定条件） [G] -->
 	<select id="getList" resultMap="model">
 		<include refid="select_sql"></include>
 		<where>
 			<if test=' this.has("id") '> and id = #{id} </if>
-			<if test=' this.has("tradeNo") '> and trade_no = #{tradeNo} </if>
 			<if test=' this.has("tradeAreaId") '> and trade_area_id = #{tradeAreaId} </if>
+			<if test=' this.has("callCarStatus") '> and call_car_status = #{callCarStatus} </if>
+			<if test=' this.has("finishStatus") '> and finish_status = #{finishStatus} </if>
+			<if test=' this.has("cancelPeople") '> and cancel_people = #{cancelPeople} </if>
+			<if test=' this.has("groupId") '> and group_id = #{groupId} </if>
 			<if test=' this.has("tradeAreaName") '> and trade_area_name = #{tradeAreaName} </if>
 			<if test=' this.has("addressIds") '> and address_ids = #{addressIds} </if>
-			<if test=' this.has("goodsId") '> and goods_id = #{goodsId} </if>
 			<if test=' this.has("saleMainId") '> and sale_main_id = #{saleMainId} </if>
-			<if test=' this.has("groupId") '> and group_id = #{groupId} </if>
+			<if test=' this.has("tradeNo") '> and trade_no = #{tradeNo} </if>
 			<if test=' this.has("buyUserId") '> and buy_user_id = #{buyUserId} </if>
 			<if test=' this.has("buyUserName") '> and buy_user_name = #{buyUserName} </if>
 			<if test=' this.has("buyUserType") '> and buy_user_type = #{buyUserType} </if>
@@ -53,24 +60,19 @@
 			<if test=' this.has("receiveAddress") '> and receive_address = #{receiveAddress} </if>
 			<if test=' this.has("outTime") '> and out_time = #{outTime} </if>
 			<if test=' this.has("goodsNames") '> and goods_names = #{goodsNames} </if>
-			<if test=' this.has("goodsImg") '> and goods_img = #{goodsImg} </if>
 			<if test=' this.has("apply") '> and apply = #{apply} </if>
 			<if test=' this.has("applyTime") '> and apply_time = #{applyTime} </if>
 			<if test=' this.has("applyResult") '> and apply_result = #{applyResult} </if>
-			<if test=' this.has("applyNo") '> and apply_no = #{applyNo} </if>
 			<if test=' this.has("applyFailReason") '> and apply_fail_reason = #{applyFailReason} </if>
 			<if test=' this.has("distribution") '> and distribution = #{distribution} </if>
-			<if test=' this.has("peopleConfirmStatus") '> and people_confirm_status = #{peopleConfirmStatus} </if>
-			<if test=' this.has("peopleConfirmType") '> and people_confirm_type = #{peopleConfirmType} </if>
-			<if test=' this.has("peopleConfirmTime") '> and people_confirm_time = #{peopleConfirmTime} </if>
-			<if test=' this.has("enterpriseConfirm") '> and enterprise_confirm = #{enterpriseConfirm} </if>
+			<if test=' this.has("confirm") '> and confirm = #{confirm} </if>
 			<if test=' this.has("pick") '> and pick = #{pick} </if>
 			<if test=' this.has("pickTime") '> and pick_time = #{pickTime} </if>
 			<if test=' this.has("shopId") '> and shop_id = #{shopId} </if>
 			<if test=' this.has("shopName") '> and shop_name = #{shopName} </if>
 			<if test=' this.has("send") '> and send = #{send} </if>
 			<if test=' this.has("sendTime") '> and send_time = #{sendTime} </if>
-			<if test=' this.has("collageOrdersId") '> and collage_orders_id = #{collageOrdersId} </if>
+			<if test=' this.has("levelTwoOrderId") '> and level_two_order_id = #{levelTwoOrderId} </if>
 			<if test=' this.has("createTime") '> and create_time = #{createTime} </if>
 			<if test=' this.has("createBy") '> and create_by = #{createBy} </if>
 			<if test=' this.has("createName") '> and create_name = #{createName} </if>
@@ -78,125 +80,76 @@
 			<if test=' this.has("updateBy") '> and update_by = #{updateBy} </if>
 			<if test=' this.has("updateName") '> and update_name = #{updateName} </if>
 			<if test=' this.has("deleteStatus") '> and delete_status = #{deleteStatus} </if>
+			<if test=' this.has("enterpriseConfirm") '> and enterprise_confirm = #{enterpriseConfirm} </if>
 			<if test=' this.has("resaleStatus") '> and resale_status = #{resaleStatus} </if>
-			<if test=' this.has("finishStatus") '> and finish_status = #{finishStatus} </if>
-			<if test=' this.has("cancelPeople") '> and cancel_people = #{cancelPeople} </if>
-			<if test=' this.has("goodsUnit") '> and goods_unit = #{goodsUnit} </if>
-			<if test=' this.has("callCarStatus") '> and call_car_status = #{callCarStatus} </if>
-			<if test=' this.has("cooperEntrustStatus") '> and cooper_entrust_status = #{cooperEntrustStatus} </if>
-			<if test=' this.has("cooperEntrustTime") '> and cooper_entrust_time = #{cooperEntrustTime} </if>
+			<if test=' this.has("peopleConfirmStatus") '> and people_confirm_status = #{peopleConfirmStatus} </if>
+			<if test=' this.has("peopleConfirmType") '> and people_confirm_type = #{peopleConfirmType} </if>
+			<if test=' this.has("collageOrdersId") '> and collage_orders_id = #{collageOrdersId} </if>
 			<if test=' this.has("applyConfirmStatus") '> and apply_confirm_status = #{applyConfirmStatus} </if>
-			<if test=' this.has("applyConfirmTime") '> and apply_confirm_time = #{applyConfirmTime} </if>
-			<if test=' this.has("veNo") '> and ve_no = #{veNo} </if>
-			<if test=' this.has("voyageNo") '> and voyage_no = #{voyageNo} </if>
-			<if test=' this.has("preNo") '> and pre_no = #{preNo} </if>
-			<if test=' this.has("platSeqNo") '> and plat_seq_no = #{platSeqNo} </if>
-			<if test=' this.has("borderName") '> and border_name = #{borderName} </if>
-			<if test=' this.has("idno") '> and idno = #{idno} </if>
-			<if test=' this.has("borderPutrecNo") '> and border_putrec_no = #{borderPutrecNo} </if>
-			<if test=' this.has("settleBillNo") '> and settle_bill_no = #{settleBillNo} </if>
-			<if test=' this.has("buyAmount") '> and buy_amount = #{buyAmount} </if>
-			<if test=' this.has("netWt") '> and net_wt = #{netWt} </if>
-			<if test=' this.has("grossWt") '> and gross_wt = #{grossWt} </if>
-			<if test=' this.has("buyQty") '> and buy_qty = #{buyQty} </if>
-			<if test=' this.has("buyQty1") '> and buy_qty1 = #{buyQty1} </if>
-			<if test=' this.has("buyQty2") '> and buy_qty2 = #{buyQty2} </if>
-			<if test=' this.has("preIeportNo") '> and pre_ieport_no = #{preIeportNo} </if>
 		</where>
 		order by
 		<choose>
 			<when test='sortType == 1'> id desc </when>
-			<when test='sortType == 2'> trade_no desc </when>
-			<when test='sortType == 3'> trade_area_id desc </when>
-			<when test='sortType == 4'> trade_area_name desc </when>
-			<when test='sortType == 5'> address_ids desc </when>
-			<when test='sortType == 6'> goods_id desc </when>
-			<when test='sortType == 7'> sale_main_id desc </when>
-			<when test='sortType == 8'> group_id desc </when>
-			<when test='sortType == 9'> buy_user_id desc </when>
-			<when test='sortType == 10'> buy_user_name desc </when>
-			<when test='sortType == 11'> buy_user_type desc </when>
-			<when test='sortType == 12'> enterprise_id desc </when>
-			<when test='sortType == 13'> enterprise_name desc </when>
-			<when test='sortType == 14'> total_weight desc </when>
-			<when test='sortType == 15'> total_price desc </when>
-			<when test='sortType == 16'> trade_time desc </when>
-			<when test='sortType == 17'> trade_status desc </when>
-			<when test='sortType == 18'> pay_type desc </when>
-			<when test='sortType == 19'> settle_time desc </when>
-			<when test='sortType == 20'> real_price desc </when>
-			<when test='sortType == 21'> should_price desc </when>
-			<when test='sortType == 22'> settle_user_id desc </when>
-			<when test='sortType == 23'> record_user_id desc </when>
-			<when test='sortType == 24'> record_time desc </when>
-			<when test='sortType == 25'> record desc </when>
-			<when test='sortType == 26'> refund_reason desc </when>
-			<when test='sortType == 27'> refund_time desc </when>
-			<when test='sortType == 28'> receive_name desc </when>
-			<when test='sortType == 29'> receive_phone desc </when>
-			<when test='sortType == 30'> receive_address desc </when>
-			<when test='sortType == 31'> out_time desc </when>
-			<when test='sortType == 32'> goods_names desc </when>
-			<when test='sortType == 33'> goods_img desc </when>
-			<when test='sortType == 34'> apply desc </when>
-			<when test='sortType == 35'> apply_time desc </when>
-			<when test='sortType == 36'> apply_result desc </when>
-			<when test='sortType == 37'> apply_no desc </when>
-			<when test='sortType == 38'> apply_fail_reason desc </when>
-			<when test='sortType == 39'> distribution desc </when>
-			<when test='sortType == 40'> people_confirm_status desc </when>
-			<when test='sortType == 41'> people_confirm_type desc </when>
-			<when test='sortType == 42'> people_confirm_time desc </when>
-			<when test='sortType == 43'> enterprise_confirm desc </when>
-			<when test='sortType == 44'> pick desc </when>
-			<when test='sortType == 45'> pick_time desc </when>
-			<when test='sortType == 46'> shop_id desc </when>
-			<when test='sortType == 47'> shop_name desc </when>
-			<when test='sortType == 48'> send desc </when>
-			<when test='sortType == 49'> send_time desc </when>
-			<when test='sortType == 50'> collage_orders_id desc </when>
-			<when test='sortType == 51'> create_time desc </when>
-			<when test='sortType == 52'> create_by desc </when>
-			<when test='sortType == 53'> create_name desc </when>
-			<when test='sortType == 54'> update_time desc </when>
-			<when test='sortType == 55'> update_by desc </when>
-			<when test='sortType == 56'> update_name desc </when>
-			<when test='sortType == 57'> delete_status desc </when>
-			<when test='sortType == 58'> resale_status desc </when>
-			<when test='sortType == 59'> finish_status desc </when>
-			<when test='sortType == 60'> cancel_people desc </when>
-			<when test='sortType == 61'> goods_unit desc </when>
-			<when test='sortType == 62'> call_car_status desc </when>
-			<when test='sortType == 63'> cooper_entrust_status desc </when>
-			<when test='sortType == 64'> cooper_entrust_time desc </when>
-			<when test='sortType == 65'> apply_confirm_status desc </when>
-			<when test='sortType == 66'> apply_confirm_time desc </when>
-			<when test='sortType == 67'> ve_no desc </when>
-			<when test='sortType == 68'> voyage_no desc </when>
-			<when test='sortType == 69'> pre_no desc </when>
-			<when test='sortType == 70'> plat_seq_no desc </when>
-			<when test='sortType == 71'> border_name desc </when>
-			<when test='sortType == 72'> idno desc </when>
-			<when test='sortType == 73'> border_putrec_no desc </when>
-			<when test='sortType == 74'> settle_bill_no desc </when>
-			<when test='sortType == 75'> buy_amount desc </when>
-			<when test='sortType == 76'> net_wt desc </when>
-			<when test='sortType == 77'> gross_wt desc </when>
-			<when test='sortType == 78'> buy_qty desc </when>
-			<when test='sortType == 79'> buy_qty1 desc </when>
-			<when test='sortType == 80'> buy_qty2 desc </when>
-			<when test='sortType == 81'> pre_ieport_no desc </when>
+			<when test='sortType == 2'> trade_area_id desc </when>
+			<when test='sortType == 3'> trade_area_name desc </when>
+			<when test='sortType == 4'> address_ids desc </when>
+			<when test='sortType == 5'> sale_main_id desc </when>
+			<when test='sortType == 6'> trade_no desc </when>
+			<when test='sortType == 7'> buy_user_id desc </when>
+			<when test='sortType == 8'> buy_user_name desc </when>
+			<when test='sortType == 9'> buy_user_type desc </when>
+			<when test='sortType == 10'> enterprise_id desc </when>
+			<when test='sortType == 11'> enterprise_name desc </when>
+			<when test='sortType == 12'> total_weight desc </when>
+			<when test='sortType == 13'> total_price desc </when>
+			<when test='sortType == 14'> trade_time desc </when>
+			<when test='sortType == 15'> trade_status desc </when>
+			<when test='sortType == 16'> pay_type desc </when>
+			<when test='sortType == 17'> settle_time desc </when>
+			<when test='sortType == 18'> real_price desc </when>
+			<when test='sortType == 19'> should_price desc </when>
+			<when test='sortType == 20'> settle_user_id desc </when>
+			<when test='sortType == 21'> record_user_id desc </when>
+			<when test='sortType == 22'> record_time desc </when>
+			<when test='sortType == 23'> record desc </when>
+			<when test='sortType == 24'> refund_reason desc </when>
+			<when test='sortType == 25'> refund_time desc </when>
+			<when test='sortType == 26'> receive_name desc </when>
+			<when test='sortType == 27'> receive_phone desc </when>
+			<when test='sortType == 28'> receive_address desc </when>
+			<when test='sortType == 29'> out_time desc </when>
+			<when test='sortType == 30'> goods_names desc </when>
+			<when test='sortType == 31'> apply desc </when>
+			<when test='sortType == 32'> apply_time desc </when>
+			<when test='sortType == 33'> apply_result desc </when>
+			<when test='sortType == 34'> apply_fail_reason desc </when>
+			<when test='sortType == 35'> distribution desc </when>
+			<when test='sortType == 36'> confirm desc </when>
+			<when test='sortType == 37'> pick desc </when>
+			<when test='sortType == 38'> pick_time desc </when>
+			<when test='sortType == 39'> shop_id desc </when>
+			<when test='sortType == 40'> shop_name desc </when>
+			<when test='sortType == 41'> send desc </when>
+			<when test='sortType == 42'> send_time desc </when>
+			<when test='sortType == 43'> level_two_order_id desc </when>
+			<when test='sortType == 44'> create_time desc </when>
+			<when test='sortType == 45'> create_by desc </when>
+			<when test='sortType == 46'> create_name desc </when>
+			<when test='sortType == 47'> update_time desc </when>
+			<when test='sortType == 48'> update_by desc </when>
+			<when test='sortType == 49'> update_name desc </when>
+			<when test='sortType == 50'> delete_status desc </when>
 			<otherwise> id desc </otherwise>
 		</choose>
 	</select>
-	
-	
-	
-	
-	
-	
-	
-	
-	
+
+
+
+
+
+
+
+
+
 
 </mapper>

sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrderService.java

@@ -18,6 +18,7 @@ import com.pj.tb_enterprise.TbEnterpriseMapper;
 import com.pj.tb_goods_transit.TbGoodsTransit;
 import com.pj.tb_goods_transit.TbGoodsTransitMapper;
 import com.pj.tb_goods_transit.TbGoodsTransitService;
+import com.pj.tb_order.vo.ConfirmVo;
 import com.pj.tb_order.vo.OrderVo;
 import com.pj.tb_order.vo.PeopleConfirmVo;
 import com.pj.tb_order_people_confirm.TbOrderPeopleConfirm;
@@ -225,8 +226,6 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 		OrderVo orderVo = new OrderVo();
 		//数据拷贝
 		BeanUtils.copyProperties(order,orderVo);
-		//设置基本属性
-		orderVo = methodOrderService.setOrderVoProperties(order,orderVo);
 		return orderVo;
 	}
 
@@ -283,32 +282,6 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 		return peopleConfirmList;
 	}
 
-	/** 远程调用:根据时间和登陆人查询订单 */
-	public List<OrderDto> selectOrderList( Long appUserId){
-		//判断当前是否已接单
-		LambdaQueryWrapper<TbOrder> queryWrapper = new LambdaQueryWrapper<>();
-		//根据当天时间查询
-//		queryWrapper.eq(TbOrder::getCreateTime,sdf.format(currDay));
-		queryWrapper.eq(TbOrder::getCreateBy,appUserId);
-		//todo:届时放开该注释
-//		queryWrapper.eq(TbOrder::getApply,ApplyStatus.APPLY_STATUS_ONE.getCode()); //申报通过
-		queryWrapper.eq(TbOrder::getDeleteStatus,DeleteStatus.DELETE_STATUS_ON.getCode());
-		queryWrapper.apply("DATE(create_time) = DATE({0})", new Date()); // 匹配当天的数据
-		List<TbOrder> tbOrderList = tbOrderMapper.selectList(queryWrapper);
-		//创建返回值集合
-		List<OrderDto> result = new ArrayList<>();
-		//执行数据封装
-		if(tbOrderList.size() == 1){
-			tbOrderList.forEach(item -> {
-				OrderDto orderDto = new OrderDto();
-				BeanUtils.copyProperties(item,orderDto);
-				result.add(orderDto);
-			});
-		}
-		//返回
-		return result;
-	}
-
 	/**
 	 * 接收订单推送消息，
 	 * 边民进行交易确认，
@@ -334,11 +307,44 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 
 	}
 
+
 	/**
-	 *  边民确认订单
+	 * app首页获取边民未确认订单
+	 */
+	public OrderVo getNoConfirmOrder() {
+		//获取登录人
+		APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
+
+		LambdaQueryWrapper<TbOrder> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(TbOrder::getBuyUserId, appLoginInfo.getFk());
+		wrapper.eq(TbOrder::getPeopleConfirmStatus, ConfirmStatus.CONFIRM_STATUS_ZERO.getCode());//订单未确认
+		wrapper.orderByDesc(TbOrder::getCreateTime);
+		wrapper.orderByDesc(TbOrder::getUpdateTime);
+
+		List<TbOrder> tbOrders = tbOrderMapper.selectList(wrapper);
+		if(tbOrders.size() > 0) {
+			TbOrder order = tbOrders.get(0);
+
+			OrderVo orderVo = new OrderVo();
+			BeanUtils.copyProperties(order,orderVo);
+			return orderVo;
+		}
+		return null;
+	}
+
+	/**
+	 *  获取一级市场边民订单的所有确认状态
 	 * @param orderId 一级市场订单表ID
 	 */
-	public boolean confirmOrder(Long orderId, Integer confirmType){
+	public ConfirmVo getConfirmStatus(Long orderId) {
+		return tbOrderMapper.getConfirmStatus(orderId);
+	}
+
+	/**
+	 *  边民订单确认
+	 * @param orderId 一级市场订单表ID
+	 */
+	public boolean confirmOrder(Long orderId){
 		// TODO: 2023/8/28 边民发起支付申请，调用银行接口：验证边民支付信息，将货款先存入银行第三方账户，并给出回执
 		// 银行返回支付回执为"交易成功"时，方法往下执行
 
@@ -348,7 +354,6 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 		// TODO: 2023/8/29 更新状态保存交易记录
 		LambdaUpdateWrapper<TbOrder> wrapper = new LambdaUpdateWrapper<>();
 		wrapper.set(TbOrder::getPeopleConfirmStatus, ConfirmStatus.CONFIRM_STATUS_ONE.getCode());//边民确认:1=确认
-		wrapper.set(TbOrder::getPeopleConfirmType, confirmType);//边民确认类型[1=刷脸,2=指纹]
 		wrapper.set(TbOrder::getPeopleConfirmTime, new Date());
 		wrapper.set(TbOrder::getUpdateBy, appLoginInfo.getLoginId());
 		wrapper.set(TbOrder::getUpdateName, appLoginInfo.getLoginName());
@@ -356,8 +361,7 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 		wrapper.eq(TbOrder::getId, orderId);
 		boolean result = update(wrapper);
 
-		// TODO: 2023/8/29 同步交易信息(由于目前未知航通传过来的订单数据形式，暂未做)
-		// TODO: 2023/8/29 监听航通传过来的大订单里的所有边民订单，当所有边民都进行订单确认后，调用航通接口发送信息
+		// TODO: 2023/8/29 调用航通008接口，发送信息
 		OrderDto tbOrderDto = new OrderDto();
 		BeanUtils.copyProperties(tbOrderMapper.selectById(orderId),tbOrderDto);
 		asyncServerInterface.sendLevelOneOrderDto(tbOrderDto,DataType.DATA_TYPE_ONE.getCode()); // 发送至航通
@@ -384,8 +388,7 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 		wrapper.eq(TbOrder::getId, orderId);
 		boolean result = update(wrapper);
 
-		// TODO: 2023/8/29 发送信息(由于目前未知航通传过来的订单数据形式，暂未做)
-		// TODO: 2023/8/29 监听航通传过来的大订单里的所有边民订单，当所有边民都进行进口申报确认后，调用航通接口发送信息
+		// TODO: 2023/8/29 调用航通008接口，发送信息
 		OrderDto tbOrderDto = new OrderDto();
 		BeanUtils.copyProperties(tbOrderMapper.selectById(orderId),tbOrderDto);
 		asyncServerInterface.sendLevelOneOrderDto(tbOrderDto,DataType.DATA_TYPE_TWO.getCode());
@@ -393,6 +396,28 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 		return result;
 	}
 
+	/**
+	 *  互助委托申报确认
+	 * @param orderId 一级市场订单表ID
+	 */
+	public boolean cooperOrder(Long orderId){
+		//获取登录人
+		APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
+
+		LambdaUpdateWrapper<TbOrder> wrapper = new LambdaUpdateWrapper<>();
+		wrapper.set(TbOrder::getCooperEntrustStatus, ConfirmStatus.CONFIRM_STATUS_ONE.getCode());//互助委托申报确认:1=确认
+		wrapper.set(TbOrder::getCooperEntrustTime, new Date());
+
+		wrapper.set(TbOrder::getUpdateBy, appLoginInfo.getLoginId());
+		wrapper.set(TbOrder::getUpdateName, appLoginInfo.getLoginName());
+		wrapper.set(TbOrder::getUpdateTime, new Date());
+
+		wrapper.eq(TbOrder::getId, orderId);
+		boolean result = update(wrapper);
+
+		return result;
+	}
+
 	// TODO: 2023/8/28 系统接收到航通接口信息：车辆已出一级市场
 	public void orderFinish(Long[] ids){
 		//1、todo: 调用银行接口发起划扣：将边民划扣至银行第三方账户的货款，支付至外籍商户的账户
@@ -431,6 +456,36 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 		asyncServerInterface.sendLevelOneOrderDto(tbOrderDto,DataType.DATA_TYPE_THREE.getCode());
 	}
 
+
+
+	/*-----           正常业务逻辑👆👆    rpc远程调用👇👇 -----*/
+
+	/** 远程调用:根据时间和登陆人查询订单 */
+	public List<OrderDto> selectOrderList( Long appUserId){
+		//判断当前是否已接单
+		LambdaQueryWrapper<TbOrder> queryWrapper = new LambdaQueryWrapper<>();
+		//根据当天时间查询
+//		queryWrapper.eq(TbOrder::getCreateTime,sdf.format(currDay));
+		queryWrapper.eq(TbOrder::getCreateBy,appUserId);
+		//todo:届时放开该注释
+//		queryWrapper.eq(TbOrder::getApply,ApplyStatus.APPLY_STATUS_ONE.getCode()); //申报通过
+		queryWrapper.eq(TbOrder::getDeleteStatus,DeleteStatus.DELETE_STATUS_ON.getCode());
+		queryWrapper.apply("DATE(create_time) = DATE({0})", new Date()); // 匹配当天的数据
+		List<TbOrder> tbOrderList = tbOrderMapper.selectList(queryWrapper);
+		//创建返回值集合
+		List<OrderDto> result = new ArrayList<>();
+		//执行数据封装
+		if(tbOrderList.size() == 1){
+			tbOrderList.forEach(item -> {
+				OrderDto orderDto = new OrderDto();
+				BeanUtils.copyProperties(item,orderDto);
+				result.add(orderDto);
+			});
+		}
+		//返回
+		return result;
+	}
+
 	/** 远程调用  查订单 */
 	OrderDto getOrderDtoById(Long id){
 		TbOrder byId = super.getById(id);

sp-service/level-one-server/src/main/java/com/pj/tb_order/vo/ConfirmVo.java

@@ -0,0 +1,47 @@
+package com.pj.tb_order.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+
+/**
+ * @Author lbl
+ **/
+@Data
+public class ConfirmVo {
+
+
+    /**
+     * 订单ID
+     */
+    private Long orderId;
+
+    /**
+     * 一级市场边民确认状态(0=待确认,1=是)
+     */
+    private Integer peopleConfirmStatus;
+    /**
+     * 一级市场边民确认时间
+     */
+    private Date peopleConfirmTime;
+
+    /**
+     * 互助委托申报确认状态
+     */
+    private String cooperEntrustStatus;
+    /**
+     * 互助委托申报确认时间
+     */
+    private String cooperEntrustTime;
+
+    /**
+     * 边民进口申报确认状态(0=待确认,1=是)
+     */
+    private Integer applyConfirmStatus;
+    /**
+     * 边民进口申报确认时间
+     */
+    private Date applyConfirmTime;
+
+}

sp-service/level-one-server/src/main/java/com/pj/tb_order/vo/OrderVo.java

@@ -15,7 +15,7 @@ import java.util.List;
 public class OrderVo {
 
 
-    private Long orderId;
+    private Long id;
 
     /**
      * 订单编号
@@ -33,16 +33,6 @@ public class OrderVo {
      */
     private String enterpriseName;
 
-    /**
-     * 商家联系号码
-     */
-    private String concat;
-
-
-    /**
-     * 过审商品名称
-     */
-    private String goodsTransitName;
 
     /**
      * 计价单位
@@ -64,50 +54,144 @@ public class OrderVo {
      */
     private Double totalPrice;
 
+
     /**
-     * 边民
+     * 订单创建时间
      */
-//    private List<TbOrderPeopleConfirm> peopleList;
+    private Date orderCreateTime;
 
     /**
-     * 商品发布时间
+     * 购买的互市组名称
      */
-    private Date goodsTransitCreateTime;
+    private String groupName;
+
 
     /**
-     * 订单创建时间
+     * 买家ID
      */
-    private Date orderCreateTime;
+    private Long buyUserId;
 
     /**
-     * 购买的互市组名称
+     * 买家
      */
-    private String groupName;
+    private String buyUserName;
+
+    /**
+     * 购买用户类型(3=边民,2=组长)
+     */
+    private String buyUserType;
+
+    /**
+     * 商家ID
+     */
+    private Long enterpriseId;
+
+
+    /**
+     * 总重量
+     */
+    private Double totalWeight;
+
+
+    /**
+     * 交易时间
+     */
+    private Date tradeTime;
+
+    /**
+     * 交易状态(0=未支付,1=已支付)
+     */
+    private Integer tradeStatus;
+
+    /**
+     * 支付方式(0=金融互助,1=现金刷卡)
+     */
+    private Integer payType;
 
+    /**
+     * 结算时间
+     */
+    private String settleTime;
 
     /**
-     * 商户确认订单时间
+     * 当前结算金额
      */
-    private Date enterpriseConfirmTime;
+    private Double realPrice;
 
+    /**
+     * 应结金额
+     */
+    private Double shouldPrice;
+
+    /**
+     * 商品名称字符串
+     */
+    private String goodsNames;
+
+    /**
+     * 是否申报
+     */
+    private Integer apply;
+
+    /**
+     * 申报时间
+     */
+    private Date applyTime;
+
+    /**
+     * 申报结果
+     */
+    private String applyResult;
 
     /**
-     * 进境时间
+     *
      */
-    private Date entrantTime;
+    private String applyFailReason;
 
+    /**
+     * 一级市场边民确认状态(0=待确认,1=是)
+     */
+    private Integer peopleConfirmStatus;
+    /**
+     * 一级市场边民确认时间
+     */
+    private Date peopleConfirmTime;
 
     /**
-     * 进口时间
+     * 互助委托申报确认状态
      */
-    private Date importTime;
+    private String cooperEntrustStatus;
+    /**
+     * 互助委托申报确认时间
+     */
+    private String cooperEntrustTime;
 
+    /**
+     * 边民进口申报确认状态(0=待确认,1=是)
+     */
+    private Integer applyConfirmStatus;
+    /**
+     * 边民进口申报确认时间
+     */
+    private Date applyConfirmTime;
 
     /**
-     * 出互市区时间
+     *
      */
-    private Date outFrontierTradeTime;
+    private Long shopId;
 
+    /**
+     *
+     */
+    private String shopName;
 
+    /**
+     * 车牌号
+     */
+    private String veNo;
 
+    /**
+     * 车航次(班)号
+     */
+    private String voyageNo;
 }