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

sp-service/level-one-server/src/main/java/com/pj/tb_import_order/TbImportOrder.java

@@ -106,4 +106,5 @@ public class TbImportOrder extends Model<TbImportOrder> implements Serializable
 	private String judgeContent;
 	private Date judgeTime;
 
+	private Date createTime;
 }

sp-service/level-one-server/src/main/java/com/pj/tb_import_order/TbImportOrderMapper.xml

@@ -41,7 +41,7 @@
 			<if test=' this.has("updateName") '> and update_name = #{updateName} </if>
 			<if test=' this.has("deleteStatus") '> and delete_status = #{deleteStatus} </if>
 		</where>
-
+		order by create_time desc
 	</select>
 
 </mapper>

sp-service/level-one-server/src/main/java/com/pj/tb_import_order/TbImportOrderService.java

@@ -105,6 +105,7 @@ public class TbImportOrderService extends ServiceImpl<TbImportOrderMapper, TbImp
 
 		TbImportOrder importOrder = new TbImportOrder();
 		BeanUtils.copyProperties(importOrderDto, importOrder);
+		importOrder.setCreateTime(new Date());
 		boolean save = save(importOrder);
 		long importOrderId = SP.publicMapper.getPrimarykey();
 		if(save) {

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

@@ -42,7 +42,7 @@ public class TbOrder extends Model<TbOrder> implements Serializable {
     public static final String PERMISSION_CODE_DEL = "tb-order-del";
     public static final String PERMISSION_CODE_EDIT_PRICE = "tb-order-edit-price";
 	public static final String PERMISSION_CODE_DEDUCTION = "tb-order-deduction";
-
+	public static final String PERMISSION_CODE_SEND009 = "tb-order-send009";
 
     // ---------- 表中字段 ----------
     /**

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

@@ -116,6 +116,17 @@ public class TbOrderController {
 		return AjaxJson.getSuccess();
 	}
 
+	/** 订单补发送009信息到航通 */
+	@RequestMapping("send009ToHt")
+	@SaCheckPermission(TbOrder.PERMISSION_CODE_SEND009)
+	public AjaxJson send009ToHt(Long id){
+		TbOrder order = tbOrderService.getById(id);
+		if (order == null) {
+			throw new AjaxError("订单不存在");
+		}
+		tbOrderService.sendConfirmMsgToHt(order);
+		return AjaxJson.getSuccess();
+	}
 
 	/*-----           正常业务逻辑👆👆    rpc远程调用👇👇 -----*/
 

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

@@ -612,15 +612,19 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
     /**
      * 发送009信息到航通
      */
-    private void sendConfirmMsgToHt(TbOrder tbOrder) {
+    public void sendConfirmMsgToHt(TbOrder tbOrder) {
         TbPeople tbPeople = tbPeopleService.getById(tbOrder.getBuyUserId());
+        StaticLog.info("\n--------------发送009信息到航通————边民不存在！！！");
+        if (tbPeople == null) {
+            throw new AjaxError("边民不存在");
+        }
         PeopleConfirmDTO peopleConfirmDTO = new PeopleConfirmDTO();
         peopleConfirmDTO.setBorderName(tbOrder.getBuyUserName());
         peopleConfirmDTO.setIdno(tbPeople.getIdCard());
         peopleConfirmDTO.setSettleBillNo(tbOrder.getSettleBillNo());
         peopleConfirmDTO.setPreIeportNo(tbOrder.getPreIeportNo());
         peopleConfirmDTO.setBorderPutrecNo(tbOrder.getBorderPutrecNo());
-        log.info("sendConfirmMsgToHt:{}", JSONUtil.toJsonStr(peopleConfirmDTO));
+        StaticLog.info("\n--------------发送009信息到航通,sendConfirmMsgToHt:{}", JSONUtil.toJsonStr(peopleConfirmDTO));
         FeignFactory.asyncServerInterface.sendConfirm(peopleConfirmDTO);
     }