Merge branch 'master' of zyh/kmall-haikong into master

kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderServiceImpl.java

@@ -3343,9 +3343,10 @@ public class OrderServiceImpl implements OrderService {
         memberOrderInfoSyncDTO.setConsumeDate(new Date());
         memberOrderInfoSyncDTO.setOrderAmount(order.getActual_price());
         memberOrderInfoSyncDTO.setOrderScore(deductionScore);
-
+        HashMap<Object, Object> orderIdMap = new HashMap<>();
+        orderIdMap.put("orderId",order.getId());
         //新增传给海控会员系统添加商品明细
-        List<OrderGoodsEntity> orderGoodsEntities = orderGoodsDao.queryList(order.getId());
+        List<OrderGoodsEntity> orderGoodsEntities = orderGoodsDao.queryList(orderIdMap);
         List list = new ArrayList<Map>();
         for (OrderGoodsEntity orderGoodsEntity : orderGoodsEntities) {
             HashMap<Object, Object> map = new HashMap<>();