Merge branch 'feature/asyncOrder' of http://git.aseanbusiness.cn/qzyReal/market-server into feature/asyncOrder

# Conflicts:
#	sp-service/async-server/src/main/java/com/pj/task/HtByteTask.java

sp-service/async-server/src/main/java/com/pj/task/HtByteTask.java

@@ -209,60 +209,13 @@ public class HtByteTask {
                         List<BordersListDto> bordersLists = JSON.parseArray(importDeclarePeople.getBordersList(), BordersListDto.class);
                         //边民购买商品列表
                         List<BorderBuyGoodsListDto> buyGoodsList = JSON.parseArray(importDeclarePeople.getBorderBuyGoodsList(), BorderBuyGoodsListDto.class);
-                        //商铺卖货物列表
-                        List<HtSellGoodsList> htSellGoodsList = JSON.parseArray(importDeclarePeople.getSellGoodsList(), HtSellGoodsList.class);
-                        //航通关联主键
-                        String platSeqNo = importDeclarePeople.getPlatSeqNo();
-                        //保存购买边民
-                        List<BordersListDto> bordersListDtoList = new ArrayList<>();
-                        if(bordersLists.size() > 0){
-                            bordersLists.forEach(t -> {
-//                                t.setCreateTime(new Date());
-//                                t.setFinishStatus(FinishStatus.FINISH_STATUS_ZERO.getCode());
-//                                htBordersListMapper.insert(t);
-                                BordersListDto bordersListDto = new BordersListDto();
-                                BeanUtils.copyProperties(t,bordersListDto);
-                                bordersListDtoList.add(bordersListDto);
-                            });
-                        /**
-                         * 接收订单推送消息，边民进行交易确认，支付申请，刷脸认证，系统发起进行交易
-                         */
-                            List<HtBordersList> htBordersLists = htBordersListMapper.selectList(new LambdaQueryWrapper<HtBordersList>().eq(HtBordersList::getPlatSeqNo, platSeqNo));
-                            methodHtByteTask.sendMessageToPeople(htBordersLists);
-                        }
-                        //保存边民购买商品
-                        List<BorderBuyGoodsListDto> borderBuyGoodsListDtoList = new ArrayList<>();
-                        if(buyGoodsList.size() > 0){
-                            buyGoodsList.forEach(t -> {
-//                                t.setCreateTime(new Date());
-//                                t.setFinishStatus(FinishStatus.FINISH_STATUS_ZERO.getCode());
-//                                htBorderBuyGoodsListMapper.insert(t);
-                                BorderBuyGoodsListDto borderBuyGoodsListDto = new BorderBuyGoodsListDto();
-                                BeanUtils.copyProperties(t,borderBuyGoodsListDto);
-                                borderBuyGoodsListDtoList.add(borderBuyGoodsListDto);
-                            });
-                            // ???
-                        }
-                        //保存商铺卖货物
-                        List<SellGoodsListDto> sellGoodsListDtoList = new ArrayList<>();
-                        if(htSellGoodsList.size() > 0){
-                            htSellGoodsList.forEach(t -> {
-//                                t.setCreateTime(new Date());
-//                                t.setFinishStatus(FinishStatus.FINISH_STATUS_ZERO.getCode());
-//                                htSellGoodsListMapper.insert(t);
-                                SellGoodsListDto sellGoodsListDto = new SellGoodsListDto();
-                                BeanUtils.copyProperties(t,sellGoodsListDto);
-                                sellGoodsListDtoList.add(sellGoodsListDto);
-                            });
-                            // ???
-                        }
                         //保存航通监听记录
                         methodHtByteTask.updateHtByteInfo(true,item,dataDto);
                         TradeSettlementDto tradeSettlementDto = new TradeSettlementDto();
                         BeanUtils.copyProperties(importDeclarePeople,tradeSettlementDto);
                         tradeSettlementDto.setId(primarykey);
-                        tradeSettlementDto.setBordersListDtoList(bordersListDtoList);
-                        tradeSettlementDto.setBorderBuyGoodsListDtoList(borderBuyGoodsListDtoList);
+                        tradeSettlementDto.setBordersListDtoList(bordersLists);
+                        tradeSettlementDto.setBorderBuyGoodsListDtoList(buyGoodsList);
                         boolean b = FeignFactory.levelOneServerInterface.tradeSettlementDto(tradeSettlementDto);
                         if(!b)throw new ServiceException("添加错误;");
                         System.out.println("\n交易结算信息处理成功。 messageId = " + item.getMessageId() + "\n");