发送边民确认信息到航通

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

@@ -116,8 +116,15 @@ public class TbOrder extends Model<TbOrder> implements Serializable {
 	 * 总重量
 	 */
 	private Double totalWeight;
-
+	/**
+	 * 单证代码
+	 */
 	private String preNo;
+	/**
+	 *进出口预申报
+	 * 单
+	 */
+	private String preIeportNo;
 
 	/**
 	 * 总金额
@@ -363,5 +370,9 @@ public class TbOrder extends Model<TbOrder> implements Serializable {
 	 * 商品单位
 	 */
 	private String goodsUnit;
+	/**
+	 * 结算单号
+	 */
+	private String settleBillNo;
 
 }

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.pj.api.client.admin.AdminInterface;
 import com.pj.api.client.async_server.AsyncServerInterface;
 import com.pj.api.client.level_one_server.LevelOneServerInterface;
+import com.pj.api.consts.FeignFactory;
 import com.pj.api.dto.*;
 import com.pj.common.core.exception.ServiceException;
 import com.pj.current.dto.APPLoginUserInfo;
@@ -25,7 +26,10 @@ import com.pj.tb_order_people_confirm.TbOrderPeopleConfirm;
 import com.pj.tb_order_people_confirm.TbOrderPeopleConfirmMapper;
 import com.pj.tb_people.TbPeople;
 import com.pj.tb_people.TbPeopleMapper;
+import com.pj.tb_people.TbPeopleService;
+import com.pj.utils.sg.AjaxError;
 import com.pj.utils.so.SoMap;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -47,7 +51,7 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 
 	/** 互市组 */
 	@Autowired
-	private TbPeopleMapper tbPeopleMapper;
+	private TbPeopleService tbPeopleService;
 	@Autowired
 	TbOrderPeopleConfirmMapper tbOrderPeopleConfirmMapper;
 	@Autowired
@@ -258,7 +262,7 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 		}
 
 		// 获取组内所有边民
-		List<TbPeople> peopleList = tbPeopleMapper.getList(so);
+		List<TbPeople> peopleList = tbPeopleService.getList(so);
 		for (TbPeople people : peopleList) {
 			PeopleConfirmVo peopleConfirmVo = new PeopleConfirmVo();
 			peopleConfirmVo.setOrderId(so.getLong("orderId"));
@@ -345,6 +349,10 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 	 * @param orderId 一级市场订单表ID
 	 */
 	public boolean confirmOrder(Long orderId){
+		TbOrder tbOrder=this.getById(orderId);
+		if (tbOrder==null){
+			throw new AjaxError("订单不存在");
+		}
 		// TODO: 2023/8/28 边民发起支付申请，调用银行接口：验证边民支付信息，将货款先存入银行第三方账户，并给出回执
 		// 银行返回支付回执为"交易成功"时，方法往下执行
 
@@ -362,10 +370,7 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 		boolean result = update(wrapper);
 
 		// TODO: 2023/8/29 调用航通008接口，发送信息
-		OrderDto tbOrderDto = new OrderDto();
-		BeanUtils.copyProperties(tbOrderMapper.selectById(orderId),tbOrderDto);
-		asyncServerInterface.sendLevelOneOrderDto(tbOrderDto,DataType.DATA_TYPE_ONE.getCode()); // 发送至航通
-
+		sendConfirmMsgToHt(tbOrder);
 		return result;
 	}
 
@@ -374,6 +379,10 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 	 * @param orderId 一级市场订单表ID
 	 */
 	public boolean applyOrder(Long orderId){
+		TbOrder tbOrder=this.getById(orderId);
+		if (tbOrder==null){
+			throw new AjaxError("订单不存在");
+		}
 		//获取登录人
 		APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
 
@@ -389,14 +398,25 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 		boolean result = update(wrapper);
 
 		// TODO: 2023/8/29 调用航通008接口，发送信息
-		OrderDto tbOrderDto = new OrderDto();
-		BeanUtils.copyProperties(tbOrderMapper.selectById(orderId),tbOrderDto);
-		asyncServerInterface.sendLevelOneOrderDto(tbOrderDto,DataType.DATA_TYPE_TWO.getCode());
-
+		sendConfirmMsgToHt(tbOrder);
 		return result;
 	}
 
 	/**
+	 * 发送008信息到航通
+	 */
+	private void sendConfirmMsgToHt(TbOrder tbOrder){
+		TbPeople tbPeople=tbPeopleService.getById(tbOrder.getBuyUserId());
+		PeopleConfirmDTO peopleConfirmDTO=new PeopleConfirmDTO();
+		peopleConfirmDTO.setBorderName(tbOrder.getBuyUserName());
+		peopleConfirmDTO.setIdno(tbPeople.getIdCardNo());
+		peopleConfirmDTO.setSettleBillNo(tbOrder.getSettleBillNo());
+		peopleConfirmDTO.setPreIeportNo(tbOrder.getPreIeportNo());
+		FeignFactory.asyncServerInterface.sendConfirm(peopleConfirmDTO);
+	}
+
+
+	/**
 	 *  互助委托申报确认
 	 * @param orderId 一级市场订单表ID
 	 */

sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeopleService.java

@@ -118,7 +118,7 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
 	}
 
 	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */
-	List<TbPeople> getList(SoMap so) {
+	public List<TbPeople> getList(SoMap so) {
 		return tbPeopleMapper.getList(so);
 	}